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

Commit 24ffc089 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev 

* commit '6d842f63a00e34edb583f9fdd6f233c20dcd00f2':
  Fix DocumentsUI animation regression.
parents 09a72c9a 9b5ce474

res/layout-sw720dp/activity.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ 
            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:layout_weight="1"

            android:orientation="vertical"

            android:orientation="vertical"

            android:background="@color/material_grey_50"

            android:elevation="8dp">

            android:elevation="8dp">





            <com.android.documentsui.DirectoryContainerView

            <com.android.documentsui.DirectoryContainerView
@@ -67,6 +68,7 @@ 
                android:id="@+id/container_save"

                android:id="@+id/container_save"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:background="@color/material_grey_50"

                android:elevation="8dp" />

                android:elevation="8dp" />





        </LinearLayout>

        </LinearLayout>

res/layout/activity.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ 
            android:id="@+id/container_save"

            android:id="@+id/container_save"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:background="@color/material_grey_50"

            android:elevation="8dp" />

            android:elevation="8dp" />





    </LinearLayout>

    </LinearLayout>

res/layout/fragment_directory.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,8 @@ 




<com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:background="@color/material_grey_50">





    <TextView

    <TextView

        android:id="@android:id/empty"

        android:id="@android:id/empty"

res/values/colors.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

-->





<resources>

<resources>

    <color name="material_grey_50">#fffafafa</color>

    <color name="material_grey_300">#ffeeeeee</color>

    <color name="material_grey_300">#ffeeeeee</color>





    <color name="item_doc_grid_background">@color/material_grey_300</color>

    <color name="item_doc_grid_background">@color/material_grey_300</color>