diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-12 21:29:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-12 21:29:12 +0000 |
commit | b2f64dfb86eb3b72832ba2cb8ddc2a79300a7a3c (patch) | |
tree | 8d91a1f19aee3caf787a5af46b66e5c414b7b9f9 /InCallUI/res/drawable | |
parent | bc36839e4178147bfb9dba29955cb26d57bdf0fa (diff) | |
parent | 5a0df35b85a3d561f60e0663a45b4f6712d1a17f (diff) |
Merge "Change tints, backgrounds on incoming call icons."
Diffstat (limited to 'InCallUI/res/drawable')
9 files changed, 51 insertions, 42 deletions
diff --git a/InCallUI/res/drawable/btn_background.xml b/InCallUI/res/drawable/btn_background.xml index cb7042b41..9a6c2f0cc 100644 --- a/InCallUI/res/drawable/btn_background.xml +++ b/InCallUI/res/drawable/btn_background.xml @@ -22,7 +22,7 @@ android:tint="@color/incall_accent_color" android:pinned="true"> <item> - <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <selector> <item android:state_focused="true" android:drawable="@drawable/btn_unselected_focused" /> diff --git a/InCallUI/res/drawable/ic_in_call_touch_handle.xml b/InCallUI/res/drawable/ic_in_call_touch_handle.xml index 7e234b62b..47d902bb7 100644 --- a/InCallUI/res/drawable/ic_in_call_touch_handle.xml +++ b/InCallUI/res/drawable/ic_in_call_touch_handle.xml @@ -17,17 +17,24 @@ <!-- Touch handle for the GlowPadView widget on the incoming call screen --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Call icon on tinted floating action bar background. --> <item android:state_enabled="true" android:state_active="false" - android:state_focused="false" - android:drawable="@drawable/ic_in_call_touch_handle_normal" /> - - <!-- "Pressed" state uses the same simple "ring" image as on the lockscreen --> - <item - android:state_enabled="true" - android:state_active="true" - android:state_focused="false" - android:drawable="@drawable/ic_lockscreen_handle_pressed" /> + android:state_focused="false"> + <layer-list> + <item> + <bitmap + android:src="@drawable/fab_teal_background" + android:tint="@color/glowpad_incoming_widget_background_tint" /> + </item> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/fab_ic_call" + android:tint="@color/glowpad_incoming_widget_tint" /> + </item> + </layer-list> + </item> </selector> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml index 1b4b8ad78..b49d1dfd7 100644 --- a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml @@ -14,15 +14,11 @@ limitations under the License. --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/fab_teal_background" /> <item> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - <solid android:color="#99cc00"/> - <size - android:width="@dimen/incoming_call_widget_circle_size" - android:height="@dimen/incoming_call_widget_circle_size" /> - </shape> + <bitmap + android:gravity="center" + android:src="@drawable/fab_ic_call" + android:tint="@color/glowpad_widget_active_color" /> </item> - <item - android:gravity="center" - android:drawable="@drawable/fab_ic_call" /> </layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml index 3d1ef47db..28988239c 100644 --- a/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml @@ -23,7 +23,10 @@ android:height="@dimen/incoming_call_widget_circle_size" /> </shape> </item> - <item - android:gravity="center" - android:drawable="@drawable/fab_ic_call" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/fab_ic_call" + android:tint="@color/glowpad_call_widget_normal_tint" /> + </item> </layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml index 9b52e0294..6bddf9850 100644 --- a/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml @@ -14,15 +14,11 @@ limitations under the License. --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/fab_red_background" /> <item> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - <solid android:color="#ff4040"/> - <size - android:width="@dimen/incoming_call_widget_circle_size" - android:height="@dimen/incoming_call_widget_circle_size" /> - </shape> + <bitmap + android:gravity="center" + android:src="@drawable/fab_ic_end_call" + android:tint="@color/glowpad_widget_active_color" /> </item> - <item - android:gravity="center" - android:drawable="@drawable/fab_ic_end_call" /> </layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_decline_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_decline_normal_layer.xml index af0ccbfb8..4da5f8d66 100644 --- a/InCallUI/res/drawable/ic_lockscreen_decline_normal_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_decline_normal_layer.xml @@ -23,7 +23,10 @@ android:height="@dimen/incoming_call_widget_circle_size" /> </shape> </item> - <item - android:gravity="center" - android:drawable="@drawable/fab_ic_end_call" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/fab_ic_end_call" + android:tint="@color/glowpad_end_call_widget_normal_tint" /> + </item> </layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_outerring.xml b/InCallUI/res/drawable/ic_lockscreen_outerring.xml index b84a94a0b..489515fbc 100644 --- a/InCallUI/res/drawable/ic_lockscreen_outerring.xml +++ b/InCallUI/res/drawable/ic_lockscreen_outerring.xml @@ -18,6 +18,5 @@ android:shape="oval"> <size android:height="@dimen/glowpadview_outerring_diameter" android:width="@dimen/glowpadview_outerring_diameter" /> - <solid android:color="#00000000" /> <stroke android:color="@color/glowpad_outer_ring_color" android:width="1dp" /> </shape> diff --git a/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml index 8da428a5c..040b39913 100644 --- a/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml @@ -16,14 +16,16 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - <solid android:color="@null" /> <stroke android:color="@color/glowpad_text_widget_ring_color" android:width="1dp"/> <size android:width="@dimen/incoming_call_widget_circle_size" android:height="@dimen/incoming_call_widget_circle_size" /> </shape> </item> - <item - android:gravity="center" - android:drawable="@drawable/fab_ic_message" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/fab_ic_message" + android:tint="@color/glowpad_widget_active_color" /> + </item> </layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml index 3665879e1..950d1c38c 100644 --- a/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml @@ -23,7 +23,10 @@ android:height="@dimen/incoming_call_widget_circle_size" /> </shape> </item> - <item - android:gravity="center" - android:drawable="@drawable/fab_ic_message" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/fab_ic_message" + android:tint="@color/glowpad_text_widget_normal_tint" /> + </item> </layer-list> |