Merge "Change toolbar icons in the InCallUI."
diff --git a/InCallUI/res/color/selectable_icon_tint.xml b/InCallUI/res/color/selectable_icon_tint.xml
index 42aa310..a5f80b7 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 b38434d..cb7042b 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">
<item>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
@@ -31,4 +31,4 @@
</selector>
</item>
-</touch-feedback>
\ No newline at end of file
+</touch-feedback>
diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml
index 2f5a39d..7beffa5 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 7b23b60..1aebb1b 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>
@@ -65,4 +66,5 @@
<color name="actionbar_background_color">#3B77E7</color>
<color name="translucent_shadow">#33999999</color>
+
</resources>