Merge remote-tracking branch 'PA/kitkat' into legacy-staging
Strings cleanup
telephony: Disable MSIM settings if unavailable

 * These activities share the same intent-filter as their non-MSIM
   counterparts. While this makes sense as a quick hack, it causes
   a UX issue when an app tries to launch one of these. An example
   is Google Voice- when it's time to update your voicemail settings,
   you're confusingly presented with a dialog asking to select
   which "com.android.phone" to use.
 * Disable the activities entirely if MSIM isn't available.

Change-Id: Iedeaf84f343ea0ee290275941cd55862a687800a
Merge remote-tracking branch 'PA/kitkat' into legacy-staging
Fix MSIM Network Settings (2/2)

For proper testing, re-enable disabler between reboots and toggle of
persist.radio.multisim.config value.

command: adb shell pm enable com.android.phone/.MSimActivityDisabler

Change-Id: I3f6b965340064d2446fb43b0817fb5e8b12d7c0b
Fix appt warnings: Add dummy strings for no default localization

Change-Id: I75587c324bacbea923ae20dec011f84f69028d13
Merge remote-tracking branch 'PA/kitkat' into legacy-staging
MSIM: Replace names of tabs to real operator names

Add Sim slot number after Operator name and check
for SIM_STATE_ABSENT and display No SIM instead of NULL

Change-Id: If8804c2f14f6bb8adbdbebe7f5def0a133acbb46
telephony: Remove "managed roaming" feature

 * This feature shows a popup to ask the user if they want to scan for
   mobile networks if the current network is unavailable. It's confusing
   and overly aggressive, and there are other indicators when this
   happens anyway. Kill it.

Revert "Do not show roaming dialog if network scan is in progress."

This reverts commit 7935b65a4ecccf42004fbef389c58133d17704ca.

Revert "Phone(MSIM): Managed Roaming support for multisim"

This reverts commit 2b5ee374043b4f6460a1b29e72dd237b80877a79.

Conflicts:
	res/values/strings.xml

Change-Id: I10f973df18fc7de7f79f13b9f1509ed586e03688

Revert "Add Managed Roaming feature support."

This reverts commit 207dc957d761c2c7472c89db5b19e4ee66818d59.

Remove managed roaming translations

Change-Id: Ibd312162f897ceb7abd009b5587d3bf7319dd062

Conflicts:
	res/values-af/cm_caf.xml
	res/values-ar/cm_caf.xml
	res/values-ca/cm_caf.xml
	res/values-cs/cm_caf.xml
	res/values-da/cm_caf.xml
	res/values-de/cm_caf.xml
	res/values-el/cm_caf.xml
	res/values-es-rXA/cm_caf.xml
	res/values-es/cm_caf.xml
	res/values-fi/cm_caf.xml
	res/values-fr/cm_caf.xml
	res/values-hu/cm_caf.xml
	res/values-it/cm_caf.xml
	res/values-iw/cm_caf.xml
	res/values-lt/cm_caf.xml
	res/values-nl/cm_caf.xml
	res/values-pt-rBR/cm_caf.xml
	res/values-pt-rPT/cm_caf.xml
	res/values-ru/cm_caf.xml
	res/values-sk/cm_caf.xml
	res/values-sr/cm_caf.xml
	res/values-tr/cm_caf.xml
	res/values-zh-rCN/cm_caf.xml
Merge remote-tracking branch 'PA/kitkat' into legacy-staging

Conflicts:
	AndroidManifest.xml
Remove hard-coded CDMA roaming mode restrictions.

Prior to this, the CDMA roaming mode (from the "System select" setting) is
vetted against a hard-coded list of two acceptable values (CDMA_RM_HOME:0
and CDMA_RM_ANY:2).  This commit instead vets against the
cdma_system_select_values list, which contains those two values by default,
but may be overridden on a per-device basis.

For motivation, epicmtd in stock Gingerbread doesn't use CDMA_RM_ANY:2, but
values 5-8 to select between automatic domestic, international, both, and
no roaming.  Without this, roaming is unintentionally disabled anytime the
"Mobile networks" setting screen is opened.

From CM 10.2: I6611822822f32cd132a1794e7ca11bf5f751994d,
     CM 9:    I589c660fe3a1b9920cecfc7e6dc044f3f722fbb2.

Change-Id: Ib99fba45e9a85260ca6e3cebdecff988b4ed5547
Merge remote-tracking branch 'PA/kitkat' into legacy-staging
Merge remote-tracking branch 'telephony/legacy-staging' into remix-legacy