diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-10 00:39:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-10 00:39:56 +0000 |
commit | 6cfe4b88f21142eb6145368e5f51a25904262b3b (patch) | |
tree | 1fdbc36c790c15f9c8e05e171be5fe483ef4eebb /InCallUI/res/drawable | |
parent | ff8200e38955212da5fa20a7d3b28eece5a34073 (diff) | |
parent | 215a0b09d59ef4384c4aef7b53cf70f8fff6fd80 (diff) |
am 84ac44b7: Update icons and dimensions for the InCallUI.
* commit '84ac44b71d8336709658ac65ce9acfa85df7dbf0':
Update icons and dimensions for the InCallUI.
Diffstat (limited to 'InCallUI/res/drawable')
7 files changed, 16 insertions, 34 deletions
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml index 6889581c7..1b4b8ad78 100644 --- a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml @@ -23,9 +23,6 @@ </shape> </item> <item - android:top="@dimen/incoming_call_widget_asset_margin" - android:right="@dimen/incoming_call_widget_asset_margin" - android:bottom="@dimen/incoming_call_widget_asset_margin" - android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_lockscreen_answer_activated" /> + 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 083fe3fbd..3d1ef47db 100644 --- a/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml @@ -24,9 +24,6 @@ </shape> </item> <item - android:top="@dimen/incoming_call_widget_asset_margin" - android:right="@dimen/incoming_call_widget_asset_margin" - android:bottom="@dimen/incoming_call_widget_asset_margin" - android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_lockscreen_answer_normal" /> + android:gravity="center" + android:drawable="@drawable/fab_ic_call" /> </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 e3606d1e7..9b52e0294 100644 --- a/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml @@ -23,9 +23,6 @@ </shape> </item> <item - android:top="@dimen/incoming_call_widget_asset_margin" - android:right="@dimen/incoming_call_widget_asset_margin" - android:bottom="@dimen/incoming_call_widget_asset_margin" - android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_lockscreen_decline_activated" /> + 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 2896bef80..af0ccbfb8 100644 --- a/InCallUI/res/drawable/ic_lockscreen_decline_normal_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_decline_normal_layer.xml @@ -24,9 +24,6 @@ </shape> </item> <item - android:top="@dimen/incoming_call_widget_asset_margin" - android:right="@dimen/incoming_call_widget_asset_margin" - android:bottom="@dimen/incoming_call_widget_asset_margin" - android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_lockscreen_decline_normal" /> + android:gravity="center" + android:drawable="@drawable/fab_ic_end_call" /> </layer-list> diff --git a/InCallUI/res/drawable/ic_lockscreen_outerring.xml b/InCallUI/res/drawable/ic_lockscreen_outerring.xml index d64825db0..b84a94a0b 100644 --- a/InCallUI/res/drawable/ic_lockscreen_outerring.xml +++ b/InCallUI/res/drawable/ic_lockscreen_outerring.xml @@ -15,10 +15,9 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" - > + android:shape="oval"> <size android:height="@dimen/glowpadview_outerring_diameter" android:width="@dimen/glowpadview_outerring_diameter" /> <solid android:color="#00000000" /> - <stroke android:color="#1affffff" android:width="2dp" /> + <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 489201f90..8da428a5c 100644 --- a/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml @@ -16,16 +16,14 @@ <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="#99cc00"/> + <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:top="@dimen/incoming_call_widget_asset_margin" - android:right="@dimen/incoming_call_widget_asset_margin" - android:bottom="@dimen/incoming_call_widget_asset_margin" - android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_text_holo_dark" /> + android:gravity="center" + android:drawable="@drawable/fab_ic_message" /> </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 a59148456..3665879e1 100644 --- a/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml +++ b/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml @@ -24,9 +24,6 @@ </shape> </item> <item - android:top="@dimen/incoming_call_widget_asset_margin" - android:right="@dimen/incoming_call_widget_asset_margin" - android:bottom="@dimen/incoming_call_widget_asset_margin" - android:left="@dimen/incoming_call_widget_asset_margin" - android:drawable="@drawable/ic_text_holo_dark" /> + android:gravity="center" + android:drawable="@drawable/fab_ic_message" /> </layer-list> |