diff options
author | Jason Monk <jmonk@google.com> | 2015-06-16 20:36:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-16 20:36:46 +0000 |
commit | 254e8aea22f36c90587315a58aeefda9683581eb (patch) | |
tree | e4f361684dfddb04af2243011756eedc77d4b77e /res | |
parent | 610413d307f0a65b26d2ffb04f8389c1fe568029 (diff) | |
parent | 78b1715bcb6b4baf340961db80652e96a72908e4 (diff) | |
download | packages_apps_Settings-254e8aea22f36c90587315a58aeefda9683581eb.tar.gz packages_apps_Settings-254e8aea22f36c90587315a58aeefda9683581eb.tar.bz2 packages_apps_Settings-254e8aea22f36c90587315a58aeefda9683581eb.zip |
Merge "Update for shortcuts" into mnc-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-xxxhdpi/shortcut_base.png | bin | 8711 -> 9974 bytes | |||
-rw-r--r-- | res/layout/shortcut_badge.xml | 1 | ||||
-rw-r--r-- | res/values/colors.xml | 3 |
3 files changed, 4 insertions, 0 deletions
diff --git a/res/drawable-xxxhdpi/shortcut_base.png b/res/drawable-xxxhdpi/shortcut_base.png Binary files differindex cd509dfb7..c5fcae7ce 100644 --- a/res/drawable-xxxhdpi/shortcut_base.png +++ b/res/drawable-xxxhdpi/shortcut_base.png diff --git a/res/layout/shortcut_badge.xml b/res/layout/shortcut_badge.xml index 117b38683..28f8652a2 100644 --- a/res/layout/shortcut_badge.xml +++ b/res/layout/shortcut_badge.xml @@ -28,6 +28,7 @@ android:id="@android:id/icon" android:layout_width="@dimen/shortcut_size" android:layout_height="@dimen/shortcut_size" + android:tint="@color/icon_accent" android:padding="12dp" android:scaleType="fitXY" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index c874970c4..03959898b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -100,4 +100,7 @@ <color name="zen_rule_name_warning">@color/system_warning_color</color> + <!-- Accent color that matches the settings launcher icon --> + <color name="icon_accent">#ffabffec</color> + </resources> |