Show different glowpad options for incoming video call.
- Refactor code be more flexibile/specific in specifying the targets
for the glow pad; went from "n-way" labeling of different target sets
to more explicit labeling of scenarios, such as "audio without sms".
- Add target sets and cases for showing targest in AnswerFragment.
- Added new drawable for the target to answer a video call.
- Add method to GlowPadView to allow changing the handle (now it may
be either a videocamera or phone icon, depending on the scenario).
- Add a new video handle for incoming video calls.
- TODO: Hook this up to show these glowpads if there is an incoming
video call.
- Deleted some unused resource files.
Bug: 16015750
Change-Id: I77ff08f45f57cd2817866b5d78648af8891bb675
diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml
index 92630b8..7026dd1 100644
--- a/InCallUI/res/layout/answer_fragment.xml
+++ b/InCallUI/res/layout/answer_fragment.xml
@@ -28,10 +28,10 @@
android:background="@color/glowpad_background_color"
android:visibility="gone"
- dc:targetDrawables="@array/incoming_call_widget_3way_targets"
- dc:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
- dc:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions"
- dc:handleDrawable="@drawable/ic_in_call_touch_handle"
+ dc:targetDrawables="@array/incoming_call_widget_audio_with_sms_targets"
+ dc:targetDescriptions="@array/incoming_call_widget_audio_with_sms_target_descriptions"
+ dc:directionDescriptions="@array/incoming_call_widget_audio_with_sms_direction_descriptions"
+ dc:handleDrawable="@drawable/ic_incall_audio_handle"
dc:outerRingDrawable="@drawable/ic_lockscreen_outerring"
dc:outerRadius="@dimen/glowpadview_target_placement_radius"
dc:innerRadius="@dimen/glowpadview_inner_radius"
@@ -40,5 +40,4 @@
dc:vibrationDuration="20"
dc:glowRadius="@dimen/glowpadview_glow_radius"
dc:pointDrawable="@drawable/ic_lockscreen_glowdot"
- dc:allowScaling="true"
- />
+ dc:allowScaling="true" />