summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-05-14 03:06:38 +0000
committerAndroid Partner Code Review <android-gerrit-partner@google.com>2015-05-14 03:06:38 +0000
commit39ca97d1fae3c42b4fcb7d22d7711473f0eb0eb4 (patch)
tree7f3d159861b13c5751eee88540405c8bdd8b55ad /InCallUI
parent3748bb4cd15d44f5de66202571dcc683a93229ab (diff)
parent2ce86dd837fe2a913f80fb3a0b96f4a2b7a9f4a0 (diff)
Merge "Move "answer as video" to swipe down on glowpad." into m-wireless-dev
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/values/array.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml
index 7877ec8f3..8744d3e11 100644
--- a/InCallUI/res/values/array.xml
+++ b/InCallUI/res/values/array.xml
@@ -76,10 +76,10 @@
<item>@drawable/ic_lockscreen_answer_video</item>
</array>
<array name="incoming_call_widget_video_without_sms_target_descriptions">
- <item>@string/description_target_answer_video_call</item>
+ <item>@string/description_target_answer_audio_call</item>
<item>@null</item>
<item>@string/description_target_decline</item>
- <item>@string/description_target_answer_audio_call</item>
+ <item>@string/description_target_answer_video_call</item>
</array>
<array name="incoming_call_widget_video_without_sms_direction_descriptions">
<item>@string/description_direction_right</item>
@@ -89,21 +89,21 @@
</array>
<!-- For video calls, if respond via SMS is enabled:
- - Answer as video call (drag right)
+ - Answer as audio call (drag right)
- Respond via SMS (drag up)
- Decline (drag left)
- - Answer as audio call (drag down) -->
+ - Answer as video call (drag down) -->
<array name="incoming_call_widget_video_with_sms_targets">
- <item>@drawable/ic_lockscreen_answer_video</item>
+ <item>@drawable/ic_lockscreen_answer</item>
<item>@drawable/ic_lockscreen_text</item>
<item>@drawable/ic_lockscreen_decline</item>
- <item>@drawable/ic_lockscreen_answer</item>
+ <item>@drawable/ic_lockscreen_answer_video</item>
</array>
<array name="incoming_call_widget_video_with_sms_target_descriptions">
- <item>@string/description_target_answer_video_call</item>
+ <item>@string/description_target_answer_audio_call</item>
<item>@string/description_target_send_sms</item>
<item>@string/description_target_decline</item>
- <item>@string/description_target_answer_audio_call</item>
+ <item>@string/description_target_answer_video_call</item>
</array>
<array name="incoming_call_widget_video_with_sms_direction_descriptions">
<item>@string/description_direction_right</item>