Merge "Accidentally checked in a line used for debugging. Removing." into lmp-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ef5c12..610da46 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -127,13 +127,21 @@
<!-- Label for list item which opens a dialog to select the default outgoing account -->
<string name="phone_accounts_make_calls_with">Make calls with</string>
+ <!-- Label for list item which opens a dialog to select the default outgoing account for SIP calls. -->
+ <string name="phone_accounts_make_calls_with">Make SIP calls with</string>
<!-- Entry in dialog to "ask first" for accounts when making a call -->
<string name="phone_accounts_ask_every_time">Ask first</string>
+ <!-- Label for heading of the accounts section in the phone accounts settings screen. -->
+ <string name="phone_accounts_accounts_header">Accounts</string>
<!-- Label for invoking phone account selection screen -->
<string name="phone_accounts_choose_accounts">Choose accounts</string>
<!-- Label for heading in the phone account selection screen -->
<string name="phone_accounts_selection_header">Phone accounts</string>
+ <!-- Title for the button to add a new sip account. [CHAR LIMIT=NONE] -->
+ <string name="phone_accounts_add_sip_account">Add SIP account</string>
+ <!-- Description label for icon to configure a phone account's settings. -->
+ <string name="phone_accounts_configure_account_settings">Configure account settings</string>
<!-- Title for setting to select Wi-Fi call manager account -->
<string name="phone_account_wifi_calling">Wi-Fi calling</string>
@@ -145,6 +153,8 @@
<string name="wifi_calling_use_call_assistant">Use call assistant</string>
<!-- Summary for the label of a switch setting to enable/disable the use of SIM call managers. -->
<string name="wifi_calling_use_call_assistant_summary">Let apps or services manage networks used for calls</string>
+ <!-- Label for setting to configure the selected call assistant. -->
+ <string name="wifi_calling_call_assistant_configure">Configure</string>
<!-- Built-in label for the default connection service setting. -->
<string name="connection_service_default_label">Built-in connection service</string>
@@ -156,6 +166,8 @@
<string name="networks">Network operators</string>
<!-- Cell Broadcast settings title. [CHAR LIMIT=50] -->
<string name="cell_broadcast_settings">Emergency broadcasts</string>
+ <!-- Phone accoutnt settings screen title -->
+ <string name="call_settings">Phone account settings</string>
<!-- Call settings screen title -->
<string name="call_settings">Call Settings</string>
<!-- GSM Call settings screen, setting option name -->
diff --git a/sip/res/values/strings.xml b/sip/res/values/strings.xml
index 0163a31..12dfceb 100644
--- a/sip/res/values/strings.xml
+++ b/sip/res/values/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Title displayed SIP settings coming after other call settings in the call features screen. [CHAR LIMIT=NONE] -->
- <string name="sip_settings">SIP settings</string>
+ <string name="sip_settings">SIP Settings</string>
<!-- Title displayed SIP account settings in the sip settings category. [CHAR LIMIT=NONE] -->
<string name="sip_accounts">SIP accounts</string>
<!-- Title displayed SIP account settings in the sip settings category. [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 7b56902..8af6849 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -53,7 +53,7 @@
toTelecomDisconnectCauseCode(telephonyDisconnectCause),
toTelecomDisconnectCauseLabel(context, telephonyDisconnectCause),
toTelecomDisconnectCauseDescription(context, telephonyDisconnectCause),
- reason,
+ toTelecomDisconnectReason(telephonyDisconnectCause, reason),
toTelecomDisconnectCauseTone(telephonyDisconnectCause));
}
@@ -296,6 +296,15 @@
return resourceId == null ? "" : context.getResources().getString(resourceId);
}
+ private static String toTelecomDisconnectReason(int telephonyDisconnectCause, String reason) {
+ String causeAsString = android.telephony.DisconnectCause.toString(telephonyDisconnectCause);
+ if (reason == null) {
+ return causeAsString;
+ } else {
+ return reason + ", " + causeAsString;
+ }
+ }
+
/**
* Returns the tone to play for the disconnect cause, or UNKNOWN if none should be played.
*/