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

Commit 6dbca96f authored by Chris Craik's avatar Chris Craik
Browse files

Improve isolatedZVolume test

Shows interleaving effect better

Change-Id: I85361b15587306484dc8fa6d6366e866014c270f
parent adbd2ba1
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -5,13 +5,15 @@
    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="150dp"
            android:layout_height="200dp"
            android:layout_weight="1"
            android:isolatedZVolume="false"
            android:orientation="vertical">
@@ -20,21 +22,24 @@
        </LinearLayout>
        <LinearLayout
            android:layout_width="0dp"
            android:layout_height="150dp"
            android:layout_height="200dp"
            android:layout_weight="1"
            android:translationY="50dp"
            android:isolatedZVolume="false"
            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="150dp"
            android:layout_height="200dp"
            android:layout_weight="1"
            android:orientation="vertical">
            <TextView style="@style/TopLeftReorderTextView"/>
@@ -42,8 +47,9 @@
        </LinearLayout>
        <LinearLayout
            android:layout_width="0dp"
            android:layout_height="150dp"
            android:layout_height="200dp"
            android:layout_weight="1"
            android:translationY="50dp"
            android:orientation="vertical">
            <TextView style="@style/TopRightReorderTextView"/>
            <TextView style="@style/BottomRightReorderTextView"/>
+3 −3
Original line number Diff line number Diff line
<resources>
    <style name="ReorderTextView" parent="@android:style/TextAppearance.Medium">
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">75dp</item>
        <item name="android:layout_height">100dp</item>
        <item name="android:gravity">center</item>
    </style>
    <style name="LeftReorderTextView" parent="@style/ReorderTextView">
        <item name="android:translationX">50dp</item>
        <item name="android:translationX">20dp</item>
    </style>
    <style name="RightReorderTextView" parent="@style/ReorderTextView">
        <item name="android:translationX">-50dp</item>
        <item name="android:translationX">-20dp</item>
    </style>

    <style name="TopLeftReorderTextView" parent="@style/LeftReorderTextView">