diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-09 22:25:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 22:25:22 +0000 |
| commit | 32294aea9f60da2f796a0f0047372ef38db0f5ea (patch) | |
| tree | b7e7bd9cfa65a9239878c8c8ed610a0beac28e9f | |
| parent | 0b5d65f4eeb0d450a83284cbed6580b022213bad (diff) | |
| parent | ed70f6ee74391d1b34e300dff354c064f339ba08 (diff) | |
am 0ff634f2: Change button press to use yellow accent color.
* commit '0ff634f21390b1cf1376a3a0ae1da6a21fe59146':
Change button press to use yellow accent color.
| -rw-r--r-- | InCallUI/res/color/selectable_icon_tint.xml | 4 | ||||
| -rw-r--r-- | InCallUI/res/drawable/btn_background.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/drawable/btn_compound_background.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/values/colors.xml | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/InCallUI/res/color/selectable_icon_tint.xml b/InCallUI/res/color/selectable_icon_tint.xml index 42aa310bb..a5f80b774 100644 --- a/InCallUI/res/color/selectable_icon_tint.xml +++ b/InCallUI/res/color/selectable_icon_tint.xml @@ -16,8 +16,8 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#ffeeff41" android:state_selected="true" /> - <item android:color="#ffeeff41" android:state_pressed="true" /> + <item android:color="@color/incall_accent_color" android:state_selected="true" /> + <item android:color="@color/incall_accent_color" android:state_pressed="true" /> <!-- 70% white. --> <item android:color="#b3ffffff" /> </selector> diff --git a/InCallUI/res/drawable/btn_background.xml b/InCallUI/res/drawable/btn_background.xml index fabcf7c65..9bb536a67 100644 --- a/InCallUI/res/drawable/btn_background.xml +++ b/InCallUI/res/drawable/btn_background.xml @@ -19,7 +19,7 @@ These buttons have two states (checked and unchecked), and show a blue bar along the bottom edge when checked. --> <touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/tab_pressed_color" + android:tint="@color/incall_accent_color" android:pinned="true"> <selector xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml index 2f5a39d34..7beffa59f 100644 --- a/InCallUI/res/drawable/btn_compound_background.xml +++ b/InCallUI/res/drawable/btn_compound_background.xml @@ -17,7 +17,7 @@ <!-- Background resource for "compound buttons" in the in-call UI. These buttons have two states (selected and unselected). --> <touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/tab_pressed_color" + android:tint="@color/incall_accent_color" android:pinned="true"> <item> <selector> diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index 03e058d38..d10ecbbae 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -19,6 +19,7 @@ <!-- In-call UI background color. --> <color name="incall_background_color">#0fc6dc</color> + <color name="incall_accent_color">#eeff41</color> <!-- 80% opacity, black. --> <color name="glowpad_background_color">#cc000000</color> @@ -77,4 +78,5 @@ <color name="actionbar_background_color">#3B77E7</color> <color name="translucent_shadow">#33999999</color> + </resources> |