summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rob Tsuk <robtsuk@google.com> 2013-09-24 22:44:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-09-24 22:44:38 +0000
commit198a7b5cb1ddb4c4e7c24537a7d3451913f7dd4c (patch)
tree1ce9e088f356d2beb2a349f17c35f8217697c9f8
parent870cb43585b2432622c807e762dd7992de4eb0f1 (diff)
parentdbef227670d23cf5e203c380920fd5e6af32b87e (diff)
Merge "Replace blue highlight feedback with gray." into klp-dev
-rw-r--r--core/res/res/values/colors.xml4
-rw-r--r--core/res/res/values/themes.xml8
2 files changed, 8 insertions, 4 deletions
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 284f61383d9f..f5c395004003 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -168,6 +168,8 @@
<!-- A light Holo shade of blue -->
<color name="holo_blue_light">#ff33b5e5</color>
+ <!-- A light Holo shade of gray -->
+ <color name="holo_gray_light">#33999999</color>
<!-- A light Holo shade of green -->
<color name="holo_green_light">#ff99cc00</color>
<!-- A light Holo shade of red -->
@@ -186,6 +188,8 @@
<color name="holo_orange_dark">#ffff8800</color>
<!-- A really bright Holo shade of blue -->
<color name="holo_blue_bright">#ff00ddff</color>
+ <!-- A really bright Holo shade of gray -->
+ <color name="holo_gray_bright">#33CCCCCC</color>
<drawable name="notification_template_icon_bg">#3333B5E5</drawable>
<drawable name="notification_template_icon_low_bg">#0cffffff</drawable>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 23bd1ca8036e..eb39926d3a8e 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -909,8 +909,8 @@ please see themes_device_defaults.xml.
<item name="disabledAlpha">0.5</item>
<item name="backgroundDimAmount">0.6</item>
- <item name="colorPressedHighlight">@color/holo_blue_light</item>
- <item name="colorLongPressedHighlight">@color/holo_blue_bright</item>
+ <item name="colorPressedHighlight">@color/holo_gray_light</item>
+ <item name="colorLongPressedHighlight">@color/holo_gray_bright</item>
<item name="colorFocusedHighlight">@color/holo_blue_dark</item>
<item name="colorMultiSelectHighlight">@color/holo_green_light</item>
<item name="colorActivatedHighlight">@color/holo_blue_dark</item>
@@ -1224,8 +1224,8 @@ please see themes_device_defaults.xml.
<item name="disabledAlpha">0.5</item>
<item name="backgroundDimAmount">0.6</item>
- <item name="colorPressedHighlight">@color/holo_blue_light</item>
- <item name="colorLongPressedHighlight">@color/holo_blue_bright</item>
+ <item name="colorPressedHighlight">@color/holo_gray_light</item>
+ <item name="colorLongPressedHighlight">@color/holo_gray_bright</item>
<item name="colorFocusedHighlight">@color/holo_blue_dark</item>
<item name="colorMultiSelectHighlight">@color/holo_green_light</item>
<item name="colorActivatedHighlight">@color/holo_blue_dark</item>