diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-06-02 09:07:31 +0200 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-06-07 00:31:09 -0700 |
commit | 8ce4db214a55c44413b6a2e57024a96da9533677 (patch) | |
tree | 0e719a2fa817b556d38b520b404e5f465ef629f1 | |
parent | c6cce58b3fc633db62fc192fc65eeaba5cdfc503 (diff) | |
download | android_packages_apps_InCallUI-8ce4db214a55c44413b6a2e57024a96da9533677.tar.gz android_packages_apps_InCallUI-8ce4db214a55c44413b6a2e57024a96da9533677.tar.bz2 android_packages_apps_InCallUI-8ce4db214a55c44413b6a2e57024a96da9533677.zip |
Fix appearance of auxiliary circles in GlowPadView.
Change-Id: I1ba8fba8c707837559c03a1346c43979fadeea5a
8 files changed, 26 insertions, 29 deletions
diff --git a/res/drawable/ic_lockscreen_answer_end_current_activated_layer.xml b/res/drawable/ic_lockscreen_answer_end_current_activated_layer.xml index 84cf3bf6..f9cd2064 100644 --- a/res/drawable/ic_lockscreen_answer_end_current_activated_layer.xml +++ b/res/drawable/ic_lockscreen_answer_end_current_activated_layer.xml @@ -16,5 +16,8 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item android:drawable="@drawable/ic_lockscreen_answer_activated_layer" /> - <item android:drawable="@drawable/ic_lockscreen_decline_small_layer" /> + <item + android:left="@dimen/incoming_call_widget_small_circle_offset" + android:top="@dimen/incoming_call_widget_small_circle_offset" + android:drawable="@drawable/ic_lockscreen_decline_small_layer" /> </layer-list> diff --git a/res/drawable/ic_lockscreen_answer_end_current_normal_layer.xml b/res/drawable/ic_lockscreen_answer_end_current_normal_layer.xml index d9f7b413..d8a08f38 100644 --- a/res/drawable/ic_lockscreen_answer_end_current_normal_layer.xml +++ b/res/drawable/ic_lockscreen_answer_end_current_normal_layer.xml @@ -17,8 +17,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item android:drawable="@drawable/ic_lockscreen_answer_normal_layer" /> <item - android:top="@dimen/incoming_call_widget_small_circle_top_offset" - android:left="@dimen/incoming_call_widget_small_circle_left_offset"> + android:top="@dimen/incoming_call_widget_small_circle_offset" + android:left="@dimen/incoming_call_widget_small_circle_offset"> <bitmap android:gravity="center" android:src="@drawable/ic_call_end_16dp" diff --git a/res/drawable/ic_lockscreen_answer_hold_current_activated_layer.xml b/res/drawable/ic_lockscreen_answer_hold_current_activated_layer.xml index 9a63e737..d0003287 100644 --- a/res/drawable/ic_lockscreen_answer_hold_current_activated_layer.xml +++ b/res/drawable/ic_lockscreen_answer_hold_current_activated_layer.xml @@ -16,5 +16,8 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item android:drawable="@drawable/ic_lockscreen_answer_activated_layer" /> - <item android:drawable="@drawable/ic_lockscreen_hold_small_layer" /> + <item + android:top="@dimen/incoming_call_widget_small_circle_offset" + android:left="@dimen/incoming_call_widget_small_circle_offset" + android:drawable="@drawable/ic_lockscreen_hold_small_layer" /> </layer-list> diff --git a/res/drawable/ic_lockscreen_answer_hold_current_normal_layer.xml b/res/drawable/ic_lockscreen_answer_hold_current_normal_layer.xml index dc38fd8f..8dc74875 100644 --- a/res/drawable/ic_lockscreen_answer_hold_current_normal_layer.xml +++ b/res/drawable/ic_lockscreen_answer_hold_current_normal_layer.xml @@ -17,8 +17,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item android:drawable="@drawable/ic_lockscreen_answer_normal_layer" /> <item - android:top="@dimen/incoming_call_widget_small_circle_top_offset" - android:left="@dimen/incoming_call_widget_small_circle_left_offset"> + android:top="@dimen/incoming_call_widget_small_circle_offset" + android:left="@dimen/incoming_call_widget_small_circle_offset"> <bitmap android:gravity="center" android:src="@drawable/ic_pause_16dp" diff --git a/res/drawable/ic_lockscreen_block_activated_layer.xml b/res/drawable/ic_lockscreen_block_activated_layer.xml index ae1425ff..1f6431a4 100644 --- a/res/drawable/ic_lockscreen_block_activated_layer.xml +++ b/res/drawable/ic_lockscreen_block_activated_layer.xml @@ -30,7 +30,7 @@ android:autoMirrored="true" /> </item> <item - android:top="@dimen/incoming_call_widget_small_circle_top_offset" - android:left="@dimen/incoming_call_widget_small_circle_left_offset" + android:top="@dimen/incoming_call_widget_small_circle_offset" + android:left="@dimen/incoming_call_widget_small_circle_offset" android:drawable="@drawable/ic_lockscreen_decline_small_layer" /> </layer-list> diff --git a/res/drawable/ic_lockscreen_decline_small_layer.xml b/res/drawable/ic_lockscreen_decline_small_layer.xml index 9b51e432..2eed896b 100644 --- a/res/drawable/ic_lockscreen_decline_small_layer.xml +++ b/res/drawable/ic_lockscreen_decline_small_layer.xml @@ -16,14 +16,10 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item> - <shape - android:shape="ring" - android:innerRadius="0dp" - android:thickness="@dimen/incoming_call_widget_small_circle_thickness" - android:useLevel="false"> - <solid android:color="@color/incoming_call_decline_small_circle"/> - <size android:width="@dimen/incoming_call_widget_small_circle_width" - android:height="@dimen/incoming_call_widget_small_circle_height"/> + <shape android:shape="oval"> + <solid android:color="@color/incoming_call_decline_small_circle" /> + <size android:width="@dimen/incoming_call_widget_small_circle_size" + android:height="@dimen/incoming_call_widget_small_circle_size" /> </shape> </item> <item> diff --git a/res/drawable/ic_lockscreen_hold_small_layer.xml b/res/drawable/ic_lockscreen_hold_small_layer.xml index 5a19b330..042bb3c0 100644 --- a/res/drawable/ic_lockscreen_hold_small_layer.xml +++ b/res/drawable/ic_lockscreen_hold_small_layer.xml @@ -16,14 +16,10 @@ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item> - <shape - android:shape="ring" - android:innerRadius="0dp" - android:thickness="@dimen/incoming_call_widget_small_circle_thickness" - android:useLevel="false"> - <solid android:color="@color/incoming_call_hold_small_circle"/> - <size android:width="@dimen/incoming_call_widget_small_circle_width" - android:height="@dimen/incoming_call_widget_small_circle_height"/> + <shape android:shape="oval"> + <solid android:color="@color/incoming_call_hold_small_circle" /> + <size android:width="@dimen/incoming_call_widget_small_circle_size" + android:height="@dimen/incoming_call_widget_small_circle_size" /> </shape> </item> <item> diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml index 4807b61d..57394fe8 100644 --- a/res/values/cm_dimens.xml +++ b/res/values/cm_dimens.xml @@ -42,13 +42,12 @@ <dimen name="incoming_call_widget_circle_thickness">22dp</dimen> <dimen name="incoming_call_widget_ring_thickness">2dp</dimen> <dimen name="incoming_call_widget_ring_inner_radius">27dp</dimen> - <dimen name="incoming_call_widget_small_circle_top_offset">30dp</dimen> <dimen name="incoming_call_widget_small_circle_thickness">11dp</dimen> - <dimen name="incoming_call_widget_small_circle_width">20dp</dimen> - <dimen name="incoming_call_widget_small_circle_height">20dp</dimen> - <dimen name="incoming_call_widget_small_circle_left_offset">30dp</dimen> + <dimen name="incoming_call_widget_small_circle_size">20dp</dimen> <dimen name="incoming_call_widget_display_text_side_offset">30dp</dimen> - + <!-- this offset is calculated as (incoming_call_widget_circle_size - incoming_call_widget_small_circle_size) + so that the small circle is bottom-right aligned to the large one --> + <dimen name="incoming_call_widget_small_circle_offset">36dp</dimen> <dimen name="mod_button_inset">12dp</dimen> <dimen name="mod_button_margin_bottom">0dp</dimen> |