Add support for saveLayer().
saveLayer() is affected by the paint's alpha and xfermode.
Change-Id: I28693a9337052643adccdb4889a8f228d4e17903
diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml
index 7dfa672..30ac8d6 100644
--- a/tests/HwAccelerationTest/AndroidManifest.xml
+++ b/tests/HwAccelerationTest/AndroidManifest.xml
@@ -22,8 +22,18 @@
android:hardwareAccelerated="true">
<activity
- android:name="HwUiActivity"
- android:label="_Layers">
+ android:name="AlphaLayersActivity"
+ android:label="_αLayers">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ <activity
+ android:name="LayersActivity"
+ android:label="_Layers"
+ android:theme="@android:style/Theme.Translucent">
<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/HwUiActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/AlphaLayersActivity.java
similarity index 98%
rename from tests/HwAccelerationTest/src/com/google/android/test/hwui/HwUiActivity.java
rename to tests/HwAccelerationTest/src/com/google/android/test/hwui/AlphaLayersActivity.java
index 85e3997..0217a05 100644
--- a/tests/HwAccelerationTest/src/com/google/android/test/hwui/HwUiActivity.java
+++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/AlphaLayersActivity.java
@@ -29,7 +29,7 @@
import android.widget.FrameLayout;
@SuppressWarnings({"UnusedDeclaration"})
-public class HwUiActivity extends Activity {
+public class AlphaLayersActivity extends Activity {
private static final String LOG_TAG = "HwUi";
@Override
diff --git a/tests/HwAccelerationTest/src/com/google/android/test/hwui/LayersActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/LayersActivity.java
new file mode 100644
index 0000000..437cd1c
--- /dev/null
+++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/LayersActivity.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.test.hwui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.os.Bundle;
+import android.view.View;
+
+@SuppressWarnings({"UnusedDeclaration"})
+public class LayersActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(new LayersView(this));
+ }
+
+ static class LayersView extends View {
+ private Paint mLayerPaint;
+ private final Paint mRectPaint;
+
+ LayersView(Context c) {
+ super(c);
+
+ mLayerPaint = new Paint();
+ mRectPaint = new Paint();
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+
+ canvas.translate(140.0f, 100.0f);
+
+ //canvas.drawRGB(255, 255, 255);
+
+ int count = canvas.saveLayer(0.0f, 0.0f, 200.0f, 100.0f, mLayerPaint,
+ Canvas.ALL_SAVE_FLAG);
+
+ mRectPaint.setColor(0xffff0000);
+ canvas.drawRect(0.0f, 0.0f, 200.0f, 100.0f, mRectPaint);
+
+ canvas.restoreToCount(count);
+
+ canvas.translate(0.0f, 125.0f);
+
+ count = canvas.saveLayer(0.0f, 0.0f, 200.0f, 100.0f, mLayerPaint,
+ Canvas.ALL_SAVE_FLAG);
+
+ mRectPaint.setColor(0xff00ff00);
+ mRectPaint.setAlpha(50);
+ canvas.drawRect(0.0f, 0.0f, 200.0f, 100.0f, mRectPaint);
+
+ canvas.restoreToCount(count);
+
+ canvas.translate(25.0f, 125.0f);
+
+ mRectPaint.setColor(0xff0000ff);
+ mRectPaint.setAlpha(255);
+ canvas.drawRect(0.0f, 0.0f, 100.0f, 50.0f, mRectPaint);
+
+ mLayerPaint.setAlpha(127);
+ mLayerPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OUT));
+ count = canvas.saveLayer(50.0f, 25.0f, 150.0f, 75.0f, mLayerPaint,
+ Canvas.ALL_SAVE_FLAG);
+
+ mRectPaint.setColor(0xffff0000);
+ canvas.drawRect(50.0f, 25.0f, 150.0f, 75.0f, mRectPaint);
+
+ canvas.restoreToCount(count);
+
+ canvas.translate(0.0f, 125.0f);
+
+ mRectPaint.setColor(0xff0000ff);
+ mRectPaint.setAlpha(255);
+ canvas.drawRect(0.0f, 0.0f, 100.0f, 50.0f, mRectPaint);
+
+ mLayerPaint.setColor(0xffff0000);
+ mLayerPaint.setAlpha(127);
+ mLayerPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_ATOP));
+ count = canvas.saveLayer(50.0f, 25.0f, 150.0f, 75.0f, mLayerPaint,
+ Canvas.ALL_SAVE_FLAG);
+
+ mRectPaint.setColor(0xffff0000);
+ canvas.drawRect(50.0f, 25.0f, 150.0f, 75.0f, mRectPaint);
+
+ canvas.restoreToCount(count);
+
+ mLayerPaint = new Paint();
+ }
+ }
+}
diff --git a/tests/HwAccelerationTest/src/com/google/android/test/hwui/XfermodeActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/XfermodeActivity.java
index 440d622..8c81f02 100644
--- a/tests/HwAccelerationTest/src/com/google/android/test/hwui/XfermodeActivity.java
+++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/XfermodeActivity.java
@@ -35,11 +35,6 @@
setContentView(new XfermodesView(this));
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- static int dipToPx(Context c, int dip) {
- return (int) (c.getResources().getDisplayMetrics().density * dip + 0.5f);
- }
static class XfermodesView extends View {
private final Paint mBluePaint;