PhoneCommon: Move CAF strings

Change-Id: If42631532ca946216df272a025f977e2b9e73c75

3 files changed, 101 insertions, 101 deletions

diff --git a/res/values/cm_extra.xml b/res/values/cm_extra.xml
index 3c4adf8..a792d77 100644
--- a/res/values/cm_extra.xml
+++ b/res/values/cm_extra.xml
@@ -15,6 +15,98 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Supplementary for Clear Code -->
+    <!-- Text for CallFailCause.NO_CIRCUIT_AVAIL = 34 -->
+    <string name="callFailed_no_circuit_avail"></string>
+    <!-- Text for CallFailCause.NETWORK_OUT_OF_ORDER = 38 -->
+    <string name="callFailed_network_out_of_order"></string>
+    <!-- Text for CallFailCause.NO_ROUTE_TO_DESTINAON = 3 -->
+    <string name="callFailed_no_route_to_destination"></string>
+    <!-- Text for CallFailCause.CHANNEL_UNACCEPTABLE = 6 -->
+    <string name="callFailed_channel_unacceptable"></string>
+    <!-- Text for CallFailCause.OPERATOR_DETERMINED_BARRING = 8 -->
+    <string name="callFailed_operator_determined_barring"></string>
+    <!-- Text for CallFailCause.NORMAL_CLEARING = 16 -->
+    <string name="callFailed_normal"></string>
+    <!-- Text for CallFailCause.CALL_FAIL_NO_USER_RESPONDING = 18 -->
+    <string name="callFailed_no_user_responding"></string>
+    <!-- Text for CallFailCause.CALL_FAIL_NO_ANSWER_FROM_USER = 19 -->
+    <string name="callFailed_no_answer_from_user"></string>
+    <!-- Text for CallFailCause.CALL_REJECTED = 21 -->
+    <string name="callFailed_call_rejected"></string>
+    <!-- Text for CallFailCause.NUMBER_CHANGED = 22 -->
+    <string name="callFailed_number_changed"></string>
+    <!-- Text for CallFailCause.PREEMPTION = 25 -->
+    <string name="callFailed_preemption"></string>
+    <!-- Text for CallFailCause.CALL_FAIL_DESTINATION_OUT_OF_ORDER = 27 -->
+    <string name="callFailed_destination_out_of_order"></string>
+    <!-- Text for CallFailCause.INVALID_NUMBER = 28 -->
+    <string name="callFailed_invalid_number_format"></string>
+    <!-- Text for CallFailCause.FACILITY_REJECTED = 29 -->
+    <string name="callFailed_facility_rejected"></string>
+    <!-- Text for CallFailCause.STATUS_ENQUIRY = 30 -->
+    <string name="callFailed_resp_to_status_enquiry"></string>
+    <!-- Text for CallFailCause.NORMAL_UNSPECIFIED = 31 -->
+    <string name="callFailed_normal_unspecified"></string>
+    <!-- Text for CallFailCause.TEMPORARY_FAILURE = 41 -->
+    <string name="callFailed_tempopary_failure"></string>
+    <!-- Text for CallFailCause.SWITCHING_CONGESTION = 42 -->
+    <string name="callFailed_switching_equipment_congestion"></string>
+    <!-- Text for CallFailCause.ACCESS_INFORMATION_DISCARDED = 43 -->
+    <string name="callFailed_access_information_discarded"></string>
+    <!-- Text for CallFailCause.CHANNEL_NOT_AVAIL = 44 -->
+    <string name="callFailed_requested_circuit_or_channel_not_available"></string>
+    <!-- Text for CallFailCause.RESOURCES_UNAVAILABLE_OR_UNSPECIFIED = 47 -->
+    <string name="callFailed_resources_unavailable_or_unspecified"></string>
+    <!-- Text for CallFailCause.QOS_NOT_AVAIL = 49 -->
+    <string name="callFailed_QOS_unavailable"></string>
+    <!-- Text for CallFailCause.REQUESTED_FACILITY_NOT_SUBSCRIBED = 50 -->
+    <string name="callFailed_requested_facility_not_subscribed"></string>
+    <!-- Text for CallFailCause.INCOMING_CALLS_BARRED_WITHIN_CUG = 55 -->
+    <string name="callFailed_incoming_calls_barred_within_CUG"></string>
+    <!-- Text for CallFailCause.BEARER_CAPABILITY_NOT_AUTHORIZED = 57 -->
+    <string name="callFailed_bearer_capability_not_authorized"></string>
+    <!-- Text for CallFailCause.BEARER_NOT_AVAIL = 58 -->
+    <string name="callFailed_bearer_capability_unavailable"></string>
+    <!-- Text for CallFailCause.SERVICE_OPTION_NOT_AVAILABLE = 63 -->
+    <string name="callFailed_service_option_not_available"></string>
+    <!-- Text for CallFailCause.BEARER_SERVICE_NOT_IMPLEMENTED = 65 -->
+    <string name="callFailed_bearer_service_not_implemented"></string>
+    <!-- Text for CallFailCause.REQUESTED_FACILITY_NOT_IMPLEMENTED = 69 -->
+    <string name="callFailed_requested_facility_not_implemented"></string>
+    <!-- Text for CallFailCause.ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE = 70 -->
+    <string name="callFailed_only_digital_information_bearer_available"></string>
+    <!-- Text for CallFailCause.SERVICE_OR_OPTION_NOT_IMPLEMENTED = 79 -->
+    <string name="callFailed_service_or_option_not_implemented"></string>
+    <!-- Text for CallFailCause.INVALID_TRANSACTION_IDENTIFIER = 81 -->
+    <string name="callFailed_invalid_transaction_identifier"></string>
+    <!-- Text for CallFailCause.USER_NOT_MEMBER_OF_CUG = 87 -->
+    <string name="callFailed_user_not_member_of_CUG"></string>
+    <!-- Text for CallFailCause.INCOMPATIBLE_DESTINATION = 88 -->
+    <string name="callFailed_incompatible_destination"></string>
+    <!-- Text for CallFailCause.INVALID_TRANSIT_NW_SELECTION = 91 -->
+    <string name="callFailed_invalid_transit_NW_selection"></string>
+    <!-- Text for CallFailCause.SEMANTICALLY_INCORRECT_MESSAGE = 95 -->
+    <string name="callFailed_semantically_incorrect_message"></string>
+    <!-- Text for CallFailCause.INVALID_MANDATORY_INFORMATION = 96 -->
+    <string name="callFailed_invalid_mandatory_information"></string>
+    <!-- Text for CallFailCause.MESSAGE_TYPE_NON_IMPLEMENTED = 97 -->
+    <string name="callFailed_message_type_non_implemented"></string>
+    <!-- Text for CallFailCause.MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 98 -->
+    <string name="callFailed_message_type_not_compatible_with_protocol_state"></string>
+    <!-- Text for CallFailCause.INFORMATION_ELEMENT_NON_EXISTENT = 99 -->
+    <string name="callFailed_information_element_non_existent"></string>
+    <!-- Text for CallFailCause.CONDITIONAL_IE_ERROR = 100 -->
+    <string name="callFailed_conditional_IE_error"></string>
+    <!-- Text for CallFailCause.MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 101 -->
+    <string name="callFailed_message_not_compatible_with_protocol_state"></string>
+    <!-- Text for CallFailCause.RECOVERY_ON_TIMER_EXPIRED = 102 -->
+    <string name="callFailed_recovery_on_timer_expired"></string>
+    <!-- Text for CallFailCause.PROTOCOL_ERROR_UNSPECIFIED = 111 -->
+    <string name="callFailed_protocol_error_unspecified"></string>
+    <!-- Text for CallFailCause.INTERWORKING_UNSPECIFIED = 127 -->
+    <string name="callFailed_interworking_unspecified"></string>
+
     <!--  Localized dialer buttons.
           In English, we don't need a secondary row, so all values are empty.
           Change these values depending on your language requirements.
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index ebf4895..bba0354 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -16,11 +16,8 @@
      limitations under the License.
 -->
 <resources>
-    <!-- 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 ended due to low battery) -->
+    <string name="callFailed_low_battery">Low battery</string>
+
     <string name="to_hint" translatable="false">1111:to;sip:abby@example.com:bcc;sip:bill@example.com:cc;</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 39c7385..657a1ba 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -96,6 +96,12 @@
     <string name="callFailed_outOfService">Cellular network not available</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">Can\'t make outgoing calls while call barring is on.</string>
     <!-- In-call screen: call failure reason (call denied because domain specific access control is on) -->
@@ -106,103 +112,8 @@
     <string name="callFailed_dsac_restricted_normal">Normal calls restricted by access control.</string>
     <!-- In-call screen: call failure reason (Dialed number doesn't exist) -->
     <string name="callFailed_unobtainable_number">Invalid number</string>
-
-    <!-- Supplementary for Clear Code -->
-    <!-- Text for CallFailCause.NO_CIRCUIT_AVAIL = 34 -->
-    <string name="callFailed_no_circuit_avail"></string>
-    <!-- Text for CallFailCause.NETWORK_OUT_OF_ORDER = 38 -->
-    <string name="callFailed_network_out_of_order"></string>
-    <!-- Text for CallFailCause.NO_ROUTE_TO_DESTINAON = 3 -->
-    <string name="callFailed_no_route_to_destination"></string>
-    <!-- Text for CallFailCause.CHANNEL_UNACCEPTABLE = 6 -->
-    <string name="callFailed_channel_unacceptable"></string>
-    <!-- Text for CallFailCause.OPERATOR_DETERMINED_BARRING = 8 -->
-    <string name="callFailed_operator_determined_barring"></string>
-    <!-- Text for CallFailCause.NORMAL_CLEARING = 16 -->
-    <string name="callFailed_normal"></string>
-    <!-- Text for CallFailCause.CALL_FAIL_NO_USER_RESPONDING = 18 -->
-    <string name="callFailed_no_user_responding"></string>
-    <!-- Text for CallFailCause.CALL_FAIL_NO_ANSWER_FROM_USER = 19 -->
-    <string name="callFailed_no_answer_from_user"></string>
-    <!-- Text for CallFailCause.CALL_REJECTED = 21 -->
-    <string name="callFailed_call_rejected"></string>
-    <!-- Text for CallFailCause.NUMBER_CHANGED = 22 -->
-    <string name="callFailed_number_changed"></string>
-    <!-- Text for CallFailCause.PREEMPTION = 25 -->
-    <string name="callFailed_preemption"></string>
-    <!-- Text for CallFailCause.CALL_FAIL_DESTINATION_OUT_OF_ORDER = 27 -->
-    <string name="callFailed_destination_out_of_order"></string>
-    <!-- Text for CallFailCause.INVALID_NUMBER = 28 -->
-    <string name="callFailed_invalid_number_format"></string>
-    <!-- Text for CallFailCause.FACILITY_REJECTED = 29 -->
-    <string name="callFailed_facility_rejected"></string>
-    <!-- Text for CallFailCause.STATUS_ENQUIRY = 30 -->
-    <string name="callFailed_resp_to_status_enquiry"></string>
-    <!-- Text for CallFailCause.NORMAL_UNSPECIFIED = 31 -->
-    <string name="callFailed_normal_unspecified"></string>
-    <!-- Text for CallFailCause.TEMPORARY_FAILURE = 41 -->
-    <string name="callFailed_tempopary_failure"></string>
-    <!-- Text for CallFailCause.SWITCHING_CONGESTION = 42 -->
-    <string name="callFailed_switching_equipment_congestion"></string>
-    <!-- Text for CallFailCause.ACCESS_INFORMATION_DISCARDED = 43 -->
-    <string name="callFailed_access_information_discarded"></string>
-    <!-- Text for CallFailCause.CHANNEL_NOT_AVAIL = 44 -->
-    <string name="callFailed_requested_circuit_or_channel_not_available"></string>
-    <!-- Text for CallFailCause.RESOURCES_UNAVAILABLE_OR_UNSPECIFIED = 47 -->
-    <string name="callFailed_resources_unavailable_or_unspecified"></string>
-    <!-- Text for CallFailCause.QOS_NOT_AVAIL = 49 -->
-    <string name="callFailed_QOS_unavailable"></string>
-    <!-- Text for CallFailCause.REQUESTED_FACILITY_NOT_SUBSCRIBED = 50 -->
-    <string name="callFailed_requested_facility_not_subscribed"></string>
-    <!-- Text for CallFailCause.INCOMING_CALLS_BARRED_WITHIN_CUG = 55 -->
-    <string name="callFailed_incoming_calls_barred_within_CUG"></string>
-    <!-- Text for CallFailCause.BEARER_CAPABILITY_NOT_AUTHORIZED = 57 -->
-    <string name="callFailed_bearer_capability_not_authorized"></string>
-    <!-- Text for CallFailCause.BEARER_NOT_AVAIL = 58 -->
-    <string name="callFailed_bearer_capability_unavailable"></string>
-    <!-- Text for CallFailCause.SERVICE_OPTION_NOT_AVAILABLE = 63 -->
-    <string name="callFailed_service_option_not_available"></string>
-    <!-- Text for CallFailCause.BEARER_SERVICE_NOT_IMPLEMENTED = 65 -->
-    <string name="callFailed_bearer_service_not_implemented"></string>
-    <!-- Text for CallFailCause.REQUESTED_FACILITY_NOT_IMPLEMENTED = 69 -->
-    <string name="callFailed_requested_facility_not_implemented"></string>
-    <!-- Text for CallFailCause.ONLY_DIGITAL_INFORMATION_BEARER_AVAILABLE = 70 -->
-    <string name="callFailed_only_digital_information_bearer_available"></string>
-    <!-- Text for CallFailCause.SERVICE_OR_OPTION_NOT_IMPLEMENTED = 79 -->
-    <string name="callFailed_service_or_option_not_implemented"></string>
-    <!-- Text for CallFailCause.INVALID_TRANSACTION_IDENTIFIER = 81 -->
-    <string name="callFailed_invalid_transaction_identifier"></string>
-    <!-- Text for CallFailCause.USER_NOT_MEMBER_OF_CUG = 87 -->
-    <string name="callFailed_user_not_member_of_CUG"></string>
-    <!-- Text for CallFailCause.INCOMPATIBLE_DESTINATION = 88 -->
-    <string name="callFailed_incompatible_destination"></string>
-    <!-- Text for CallFailCause.INVALID_TRANSIT_NW_SELECTION = 91 -->
-    <string name="callFailed_invalid_transit_NW_selection"></string>
-    <!-- Text for CallFailCause.SEMANTICALLY_INCORRECT_MESSAGE = 95 -->
-    <string name="callFailed_semantically_incorrect_message"></string>
-    <!-- Text for CallFailCause.INVALID_MANDATORY_INFORMATION = 96 -->
-    <string name="callFailed_invalid_mandatory_information"></string>
-    <!-- Text for CallFailCause.MESSAGE_TYPE_NON_IMPLEMENTED = 97 -->
-    <string name="callFailed_message_type_non_implemented"></string>
-    <!-- Text for CallFailCause.MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 98 -->
-    <string name="callFailed_message_type_not_compatible_with_protocol_state"></string>
-    <!-- Text for CallFailCause.INFORMATION_ELEMENT_NON_EXISTENT = 99 -->
-    <string name="callFailed_information_element_non_existent"></string>
-    <!-- Text for CallFailCause.CONDITIONAL_IE_ERROR = 100 -->
-    <string name="callFailed_conditional_IE_error"></string>
-    <!-- Text for CallFailCause.MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE = 101 -->
-    <string name="callFailed_message_not_compatible_with_protocol_state"></string>
-    <!-- Text for CallFailCause.RECOVERY_ON_TIMER_EXPIRED = 102 -->
-    <string name="callFailed_recovery_on_timer_expired"></string>
-    <!-- Text for CallFailCause.PROTOCOL_ERROR_UNSPECIFIED = 111 -->
-    <string name="callFailed_protocol_error_unspecified"></string>
-    <!-- Text for CallFailCause.INTERWORKING_UNSPECIFIED = 127 -->
-    <string name="callFailed_interworking_unspecified"></string>
-
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_missing_voicemail_number">Voicemail number unknown.</string>
-    <!-- In-call screen: call failure reason (call ended due to low battery) -->
-    <string name="callFailed_low_battery">Low Battery</string>
 
     <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
     <string name="ringtone_silent">None</string>