summaryrefslogtreecommitdiffstats
path: root/tests/HwAccelerationTest
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2014-04-11 14:20:08 -0700
committerChris Craik <ccraik@google.com>2014-04-11 14:20:08 -0700
commitdcc206dd76f5edbb588b06b3e4f3686cd9164f82 (patch)
tree4bf3c332ad6ac2a508b6da26474bbf146222a131 /tests/HwAccelerationTest
parent494fb7b58a21a7a9a8eba3bacecffe115edcb8c6 (diff)
downloadframeworks_base-dcc206dd76f5edbb588b06b3e4f3686cd9164f82.zip
frameworks_base-dcc206dd76f5edbb588b06b3e4f3686cd9164f82.tar.gz
frameworks_base-dcc206dd76f5edbb588b06b3e4f3686cd9164f82.tar.bz2
Remove isolated z volume test
Change-Id: I757cd9445b7e8f564b5f1357d3e5c17032daf17e
Diffstat (limited to 'tests/HwAccelerationTest')
-rw-r--r--tests/HwAccelerationTest/AndroidManifest.xml9
-rw-r--r--tests/HwAccelerationTest/res/layout/isolation.xml56
-rw-r--r--tests/HwAccelerationTest/src/com/android/test/hwui/IsolationVolumeActivity.java12
3 files changed, 0 insertions, 77 deletions
diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml
index c8eefe0..0ad3456 100644
--- a/tests/HwAccelerationTest/AndroidManifest.xml
+++ b/tests/HwAccelerationTest/AndroidManifest.xml
@@ -867,14 +867,5 @@
</intent-filter>
</activity>
- <activity
- android:name="IsolationVolumeActivity"
- android:label="Reordering/IsolationVolume">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.test.hwui.TEST" />
- </intent-filter>
- </activity>
-
</application>
</manifest>
diff --git a/tests/HwAccelerationTest/res/layout/isolation.xml b/tests/HwAccelerationTest/res/layout/isolation.xml
deleted file mode 100644
index e66db19..0000000
--- a/tests/HwAccelerationTest/res/layout/isolation.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#f55">
- <!-- Left and right layouts are not isolated volumes, so the text views
- will interleave since they share an isolated z volume-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="200dp"
- android:layout_weight="1"
- android:orientation="vertical">
- <TextView style="@style/TopLeftReorderTextView"/>
- <TextView style="@style/BottomLeftReorderTextView"/>
- </LinearLayout>
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="200dp"
- android:layout_weight="1"
- android:translationY="50dp"
- android:orientation="vertical">
- <TextView style="@style/TopRightReorderTextView"/>
- <TextView style="@style/BottomRightReorderTextView"/>
- </LinearLayout>
- </LinearLayout>
-
- <!-- Left and right volumes are isolated by default, so no interleaving will be seen. -->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="200dp"
- android:layout_weight="1"
- android:orientation="vertical">
- <TextView style="@style/TopLeftReorderTextView"/>
- <TextView style="@style/BottomLeftReorderTextView"/>
- </LinearLayout>
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="200dp"
- android:layout_weight="1"
- android:translationY="50dp"
- android:orientation="vertical">
- <TextView style="@style/TopRightReorderTextView"/>
- <TextView style="@style/BottomRightReorderTextView"/>
- </LinearLayout>
- </LinearLayout>
-</LinearLayout> \ No newline at end of file
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/IsolationVolumeActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/IsolationVolumeActivity.java
deleted file mode 100644
index d5c93f2..0000000
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/IsolationVolumeActivity.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.android.test.hwui;
-
-import android.os.Bundle;
-import android.app.Activity;
-
-public class IsolationVolumeActivity extends Activity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.isolation);
- }
-}