Revert "Goodbye msim"

This reverts commit 9715cf888e5cac5993aac57889ffee2265286210.

Conflicts:
	Android.mk
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/Settings.java

Change-Id: I3fa7b84f7bdcde9eac1d65968d6153aca1362eb7
MSIM: Ui fixes, replace Subscriptions with 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: I2a340487fcb01dde1a50f5a45c71cd61711380c3
Fix MSIM Network Settings (1/2)

Add needed extras to launch subscription selection.

Change-Id: I568666477fe9a5cf566fd94475f8d2a5ebf768e1
MSIM: Hide latest area info broadcast if not brazilian sim

Change-Id: I6beafb788ea66c6e97ca0545380f1ea296841c1f
MSIM: Hide setting for signal status mods

Currently Hide signal status and signal status text view are not
implemented for msim.

Change-Id: I2d8baec8235aea6a13434a0b4c39a637ed2931a5

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBar.java
MSim Settings: Update UI/UX with user friendly strings

Original commit: https://github.com/CyanogenMod/android_packages_apps_Settings/commit/dc187ad2a65eeead86e614e053930a40a932be51#diff-26

Change-Id: If1a81537cf645ecc8ecee7712055ccc0edfdb30b
MSIM: Update icon for Multi Sim Settings category

Original commit: https://github.com/CyanogenMod/android_packages_apps_Settings/commit/11dad6942d7323f8331a065e0be9a78ecaa7e1e6

Change-Id: I6a5abee1173a1170aba21392df7c137d2f5b502d
Revert "Fix MSIM Network Settings (1/2)"

A public intent shouldn't need additional parameters to trigger.

This reverts commit 6cf32469f14a2c0efad9da34a5f12a9d341fc762.

Requires http://review.cyanogenmod.org/63912

Change-Id: I72ea28d8760caf1965c8df0835f438a22331450e
Telephony(MSIM): Disable DDS Switch in Airplane Mode.

Do not allow user to change the DDS in Airplane Mode
as modem will be in LPM state.

Change-Id: I21ceaa53df6f0acd7be5fb8f23a120f92023a152
CRs-Fixed: 594616
Missing back button on MultiSimSettings ActionBar

Fixed missing back button on ActionBar (default Settings behavior on
submenus) by adding "parentActivityName" property to MultiSimSettings
activity.

Change-Id: I60a1123be29d81c8232e0acee1ac9544bf9b32e6
MSIM: Status & Subscriptions Status themes & navigation

Fixes navigation between screens via ActionBar (default behavior on
Settings activities) and switches old Holo theme to Kitkat default
for Status screen on MultiSim devices.

Change-Id: Ia643d645a29b067f4f149a4bec8d4e444a0750fc
settings: check if ime switcher pref was remove previously

This could happend in tablet devices

JIRA: BUGDUMP-20712
https://jira.cyanogenmod.org/browse/BUGDUMP-20712
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: I85c1d6e56f85e3220311aabc68d6532d6ffdf59f
Settings: Alert user when they attempt to add an invalid number to BL.

  - BlacklistProvider will reject numbers that aren't valid, silently. So instead of
  resuming to a blank screen, we should alert the user that the number they attempted to
  add is invalid by utilizing BlacklistUtils#addOrUpdate method.

Change-Id: I1ca32427baad41c1c9379e18046e6ca7937b6d32
settings: prevent NPE if device doesn't support ActionBar

If the device FEATURE_ACTION_BAR (the device hasn't it enabled or a theme has disabled it), getActionBar()
will return a null reference. Just prevent to use that invalid ref.

JIRA: BUGDUMP-23210
https://jira.cyanogenmod.org/browse/BUGDUMP-23210
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: I210867b10193471c49e444c27c47e9de6baee822
Use actual storage type of sdcard/usb (2/2).

Currently, storage volume description for mount/unmount/format determined at
build time using PRODUCT_CHARACTERISTICS. For device which has only a sdcard or
only support usb storage, displayed description is correct. For device which has
both storage, the displayed description is totally wrong.

Use of actual storage type at runtime can eliminate the needed to specify
product characteristics, either default or nosdcard.

Change-Id: I9f8d53a4648d960f1009b1fe94787eecd4343427

Conflicts:
	res/values/cm_strings.xml
Properly apply edit dialog brightness value.

Change-Id: If0bc90f045e5549dced296a7944e9ed0ea98b0c9
CryptKeeper: update emergency call button to Holo

Change-Id: Id98a3345a7bb99b485ef608cec4319a84c040081
Automatic translation import

Change-Id: I20f3f718753a7ec48ead4ce3ad54cc09fbf6bd89
Fix HighTouchSensivity (1/2)

Change-Id: I3d3207fefef496ba787055b1598c60b327ab9bb6
Revert "Fix HighTouchSensivity (1/2)"

This reverts commit 770b22de62eae0a4c269418986a8420e3535bbf0.

Change-Id: I0d243d512220f265f462a98c0dc15372b314e714