diff options
| author | Alan Viverette <alanv@google.com> | 2014-08-26 10:09:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-26 10:09:27 +0000 |
| commit | f4c2e445c5377ebdb8d97e4ee564c4c9983af5d3 (patch) | |
| tree | aec4223c0e05c4c739c15e0214b0963f766974af /packages/DocumentsUI | |
| parent | 93976b3df2af407fd8c76d60b33c04db064e927d (diff) | |
| parent | d7abe68c9b107755bac7a71b8eb18bf0e5f703c6 (diff) | |
| download | frameworks_base-f4c2e445c5377ebdb8d97e4ee564c4c9983af5d3.zip frameworks_base-f4c2e445c5377ebdb8d97e4ee564c4c9983af5d3.tar.gz frameworks_base-f4c2e445c5377ebdb8d97e4ee564c4c9983af5d3.tar.bz2 | |
am c0073bfa: am 77cc46f2: am 20862a7f: Merge "Update material colors" into lmp-dev
* commit 'c0073bfa6b3043ca7ddc1f410f8085887267ef91':
Update material colors
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/res/layout-sw720dp/activity.xml | 4 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/layout/activity.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/layout/fragment_directory.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/colors.xml | 5 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/styles.xml | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/packages/DocumentsUI/res/layout-sw720dp/activity.xml b/packages/DocumentsUI/res/layout-sw720dp/activity.xml index c33932d..1cffd17 100644 --- a/packages/DocumentsUI/res/layout-sw720dp/activity.xml +++ b/packages/DocumentsUI/res/layout-sw720dp/activity.xml @@ -54,7 +54,7 @@ android:layout_weight="1" android:orientation="vertical" android:elevation="8dp" - android:background="@*android:color/material_grey_50"> + android:background="@color/material_grey_50"> <com.android.documentsui.DirectoryContainerView android:id="@+id/container_directory" @@ -66,7 +66,7 @@ android:id="@+id/container_save" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@*android:color/material_grey_50" + 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 d580821..120168e 100644 --- a/packages/DocumentsUI/res/layout/activity.xml +++ b/packages/DocumentsUI/res/layout/activity.xml @@ -51,7 +51,7 @@ android:id="@+id/container_save" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@*android:color/material_grey_50" + 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 c8c707e..4717839 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -17,7 +17,7 @@ <com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@*android:color/material_grey_50"> + 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 08159c4..7442b09 100644 --- a/packages/DocumentsUI/res/values/colors.xml +++ b/packages/DocumentsUI/res/values/colors.xml @@ -15,10 +15,11 @@ --> <resources> + <color name="material_grey_50">#fffafafa</color> + <color name="material_grey_300">#ffeeeeee</color> <!-- Half-alpha of material_teal_500 --> <color name="accent_color_overlay">#8800bcd4</color> - <color name="grid_item_background">@*android:color/material_grey_300</color> - + <color name="grid_item_background">@color/material_grey_300</color> </resources> diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 573081c..5cfe046 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -25,7 +25,7 @@ <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item> <item name="android:colorPrimary">@*android:color/material_blue_grey_800</item> - <item name="android:colorAccent">@*android:color/material_teal_500</item> + <item name="android:colorAccent">@*android:color/material_deep_teal_500</item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> |