Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ca5a6b authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Remove isolated z volume test"

parents 286ffe4b dcc206dd

tests/HwAccelerationTest/AndroidManifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -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>

tests/HwAccelerationTest/res/layout/isolation.xml

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
<?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

tests/HwAccelerationTest/src/com/android/test/hwui/IsolationVolumeActivity.java

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
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);

    }

}