Update icons and dimensions for the InCallUI.
- Swapped in new icons, and deleted old icons.
- Made the diameter of the glowpad smaller, and deleted unused
constants.
Bug: 14658215
Change-Id: I9cf69043270214ac71810d8be393c16dfcd2787b
diff --git a/InCallUI/res/drawable-hdpi/fab_ic_call.png b/InCallUI/res/drawable-hdpi/fab_ic_call.png
new file mode 100644
index 0000000..548a391
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/fab_ic_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/fab_ic_message.png b/InCallUI/res/drawable-hdpi/fab_ic_message.png
new file mode 100644
index 0000000..a1cf2ad
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/fab_ic_message.png
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index ecfeb2d..0000000
--- a/InCallUI/res/drawable-hdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_answer_activated.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_answer_activated.png
deleted file mode 100644
index 3d2752f..0000000
--- a/InCallUI/res/drawable-hdpi/ic_lockscreen_answer_activated.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 9e26eda..0000000
--- a/InCallUI/res/drawable-hdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index b7a438f..0000000
--- a/InCallUI/res/drawable-hdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index a687ae3..0000000
--- a/InCallUI/res/drawable-hdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 7ec3709..0000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 6020b3d..0000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index c42e7e3..0000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_ic_call.png b/InCallUI/res/drawable-mdpi/fab_ic_call.png
new file mode 100644
index 0000000..ff7b345
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/fab_ic_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_ic_message.png b/InCallUI/res/drawable-mdpi/fab_ic_message.png
new file mode 100644
index 0000000..74876fe
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/fab_ic_message.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 51ad9e3..0000000
--- a/InCallUI/res/drawable-mdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_ic_call.png b/InCallUI/res/drawable-xhdpi/fab_ic_call.png
new file mode 100644
index 0000000..2bff65e
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/fab_ic_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_ic_message.png b/InCallUI/res/drawable-xhdpi/fab_ic_message.png
new file mode 100644
index 0000000..5e3334a
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/fab_ic_message.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 3f43a82..0000000
--- a/InCallUI/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_ic_call.png b/InCallUI/res/drawable-xxhdpi/fab_ic_call.png
new file mode 100644
index 0000000..a756b95
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/fab_ic_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_ic_message.png b/InCallUI/res/drawable-xxhdpi/fab_ic_message.png
new file mode 100644
index 0000000..66984b1
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/fab_ic_message.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 3c8021c..0000000
--- a/InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml
index 6889581..1b4b8ad 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 083fe3f..3d1ef47 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 e3606d1..9b52e02 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 2896bef..af0ccbf 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 d64825d..b84a94a 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 489201f..8da428a 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 a591484..3665879 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>
diff --git a/InCallUI/res/menu/incall_audio_mode_menu.xml b/InCallUI/res/menu/incall_audio_mode_menu.xml
index 0139895..0af6589 100644
--- a/InCallUI/res/menu/incall_audio_mode_menu.xml
+++ b/InCallUI/res/menu/incall_audio_mode_menu.xml
@@ -26,10 +26,10 @@
depending on whether a wired headset is physically plugged in
(see InCallTouchUi.showAudioModePopup().) -->
<item android:id="@+id/audio_mode_earpiece"
- android:icon="@drawable/ic_ab_dialer_holo_dark"
+ android:icon="@drawable/fab_ic_call"
android:title="@string/audio_mode_earpiece" />
<item android:id="@+id/audio_mode_wired_headset"
- android:icon="@drawable/ic_ab_dialer_holo_dark"
+ android:icon="@drawable/fab_ic_call"
android:title="@string/audio_mode_wired_headset" />
<item android:id="@+id/audio_mode_bluetooth"
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 1aebb1b..5836bd7 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -20,11 +20,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>
- <!-- green -->
- <color name="incall_callTypeSip">#99CE3F</color>
<!-- Background color of main banner. -->
<color name="incall_call_banner_background_color">@color/incall_background_color</color>
<!-- white -->
@@ -67,4 +63,10 @@
<color name="translucent_shadow">#33999999</color>
+ <!-- 70% opacity, black. -->
+ <color name="glowpad_background_color">#b3000000</color>
+ <!-- 15% opacity, white. -->
+ <color name="glowpad_outer_ring_color">#26ffffff</color>
+ <color name="glowpad_text_widget_ring_color">#ffffff</color>
+
</resources>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index c6b819d..af608a6 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -78,21 +78,15 @@
<dimen name="notification_icon_size">64dp</dimen>
<!-- Circle size for incoming call widget's each item. -->
- <dimen name="incoming_call_widget_circle_size">94dp</dimen>
- <!-- Margin used for incoming call widget's icon for each item.
- This should be same as "(incoming_call_widget_circle_size - icon_size)/2".
- Right now answer/decline/reject icons have 38dp width/height.
- So, (94 - 38)/2 ==> 28dp -->
- <dimen name="incoming_call_widget_asset_margin">28dp</dimen>
+ <dimen name="incoming_call_widget_circle_size">56dp</dimen>
<!-- Size of alarm alert outer ring. -->
- <dimen name="glowpadview_outerring_diameter">270dip</dimen>
-
+ <dimen name="glowpadview_outerring_diameter">250dp</dimen>
<!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
- <dimen name="glowpadview_target_placement_radius">135dip</dimen>
+ <dimen name="glowpadview_target_placement_radius">125dp</dimen>
<!-- Default glow radius for GlowPadView -->
- <dimen name="glowpadview_glow_radius">75dip</dimen>
+ <dimen name="glowpadview_glow_radius">70dip</dimen>
<!-- Default distance beyond which GlowPadView snaps to the matching target -->
<dimen name="glowpadview_snap_margin">40dip</dimen>
