Merge "Test setTextScaleX()"
diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml
index 564f13e..3ac8c5e 100644
--- a/tests/HwAccelerationTest/AndroidManifest.xml
+++ b/tests/HwAccelerationTest/AndroidManifest.xml
@@ -119,7 +119,8 @@
<activity
android:name="TextActivity"
android:label="_Text"
- android:theme="@android:style/Theme.NoTitleBar">
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:hardwareAccelerated="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/tests/HwAccelerationTest/src/com/google/android/test/hwui/TextActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/TextActivity.java
index f645446..abe9d5e 100644
--- a/tests/HwAccelerationTest/src/com/google/android/test/hwui/TextActivity.java
+++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/TextActivity.java
@@ -36,6 +36,7 @@
private final Paint mMediumPaint;
private final Paint mLargePaint;
private final Paint mStrikePaint;
+ private final Paint mScaledPaint;
CustomTextView(Context c) {
super(c);
@@ -43,14 +44,19 @@
mMediumPaint = new Paint();
mMediumPaint.setAntiAlias(true);
mMediumPaint.setColor(0xffff0000);
+
mLargePaint = new Paint();
mLargePaint.setAntiAlias(true);
mLargePaint.setTextSize(36.0f);
+
mStrikePaint = new Paint();
mStrikePaint.setAntiAlias(true);
mStrikePaint.setTextSize(16.0f);
mStrikePaint.setUnderlineText(true);
-
+
+ mScaledPaint = new Paint();
+ mScaledPaint.setAntiAlias(true);
+ mScaledPaint.setTextSize(16.0f);
}
@Override
@@ -86,6 +92,13 @@
mStrikePaint.setStrikeThruText(false);
mStrikePaint.setUnderlineText(true);
+ mScaledPaint.setTextScaleX(0.5f);
+ canvas.drawText("Hello OpenGL renderer!", 500, 200, mScaledPaint);
+ mScaledPaint.setTextScaleX(2.0f);
+ canvas.drawText("Hello OpenGL renderer!", 500, 230, mScaledPaint);
+ mScaledPaint.setTextScaleX(1.0f);
+ canvas.drawText("Hello OpenGL renderer!", 500, 260, mScaledPaint);
+
canvas.save();
canvas.clipRect(150.0f, 220.0f, 450.0f, 320.0f);
canvas.drawText("Hello OpenGL renderer!", 100, 300, mLargePaint);