InCallUI: Move CAF strings

Change-Id: I9965e9455460c6c1c1e1c8e7b5f95230f25bdf66

2 files changed, 56 insertions, 51 deletions

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 77040df0..16017798 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Copyright (C) 2013-2014 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,6 +16,60 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- In-call screen: call failure reason (call modified to USSD request) -->
+    <string name="callFailed_dialToUssd">DIAL request modified to USSD request.</string>
+    <!-- In-call screen: call failure reason (call modified to SS request) -->
+    <string name="callFailed_dialToSs">DIAL request modified to SS request.</string>
+    <!-- In-call screen: call failure reason (call modified to call with modified data) -->
+    <string name="callFailed_dialToDial">DIAL request modified to DIAL with different number.</string>
+
+    <!-- In-call screen: call failure reason (call denied because call barring is ON on MT side ) -->
+    <string name="callFailed_incoming_cb_enabled">Party has barred all incoming calls.</string>
+    <!-- In-call screen: status label for an incoming call that is not answered and forwarded  -->
+    <string name="callUnanswered_forwarded">Call unanswered and forwarded</string>
+
+    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call -->
+    <string name="modify_call_prompt_yes">Yes</string>
+    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call-->
+    <string name="modify_call_prompt_no">No</string>
+    <!-- In-call screen: Modify call request failure. -->
+    <string name="modify_call_failure_str">Request to modify call failed\n</string>
+
+    <!-- In-call screen: Modify Call Options for IMS call -->
+    <string name="modify_call_option_title">Select type of call</string>
+    <string name="modify_call_option_vt">VT</string>
+    <string name="modify_call_option_vt_tx">Video transmit</string>
+    <string name="modify_call_option_vt_rx">Video receive</string>
+    <string name="modify_call_option_voice">Voice only</string>
+
+    <!-- In-call screen: Incoming Modify Call for IMS call -->
+    <string name="accept_modify_call_request_prompt">Accept request to modify call?</string>
+    <string name="upgrade_vt_prompt">Would you like to upgrade the call to video call?</string>
+    <string name="upgrade_vt_tx_prompt">Would you like to upgrade the call to video transmit only call?</string>
+    <string name="upgrade_vt_rx_prompt">Would you like to upgrade the call to video receive only call?</string>
+
+    <!-- In-call screen: VT call dpl init failure. -->
+    <string name="vt_init_fail_str">Video transmit initialization failed. Downgrading call to VoLTE\n</string>
+
+    <!-- Text for the onscreen "Modify call" button -->
+    <string name="onscreenModifyCallText">Modify call</string>
+
+    <!-- Text for the onscreen "Add Participant" button -->
+    <string name="onscreenAddParticipant">Add participant</string>
+
+    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_target_answer_video">Answer with video</string>
+    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_target_answer_tx_video">Answer with TX video</string>
+    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_target_answer_rx_video">Answer with RX video</string>
+
+    <!-- Description of the answer directions in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
+    <string name="description_direction_up_right">Up right</string>
+    <string name="description_direction_up_left">Up left</string>
+    <string name="description_direction_down_left">Down left</string>
+    <string name="description_direction_down_right">Down right</string>
+
     <!-- In-call screen: "call type" indication for a forwarded call [CHAR LIMIT=30] -->
     <string name="incall_call_type_label_forwarded">Forwarded call</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 192402be..04691718 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2013, The Linux Foundation. All rights reserved.
-  ~ Not a Contribution, Apache license notifications and license are retained
-  ~ for attribution purposes only.
-
+<!--
   ~ Copyright (C) 2013 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,18 +64,8 @@
     <string name="callFailed_outOfService">Out of service area</string>
     <!-- In-call screen: call failure reason (call denied because of current FDN setting) -->
     <string name="callFailed_fdn_only">Outgoing calls are restricted by FDN.</string>
-    <!-- In-call screen: call failure reason (call modified to USSD request) -->
-    <string name="callFailed_dialToUssd">DIAL request modified to USSD request.</string>
-    <!-- In-call screen: call failure reason (call modified to SS request) -->
-    <string name="callFailed_dialToSs">DIAL request modified to SS request.</string>
-    <!-- In-call screen: call failure reason (call modified to call with modified data) -->
-    <string name="callFailed_dialToDial">DIAL request modified to DIAL with different number.</string>
     <!-- In-call screen: call failure reason (call denied because call barring is on) -->
     <string name="callFailed_cb_enabled">You can\'t make outgoing calls while call barring is on.</string>
-    <!-- In-call screen: call failure reason (call denied because call barring is ON on MT side ) -->
-    <string name="callFailed_incoming_cb_enabled">Party has barred all incoming calls.</string>
-    <!-- In-call screen: status label for an incoming call that is not answered and forwarded  -->
-    <string name="callUnanswered_forwarded">Call unanswered and forwarded</string>
     <!-- In-call screen: call failure reason (call denied because domain specific access control is on) -->
     <string name="callFailed_dsac_restricted">All calls are restricted by access control.</string>
     <!-- In-call screen: call failure reason (Emergency call denied because domain specific access control is on)-->
@@ -126,28 +113,6 @@
          for a text widget that lets the user enter the digits that should
          replace the "wild" character. -->
     <string name="wild_prompt_str">Replace wild character with</string>
-    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call -->
-    <string name="modify_call_prompt_yes">Yes</string>
-    <!-- In-call screen: button label on the "modify call" prompt dialog for IMS call-->
-    <string name="modify_call_prompt_no">No</string>
-    <!-- In-call screen: Modify call request failure. -->
-    <string name="modify_call_failure_str">Request to modify call failed\n</string>
-
-    <!-- In-call screen: Modify Call Options for IMS call -->
-    <string name="modify_call_option_title">Select type of call</string>
-    <string name="modify_call_option_vt">VT</string>
-    <string name="modify_call_option_vt_tx">Video transmit</string>
-    <string name="modify_call_option_vt_rx">Video receive</string>
-    <string name="modify_call_option_voice">Voice only</string>
-
-    <!-- In-call screen: Incoming Modify Call for IMS call -->
-    <string name="accept_modify_call_request_prompt">Accept request to modify call?</string>
-    <string name="upgrade_vt_prompt">Would you like to upgrade the call to video call?</string>
-    <string name="upgrade_vt_tx_prompt">Would you like to upgrade the call to video transmit only call?</string>
-    <string name="upgrade_vt_rx_prompt">Would you like to upgrade the call to video receive only call?</string>
-
-    <!-- In-call screen: VT call dpl init failure. -->
-    <string name="vt_init_fail_str">Video transmit initialization failed. Downgrading call to VoLTE\n</string>
 
     <!-- In-call screen: status label for a conference call -->
     <string name="caller_manage_header">Conference call <xliff:g id="conf_call_time">%s</xliff:g></string>
@@ -285,8 +250,6 @@
     <string name="onscreenHoldText">Hold</string>
     <!-- Text for the onscreen "End call" button -->
     <string name="onscreenEndCallText">End</string>
-    <!-- Text for the onscreen "Modify call" button -->
-    <string name="onscreenModifyCallText">Modify call</string>
     <!-- Text for the onscreen "Show Dialpad" button -->
     <string name="onscreenShowDialpadText">Dialpad</string>
     <!-- Text for the onscreen "Mute" button -->
@@ -307,8 +270,6 @@
     <!-- Text for the onscreen "Video call" button used to change a voice call
          to a video call. [CHAR LIMIT=10] -->
     <string name="onscreenVideoCallText">Video call</string>
-    <!-- Text for the onscreen "Add Participant" button -->
-    <string name="onscreenAddParticipant">Add participant</string>
 
     <!-- For incoming calls, this is a string we can get from a CDMA network instead of
          the actual phone number, to indicate there's no number present.  DO NOT TRANSLATE. -->
@@ -492,22 +453,11 @@
 
     <!-- Description of the answer target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
     <string name="description_target_answer">Answer</string>
-    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_target_answer_video">Answer with video</string>
-    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_target_answer_tx_video">Answer with TX video</string>
-    <!-- Description of the answer voice only target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_target_answer_rx_video">Answer with RX video</string>
     <!-- Description of the send_sms target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
     <string name="description_target_send_sms">Send SMS</string>
     <!-- Description of the decline on target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
     <string name="description_target_decline">Decline</string>
 
-    <!-- Description of the answer directions in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] -->
-    <string name="description_direction_up_right">Up right</string>
-    <string name="description_direction_up_left">Up left</string>
-    <string name="description_direction_down_left">Down left</string>
-    <string name="description_direction_down_right">Down right</string>
     <!-- Description of the up direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
     <string name="description_direction_up">Slide up for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
     <!-- Description of the left direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->