summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-05-22 05:27:55 +0000
committerEtan Cohen <etancohen@google.com>2015-05-22 05:27:55 +0000
commitabdb2b09c8296044d5096db1cbdb4a5e68495016 (patch)
tree110344cb19132b5b9cfd9dc9c4fab0abbb1bfbb7
parenta9a6ff13e0104b7003c53cf1252bd56b8fec785a (diff)
Revert "Merge commit 'f399ce4' into merge"
This reverts commit dce35354f60011b41b48b7744a4f4423b101a5e9. Change-Id: Ia986a2a6869d90bf0c811c8b24d5c8ec1eaef49b
-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 8744d3e11..7877ec8f3 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_audio_call</item>
+ <item>@string/description_target_answer_video_call</item>
<item>@null</item>
<item>@string/description_target_decline</item>
- <item>@string/description_target_answer_video_call</item>
+ <item>@string/description_target_answer_audio_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 audio call (drag right)
+ - Answer as video call (drag right)
- Respond via SMS (drag up)
- Decline (drag left)
- - Answer as video call (drag down) -->
+ - Answer as audio call (drag down) -->
<array name="incoming_call_widget_video_with_sms_targets">
- <item>@drawable/ic_lockscreen_answer</item>
+ <item>@drawable/ic_lockscreen_answer_video</item>
<item>@drawable/ic_lockscreen_text</item>
<item>@drawable/ic_lockscreen_decline</item>
- <item>@drawable/ic_lockscreen_answer_video</item>
+ <item>@drawable/ic_lockscreen_answer</item>
</array>
<array name="incoming_call_widget_video_with_sms_target_descriptions">
- <item>@string/description_target_answer_audio_call</item>
+ <item>@string/description_target_answer_video_call</item>
<item>@string/description_target_send_sms</item>
<item>@string/description_target_decline</item>
- <item>@string/description_target_answer_video_call</item>
+ <item>@string/description_target_answer_audio_call</item>
</array>
<array name="incoming_call_widget_video_with_sms_direction_descriptions">
<item>@string/description_direction_right</item>