diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-20 16:11:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-20 16:11:18 +0000 |
| commit | 7e2e2aa80baa4458e086f59e8c55ee016174593c (patch) | |
| tree | c50cddf0db2d2c9bd37db8238fe0c7ad75d5444e /res/values | |
| parent | 5a1ca5756ecea6784743f5cd1540844c1a83b36f (diff) | |
| parent | 5931ca04155a7fcdfc1dc0665011a44101afda5f (diff) | |
| download | android_packages_apps_Trebuchet-7e2e2aa80baa4458e086f59e8c55ee016174593c.tar.gz android_packages_apps_Trebuchet-7e2e2aa80baa4458e086f59e8c55ee016174593c.tar.bz2 android_packages_apps_Trebuchet-7e2e2aa80baa4458e086f59e8c55ee016174593c.zip | |
Merge "Fixing dark tint for ShadowDrawable. Updating the dark theme for empty all-apps search drawable." into ub-launcher3-dorval-polish
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index b7189d17c..27992ceb6 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -130,6 +130,6 @@ <attr name="android:src" /> <attr name="android:shadowColor" /> <attr name="android:elevation" /> - <attr name="android:tint" /> + <attr name="darkTintColor" format="color"/> </declare-styleable> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 4f7c1a73d..b44a31e40 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -39,4 +39,5 @@ <color name="legacy_icon_background">#FFFFFF</color> <color name="all_apps_bg_hand_fill">#E5E5E5</color> + <color name="all_apps_bg_hand_fill_dark">#9AA0A6</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 594c7dbde..b982136da 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -156,4 +156,15 @@ <style name="TextTitle"> <item name="android:fontFamily">sans-serif</item> </style> + + <style name="AllAppsEmptySearchBackground"> + <item name="android:colorPrimary">#E0E0E0</item> + <item name="android:colorControlHighlight">#BDBDBD</item> + <item name="android:colorForeground">@color/all_apps_bg_hand_fill</item> + </style> + <style name="AllAppsEmptySearchBackground.Dark"> + <item name="android:colorPrimary">#9AA0A6</item> + <item name="android:colorControlHighlight">#DFE1E5</item> + <item name="android:colorForeground">@color/all_apps_bg_hand_fill_dark</item> + </style> </resources> |