Merge "Fixed a UI bug that would disable Cellular Networks screen." into lmp-dev
diff --git a/sip/res/values/array.xml b/sip/res/values/array.xml
index 245c09b..02940e8 100644
--- a/sip/res/values/array.xml
+++ b/sip/res/values/array.xml
@@ -24,19 +24,16 @@
<string-array translatable="true" name="sip_call_options_entries">
<item>@string/sip_call_options_entry_1</item>
<item>@string/sip_call_options_entry_2</item>
- <item>@string/sip_call_options_entry_3</item>
</string-array>
<string-array translatable="true" name="sip_call_options_wifi_only_entries">
<item>@string/sip_call_options_wifi_only_entry_1</item>
<item>@string/sip_call_options_entry_2</item>
- <item>@string/sip_call_options_entry_3</item>
</string-array>
<string-array translatable="false" name="sip_call_options_values">
<item>@string/sip_always</item>
<item>@string/sip_address_only</item>
- <item>@string/sip_ask_me_each_time</item>
</string-array>
<string-array translatable="false" name="phone_type_values">
diff --git a/sip/res/values/strings.xml b/sip/res/values/strings.xml
index e553700..8b85ff4 100644
--- a/sip/res/values/strings.xml
+++ b/sip/res/values/strings.xml
@@ -35,8 +35,6 @@
<string name="sip_call_options_entry_1">For all calls when data network is available</string>
<!-- Item of the SIP call option dialog: for routing a outgoing call via SIP if the destination is a SIP URI. [CHAR LIMIT=NONE] -->
<string name="sip_call_options_entry_2">Only for SIP calls</string>
- <!-- Item of the SIP call option dialog: for asking user to select the way for each outgoing call. [CHAR LIMIT=NONE] -->
- <string name="sip_call_options_entry_3">Ask for each call</string>
<!-- Item of the SIP call (Wi-Fi only) option dialog: for routing all outgoing calls via SIP. [CHAR LIMIT=NONE] -->
<string name="sip_call_options_wifi_only_entry_1">For all calls</string>
@@ -190,7 +188,6 @@
<!-- Do not translate the following strings. Used for the SIP call options. Need to be in-sync with Settings.System.SIP_ strings. -->
<string translatable="false" name="sip_always">SIP_ALWAYS</string>
<string translatable="false" name="sip_address_only">SIP_ADDRESS_ONLY</string>
- <string translatable="false" name="sip_ask_me_each_time">SIP_ASK_ME_EACH_TIME</string>
<!-- Do not translate the following strings. Used for the preference keys -->
<string translatable="false" name="domain_address">SipDomain</string>