diff --git a/tests/HwAccelerationTest/.classpath b/tests/HwAccelerationTest/.classpath new file mode 100644 index 0000000000000..609aa00ebc435 --- /dev/null +++ b/tests/HwAccelerationTest/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tests/HwAccelerationTest/.gitignore b/tests/HwAccelerationTest/.gitignore new file mode 100644 index 0000000000000..f178f174effb5 --- /dev/null +++ b/tests/HwAccelerationTest/.gitignore @@ -0,0 +1,3 @@ +bin +gen +local.properties \ No newline at end of file diff --git a/tests/HwAccelerationTest/.project b/tests/HwAccelerationTest/.project new file mode 100644 index 0000000000000..7c04d3cb64261 --- /dev/null +++ b/tests/HwAccelerationTest/.project @@ -0,0 +1,33 @@ + + + HwAccelerationTest + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml index 7fa71a9fa9cb9..c60613c9257c8 100644 --- a/tests/HwAccelerationTest/AndroidManifest.xml +++ b/tests/HwAccelerationTest/AndroidManifest.xml @@ -17,7 +17,8 @@ - + + + + diff --git a/tests/HwAccelerationTest/res/layout/advanced_gradient.xml b/tests/HwAccelerationTest/res/layout/advanced_gradient.xml new file mode 100644 index 0000000000000..dd937f9b5676e --- /dev/null +++ b/tests/HwAccelerationTest/res/layout/advanced_gradient.xml @@ -0,0 +1,6 @@ + + + diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedBlendActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedBlendActivity.java index 5baa20c32fdd1..a83005b4440b1 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedBlendActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedBlendActivity.java @@ -41,7 +41,7 @@ public class AdvancedBlendActivity extends Activity { setContentView(new ShadersView(this)); } - static class ShadersView extends View { + public static class ShadersView extends View { private BitmapShader mScaledShader; private int mTexWidth; private int mTexHeight; @@ -57,7 +57,7 @@ public class AdvancedBlendActivity extends Activity { private ComposeShader mCompose6Shader; private BitmapShader mScaled2Shader; - ShadersView(Context c) { + public ShadersView(Context c) { super(c); Bitmap texture = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset1); @@ -71,7 +71,7 @@ public class AdvancedBlendActivity extends Activity { Matrix m2 = new Matrix(); m2.setScale(0.5f, 0.5f); mScaledShader.setLocalMatrix(m2); - + mScaled2Shader = new BitmapShader(texture, Shader.TileMode.MIRROR, Shader.TileMode.MIRROR); Matrix m3 = new Matrix(); @@ -80,7 +80,7 @@ public class AdvancedBlendActivity extends Activity { mHorGradient = new LinearGradient(0.0f, 0.0f, mDrawWidth, 0.0f, Color.BLACK, Color.WHITE, Shader.TileMode.CLAMP); - + mComposeShader = new ComposeShader(mScaledShader, mHorGradient, PorterDuff.Mode.DARKEN); mCompose2Shader = new ComposeShader(mScaledShader, mHorGradient, @@ -107,7 +107,7 @@ public class AdvancedBlendActivity extends Activity { mPaint.setShader(mComposeShader); canvas.drawRect(0.0f, 0.0f, mDrawWidth, mDrawHeight, mPaint); - + canvas.translate(0.0f, 40.0f + mDrawHeight); mPaint.setShader(mCompose2Shader); canvas.drawRect(0.0f, 0.0f, mDrawWidth, mDrawHeight, mPaint); @@ -117,10 +117,10 @@ public class AdvancedBlendActivity extends Activity { canvas.drawRect(0.0f, 0.0f, mDrawWidth, mDrawHeight, mPaint); canvas.restore(); - + canvas.save(); canvas.translate(40.0f + mDrawWidth + 40.0f, 40.0f); - + mPaint.setShader(mCompose4Shader); canvas.drawRect(0.0f, 0.0f, mDrawWidth, mDrawHeight, mPaint); @@ -131,7 +131,7 @@ public class AdvancedBlendActivity extends Activity { canvas.translate(0.0f, 40.0f + mDrawHeight); mPaint.setShader(mCompose6Shader); canvas.drawRect(0.0f, 0.0f, mDrawWidth, mDrawHeight, mPaint); - + canvas.restore(); } } diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedGradientsActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedGradientsActivity.java index 27974e77e676c..b0b54eb83149a 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedGradientsActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/AdvancedGradientsActivity.java @@ -36,7 +36,7 @@ public class AdvancedGradientsActivity extends Activity { setContentView(new GradientsView(this)); } - static class GradientsView extends View { + public static class GradientsView extends View { private final Paint mPaint; private final SweepGradient mSweepGradient; private final RadialGradient mRadialGradient; @@ -44,7 +44,7 @@ public class AdvancedGradientsActivity extends Activity { private final Matrix mMatrix2; private final Matrix mMatrix3; - GradientsView(Context c) { + public GradientsView(Context c) { super(c); mSweepGradient = new SweepGradient(0.0f, 0.0f, 0xff000000, 0xffffffff); diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java index 8fa626be44715..f8422f4a5ff64 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/GradientsActivity.java @@ -51,15 +51,12 @@ public class GradientsActivity extends Activity { final SeekBar rotateView = new SeekBar(this); rotateView.setMax(360); rotateView.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { - @Override public void onStopTrackingTouch(SeekBar seekBar) { } - @Override public void onStartTrackingTouch(SeekBar seekBar) { } - @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { gradientView.setRotationY((float) progress); radialGradientView.setRotationX((float) progress); @@ -67,7 +64,7 @@ public class GradientsActivity extends Activity { bitmapView.setRotationX((float) progress); } }); - + layout.addView(shadersView); layout.addView(gradientView, new FrameLayout.LayoutParams( 200, 200, Gravity.CENTER)); @@ -90,7 +87,7 @@ public class GradientsActivity extends Activity { setContentView(layout); } - + static class BitmapView extends View { private final Paint mPaint; @@ -116,7 +113,7 @@ public class GradientsActivity extends Activity { canvas.drawRect(0.0f, 0.0f, getWidth(), getHeight(), mPaint); } } - + static class GradientView extends View { private final Paint mPaint; @@ -166,14 +163,14 @@ public class GradientsActivity extends Activity { canvas.drawRect(0.0f, 0.0f, getWidth(), getHeight(), mPaint); } } - + static class SweepGradientView extends View { private final Paint mPaint; SweepGradientView(Context c) { super(c); - SweepGradient gradient = new SweepGradient(100.0f, 100.0f, 0xff000000, 0xffffffff); + SweepGradient gradient = new SweepGradient(100.0f, 100.0f, 0xff000000, 0xffffffff); mPaint = new Paint(); mPaint.setShader(gradient); } @@ -190,7 +187,7 @@ public class GradientsActivity extends Activity { canvas.drawRect(0.0f, 0.0f, getWidth(), getHeight(), mPaint); } } - + static class ShadersView extends View { private final Paint mPaint; private final float mDrawWidth; @@ -232,12 +229,12 @@ public class GradientsActivity extends Activity { top += 40.0f + mDrawHeight; bottom += 40.0f + mDrawHeight; - + mMatrix.setScale(1, mDrawHeight); mMatrix.postTranslate(left, top); mGradient.setLocalMatrix(mMatrix); canvas.drawRect(left, top, right, top + mDrawHeight, mPaint); - + left += 40.0f + mDrawWidth; right += 40.0f + mDrawWidth; top -= 40.0f + mDrawHeight; @@ -251,13 +248,13 @@ public class GradientsActivity extends Activity { top += 40.0f + mDrawHeight; bottom += 40.0f + mDrawHeight; - + mMatrix.setScale(1, mDrawWidth); mMatrix.postRotate(-90); mMatrix.postTranslate(left, top); mGradient.setLocalMatrix(mMatrix); canvas.drawRect(left, top, left + mDrawWidth, bottom, mPaint); - + canvas.restore(); } } diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/TextGammaActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/TextGammaActivity.java index 773d3904e599e..f40b89dc0d36a 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/TextGammaActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/TextGammaActivity.java @@ -43,9 +43,8 @@ public class TextGammaActivity extends Activity { )); setContentView(layout); - + layout.post(new Runnable() { - @Override public void run() { Bitmap b = Bitmap.createBitmap(gamma.getWidth(), gamma.getHeight(), Bitmap.Config.ARGB_8888); @@ -88,7 +87,7 @@ public class TextGammaActivity extends Activity { final LinearLayout layout = new LinearLayout(this); layout.setOrientation(LinearLayout.VERTICAL); - + final GammaTextView gamma = new GammaTextView(this); final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT