summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-08-14 17:43:04 -0700
committerAndrew Lee <anwlee@google.com>2014-08-15 17:26:17 -0700
commitf43b32f1b227c043bc7d7af0d66dfc0c9aa5a2e8 (patch)
tree8ec3e49835c6ba88bdcefee8b5d753a97f4fdd23 /res
parente4ea104a18417115f35983bd4872bfe22a66bdfd (diff)
Tweak FAB tints and positioning.
+ Change FAB tint so that it's not 100% opacity. + Change dialpad touch tints to new theme color. - Don't translate FAB downwards when opening dialpad. Bug: 16399233 Change-Id: I7d5e0015e0d7d436ce3e2780f3048dfb792d13c0
Diffstat (limited to 'res')
-rw-r--r--res/drawable/floating_action_button.xml2
-rw-r--r--res/values/colors.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml
index 347e9d490..cbbfb8542 100644
--- a/res/drawable/floating_action_button.xml
+++ b/res/drawable/floating_action_button.xml
@@ -16,6 +16,6 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/dialer_accent_color">
+ android:color="@color/floating_action_button_touch_tint">
<item android:drawable="@drawable/fab_blue" />
</ripple>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 448d1e6c1..a3fd3f923 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,7 +19,6 @@
<color name="dialtacts_primary_text_color">#333</color>
<!-- Secondary text color in the Dialer -->
<color name="dialtacts_secondary_text_color">#737373</color>
- <color name="dialer_accent_color">#eeff41</color>
<color name="dialer_red_highlight_color">#ff1744</color>
<color name="dialer_green_highlight_color">#00c853</color>
@@ -100,7 +99,8 @@
<!-- Color for icons in the actionbar -->
<color name="actionbar_icon_color">#ffffff</color>
- <color name="dialer_dialpad_touch_tint">#331dc7db</color>
+ <color name="dialer_dialpad_touch_tint">#330288d1</color>
+ <color name="floating_action_button_touch_tint">#80ffffff</color>
</resources>