Add setting for system bars visibility on Keyguard in Expanded desktop mode.

And combine expanded settings into a category.

Change-Id: I8e5a718faae002280da37cdd68e292f01648751b
Merge "Add setting for system bars visibility on Keyguard in Expanded desktop mode." into cm-11.0
Telephony: Use new apn.sim.operator_numeric property

Use new property to filter apns. We need this new property
because icc.operator_numeric property is also used in cdma
and ApnSetting UI might display wrong set of apns if the
peroperty value used was set by RuimRecords.
CRs-Fixed: 362846

Change-Id: Ie740c9b3bb6a14621e19c55e4fa18c66bc0d7b0c
(cherry picked from commit b74be3a91ed12c29626edf64bce34a154d4b1db1)
(cherry picked from commit bb13705113a67b493530cf1a8e8ffdca2887093f)
(cherry picked from commit 6cd912d7f13d0985eaa03fa2171f7983c0d2671c)
Telephony: Avoid list of Apns in ApnSettingsMenu

Don't display any Apns in the ApnSettingsMenu when
getOperatorNumericSelection returns empty

Change-Id: I8f425e75c995f9825905983dc1bdc94f15f2054e
CRs-fixed: 486026
(cherry picked from commit 09e0403e2199c65e567775994ffe990281fc5183)
(cherry picked from commit d483b697e2acc4eef23a8cd743be97b2febdb565)
(cherry picked from commit c89dc4e90cff4d0f3342cf3862d159ff785b2a2e)
Multisim: Add support for MSIM

Add Multi SIM Settings screen in UI which is used to select
Voice, SMS, Data preferences.
Extend APN Settings, Security Settings, Wireless Settings
for MSIM.

Subscription specific for Mobile data, roaming and usage
 - Provide per subscription based support for both Mobile Data
   and Data roaming options. UI and functionality changes in:
   a. Settings -> Data Usage application
   b. Settings -> Mobile Networks menu
 - Provide per subscription based data usage information. UI and
   functionality changes in Settings -> Data Usage application.

Add prompt support for SMS
 - Add prompt option in SMS multi sim settings.
 - New iterface API to get SMS prompt is enabled or not.
 - Disply prompt while sending SMS, if user selects
   prompt mode in multi sim settings

Extend CB "Operator info" feature to MSIM.
 - Add SUB information while broadcasting CB intent for MSIM.
 - Remove country specific checks for cellbroadcast Operator
   info for MSIM.
 - Move Operator info to About phone->Status->SelectSubscription
   ->SUB1/SUB2->Operator info in MSIM

Change-Id: I84abe80f20de2415ff819c7250ef0a0799662b52
(cherry picked from commit ccfd14b8a86c78c6a179a70be1357131b80d4823)
(cherry picked from commit 794b5787304bed493bbde3e9c9010a4b82824641)
Settings(MSIM): Add TuneAway and PrioritySub to MultiSimSettings

1. Add support for TuneAway and PrioritySub UI options in
MultiSimSettings
2. Add setDefaultVoiceSub, setTuneAway and setPrioritySub
OEM HOOK requests in OSS space

Change-Id: I3b1bc4ed98b3ed7b280938878ba9d7bdb244fcf9
CRs-fixed: 464483
Add support for below network modes info in hidden menu

 LTE/WCDMA
 TD-SCDMA only
 TD-SCDMA and WCDMA
 TD-SCDMA and LTE
 TD-SCDMA and GSM
 TD-SCDMA,GSM and LTE
 TD-SCDMA, GSM/WCDMA
 TD-SCDMA, WCDMA and LTE
 TD-SCDMA, GSM/WCDMA and LTE
 TD-SCDMA, GSM/WCDMA, CDMA and EvDo
 TD-SCDMA, LTE, CDMA, EvDo GSM/WCDMA

Add support for other network modes in set preferred
network mode UI option in phone information in hidden menu

Change-Id: Id3fd9a27be84e85f4f32a0fd2a7eee9eec545227
CRs-Fixed: 569944
Settings: Show Service State status in Phone Status properly

When the network mode is data only mode, the voice service state
would be OOS. In such cases, data service state is not checked to
show the phone status UI. Fix to consider data service state also to
update the UI properly.

Change-Id: I20fb6ea3256d0fe4a534fbb781e664d7ce774a05
CRs-Fixed: 517234
MSIM : Enhance UI when no SIM / single SIM is present

As part of this change, the following UI enhancements are done:
1)"SIM card info not available.Menu cannot be accessed" will be
displayed to user on accessing the multiSIM menu when
no SIM card is inserted
2)If a single SIM is inserted, only Configure
subscriptions menu inside Multi SIM setting will be accessible
to the user.The remaining options will be grayed out
3)If multiple SIM cards are inserted, all options inside
Multi SIM setting will be accessible

In case of airplane mode, based on the availability of
SIM card info the UI specified above is displayed

Change-Id: Id41f3b3260ed72dbf43413d49da9b9e5019aef69
CRs-Fixed: 554727
Settings: Tune Away option is not retained on UI.

The Tune away status setting is not written to the settings
database. Writing the value to Settings database through
MSimPhoneFactory in telephony framework.

Change-Id: Ieb27c6e421d37308e0d97e26dbd8db52281d966d
CRs-Fixed: 533245
Settings: Removal of DSDS menu in SSSS mode

Add new intent filter
"codeaurora.intent.filter.settings.multisim.SHORTCUT"
to de-couple MSIM setting menu in non-DSDS mode.

Change-Id: Ie7df65570095fd570ab48736072b03ac5b1b0027
CRs-fixed: 539932
Add initial preferred APN feature

In multi-sim scenarios, each sim will have its own preferred APN
setting. When ApnSettings sets/reads the preferred Apn, SUB id will
be passed to TelephonyProvider.  TelephonyProvider will update/return
the value of the key 'apn-id0' or 'apn-id1' based on the given SUB id.

Change-Id: Ifbbb49f2b38a5c6cff56785313a80a34479ea08f
Telephony: Disable PIN Toggle option if SIM is in Locked state.

When user presses cancel in PIN lock screen, card will be in
LOCKED state and hence cannot access SIM for any transactions.

So Disable PIN Toggle option in Locked State.

Change-Id: Id569c9976c6fb9a3b2490577c80348cf2f2489ab
CRs-Fixed: 576782
Telephony (MSIM): Retain the pref selection when set voice sub fails.

When set voice subscription fails due to sub not activated, the
preference selection is not reset until the Activity is resumed.
Return false for onPreferenceChange() so that UI is reset back to
original value.
Similar fix done for set priority subscription and set sms
subscriptions also.

Change-Id: Ia12a88db87ff442713785b4501e227f37ee10c95
CRs-Fixed: 577949
Unbreak the APN editor

Change-Id: I4f0b27628539473381fb28b6d60dd5eacd8e1fd4
Fix some string derps

Change-Id: I8db77888c253561c5da4f1817a57a1a8ea62d205
Merge branch 'CyanogenMod/cm-11.0'

Conflicts:
	res/values/arrays.xml
	res/xml/settings_headers.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/cyanogenmod/SystemUiSettings.java