Correctly set the viewport in layers.

Bug #2919295

Change-Id: I16ce79ab0d5747cb01c6c1abe531da3dfd93fb54

3 files changed, 84 insertions, 19 deletions

diff --git a/tests/HwAccelerationTest/res/layout/stack.xml b/tests/HwAccelerationTest/res/layout/stack.xml
new file mode 100644
index 0000000..b4d2d73a
--- /dev/null
+++ b/tests/HwAccelerationTest/res/layout/stack.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
+    android:focusable="true">
+    <StackView
+        android:id="@+id/stack_view" 
+        android:layout_width="348px" 
+        android:layout_height="374px"
+        android:layout_gravity="center"
+        android:background="#00000000"
+        android:cacheColorHint="#00000000"
+        android:autoStart="true" />
+</FrameLayout>
diff --git a/tests/HwAccelerationTest/res/layout/stack_item.xml b/tests/HwAccelerationTest/res/layout/stack_item.xml
new file mode 100644
index 0000000..3504018
--- /dev/null
+++ b/tests/HwAccelerationTest/res/layout/stack_item.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/stack_item"  
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"> 
+    <FrameLayout  
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"> 
+        <ImageView android:id="@+id/textview_icon"
+            android:layout_height="250dip"
+            android:layout_width="250dip"
+            android:layout_gravity="center" />
+        <TextView android:id="@+id/mini_text"
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content" 
+            android:layout_gravity="center" />
+    </FrameLayout>
+    <TextView 
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_gravity="center" />
+</FrameLayout>
\ No newline at end of file
diff --git a/tests/HwAccelerationTest/src/com/google/android/test/hwui/StackActivity.java b/tests/HwAccelerationTest/src/com/google/android/test/hwui/StackActivity.java
index 46c790c..5c8db6e 100644
--- a/tests/HwAccelerationTest/src/com/google/android/test/hwui/StackActivity.java
+++ b/tests/HwAccelerationTest/src/com/google/android/test/hwui/StackActivity.java
@@ -19,14 +19,13 @@ package com.google.android.test.hwui;
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
 import android.widget.ArrayAdapter;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.StackView;
+import android.widget.TextView;
 
 @SuppressWarnings({"UnusedDeclaration"})
 public class StackActivity extends Activity {
@@ -34,32 +33,27 @@ public class StackActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        StackView stack = new StackView(this);
+        setContentView(R.layout.stack);
+
+        StackView stack = (StackView) findViewById(R.id.stack_view);
         stack.setAdapter(new ArrayAdapter<Drawable>(this, android.R.layout.simple_list_item_1,
                 android.R.id.text1, new Drawable[] {
             getResources().getDrawable(R.drawable.sunset1),
             getResources().getDrawable(R.drawable.sunset2),
-            getResources().getDrawable(R.drawable.sunset1),
-            getResources().getDrawable(R.drawable.sunset2),
-            getResources().getDrawable(R.drawable.sunset1),
-            getResources().getDrawable(R.drawable.sunset2)                
         }) {
             @Override
             public View getView(int position, View convertView, ViewGroup parent) {
-                ImageView image;
-                if (convertView == null) {
-                    image = new ImageView(StackActivity.this);
-                } else {
-                    image = (ImageView) convertView;
+                View item = convertView;
+                if (item == null) {
+                    item = LayoutInflater.from(getContext()).inflate(
+                            R.layout.stack_item, null, false);                    
                 }
-                image.setImageDrawable(getItem(position % getCount()));
-                return image;
+                ((ImageView) item.findViewById(R.id.textview_icon)).setImageDrawable(
+                        getItem(position % getCount()));
+                ((TextView) item.findViewById(R.id.mini_text)).setText("" + position);
+                return item;
             }
         });
         stack.setDisplayedChild(0);
-
-        FrameLayout layout = new FrameLayout(this);
-        layout.addView(stack, new FrameLayout.LayoutParams(500, 500, Gravity.CENTER));
-        setContentView(layout);
     }
 }