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

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

am f536a97e: am 67ba3616: am b61e53f5: am e6130b6c: am 6d842f63: Merge "Fix... 

am f536a97e: am 67ba3616: am b61e53f5: am e6130b6c: am 6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev

* commit 'f536a97e7cbb41f927b8c65f3a56b2932a5c0157':
  Fix DocumentsUI animation regression.
parents 440fbac4 bc737948

res/layout-sw720dp/activity.xml

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

            android:layout_weight="1"

            android:orientation="vertical"

            android:background="@color/material_grey_50"

            android:elevation="8dp">



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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="@color/material_grey_50"

                android:elevation="8dp" />



        </LinearLayout>

res/layout/activity.xml

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@color/material_grey_50"

            android:elevation="8dp" />



    </LinearLayout>

res/layout/fragment_directory.xml

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


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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:background="@color/material_grey_50">



    <TextView

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

res/values/colors.xml

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



<resources>

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

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



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