diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-07-06 19:01:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-06 19:01:33 +0000 |
| commit | 67ba36163ae0e02454c0a3c48e4b9ce5e4625aa1 (patch) | |
| tree | 4b185c7e51af6008404dba31f49769acbec69056 /packages/DocumentsUI | |
| parent | c2e16e9b923eaa17e6e0c7a96fe350b5cb7ad6d2 (diff) | |
| parent | b61e53f5f1bcbf3c9059a3ff58867990f5dde9a7 (diff) | |
| download | frameworks_base-67ba36163ae0e02454c0a3c48e4b9ce5e4625aa1.zip frameworks_base-67ba36163ae0e02454c0a3c48e4b9ce5e4625aa1.tar.gz frameworks_base-67ba36163ae0e02454c0a3c48e4b9ce5e4625aa1.tar.bz2 | |
am b61e53f5: am e6130b6c: am 6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev
* commit 'b61e53f5f1bcbf3c9059a3ff58867990f5dde9a7':
Fix DocumentsUI animation regression.
Diffstat (limited to 'packages/DocumentsUI')
4 files changed, 6 insertions, 1 deletions
diff --git a/packages/DocumentsUI/res/layout-sw720dp/activity.xml b/packages/DocumentsUI/res/layout-sw720dp/activity.xml index 2a273f4..221de13 100644 --- a/packages/DocumentsUI/res/layout-sw720dp/activity.xml +++ b/packages/DocumentsUI/res/layout-sw720dp/activity.xml @@ -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> diff --git a/packages/DocumentsUI/res/layout/activity.xml b/packages/DocumentsUI/res/layout/activity.xml index 43fdaf2..32431e3 100644 --- a/packages/DocumentsUI/res/layout/activity.xml +++ b/packages/DocumentsUI/res/layout/activity.xml @@ -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> diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml index 2c08e72..4717839 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -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" diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml index 2b839d4..ba8d69f 100644 --- a/packages/DocumentsUI/res/values/colors.xml +++ b/packages/DocumentsUI/res/values/colors.xml @@ -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> |