From 740bf2bb2e900d3db2292b5909b4b4c6e90320e6 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 26 Apr 2011 15:33:10 -0700 Subject: Apply shaders/filters to text drop shadows. Bug #4318323 This change also fixes the fact that shaders were not modulated by the paint's color when drawing paths. Change-Id: Id88804143aea06c895d4cbcdbe106d660230aa5a --- .../src/com/android/test/hwui/MoreShadersActivity.java | 10 +++++----- .../src/com/android/test/hwui/PathsActivity.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/HwAccelerationTest/src/com/android/test') diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/MoreShadersActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/MoreShadersActivity.java index 92f8be8..02cb4b6 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/MoreShadersActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/MoreShadersActivity.java @@ -97,7 +97,7 @@ public class MoreShadersActivity extends Activity { mLargePaint.setTextSize(36.0f); mLargePaint.setColor(0xff000000); mLargePaint.setShadowLayer(3.0f, 0.0f, 3.0f, 0x7f00ff00); - + mPaint = new Paint(); } @@ -123,19 +123,19 @@ public class MoreShadersActivity extends Activity { mLargePaint.setShader(mHorGradient); canvas.drawText("OpenGL rendering", 0.0f, 20.0f, mLargePaint); - + mLargePaint.setShader(mScaled2Shader); canvas.drawText("OpenGL rendering", 0.0f, 60.0f, mLargePaint); - + mLargePaint.setShader(mCompose2Shader); mLargePaint.setColorFilter(mColorFilter); canvas.drawText("OpenGL rendering", 0.0f, 100.0f, mLargePaint); mLargePaint.setColorFilter(null); - + canvas.translate(0.0f, 40.0f + mDrawHeight); mLargePaint.setShader(mVertGradient); canvas.drawText("OpenGL rendering", 0.0f, 20.0f, mLargePaint); - + canvas.restore(); } } diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/PathsActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/PathsActivity.java index 5ddcd20..833b61c 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/PathsActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/PathsActivity.java @@ -75,7 +75,7 @@ public class PathsActivity extends Activity { mLargePaint = new Paint(); mLargePaint.setAntiAlias(true); - mLargePaint.setColor(0xff00ff00); + mLargePaint.setColor(0x7f00ff00); mLargePaint.setStrokeWidth(15.0f); mLargePaint.setStyle(Paint.Style.FILL); -- cgit v1.1