Revert "[2/3]Quiet Hours"

This reverts commit 8a202029be0b528c4d1b6499126e7743590bd552.

Change-Id: Iae74de61bdd252ed003eebb65727ff12f32de013
Merge "Revert "[2/3]Quiet Hours"" into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

Conflicts:
	AndroidManifest.xml
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	src/com/android/settings/Settings.java

Change-Id: Ief938a8aafeefcf6971b892cb5b5bd8a71821b99
Total and available fields missing in Settings storage menu

After formatting SD card or inserting an SD card the total and
available space fields in Settings storage are missing.
This fix add those fields after SD card has been mounted.

Change-Id: Id6c1d1963effdb9656c8eb1c567b913bc4d98bd2
Fix memory leak in ManageApplication

ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.

Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
AppOps: Modify Chinese string for Camera as MIIT's suggestion.

MIIT gave their suggestion for Camera's summary strings.

Change-Id: I9378a160fa394e8cd6587dd484987ff43b7c979e
BT: Multi HF support in Settings App.

1. The connected sinks are not disconnected from
HeadsetProfile when new sink is connecting.
2. Also return correct connection status for
specific HS.
3. Sets priority for specific HS while disconnecting.

Change-Id: I876f9810be82482cb360451343e4eb2a9f3ed668
Settings: updating policy list after switching mobile data switch

Removed unnecessary call to updatePolicy() in the mDataEnabledListener since the setMobileDataEnabled() method already calls it.
Calling updatePolicy() with refreshCycle to true, so that the "change cycle..." option is enabled/disabled correctly

Change-Id: I2f8cfd898e663b644576626f00e38fff3ec0bbd8
On-the-spot preferences

Allow for handling of resetting multiple preferences individually.

Present the user with a list of active on-the-spot preferences to
choose from.
If a preference dialog was never presented to the user, it will not
be available for reset.
If only one preference is currently active, a simple reset dialog is
presented (current existing dialog / no list)

PS1: Initial commit
PS2: Use defined strings instead of decoding the SETTINGS_TO_RESET variables.
     This allows for string translation.
     String names should be equivalent to the SETTINGS_TO_RESET variable.
PS3: Add some error checks

Change-Id: If9c483e0745000ab486f060bf87756204b4a8e6e
Settings: Fix the memory leak in Settings

Fixed the memory leak in both InstalledAppDetails

Change-Id: I3520b3c1fe1bf98e3baec2ee989eb215164a7cf2
Signed-off-by: Zhijun Peng <pengzhj@marvell.com>
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Camera button support (2/2)

Add new bitmask for Camera button and options to rebind
its functionality.
Change-Id: I803d3b99adcdd6f2d9de15091709fc8c783ed5de

Add missing variables for camera button handling
Change-Id: I40abd4344800e8cf61285923cc1fac9ba39d652c

Camera button support: fix FC
Fixed a typo in xml which caused Settings FC.
Change-Id: I0c01d03cc8effde9d8422e091a7389dcbb59ffa5

Camera button support: fix another ^C^V fail
Yes, that was merged way too fast...
Change-Id: I88243887446876de39e79020e6d8fecc6351bdde

Camera button support: useful features & bugfixes (2/2)
Screw the remapping, let's make something more useful!
Replaced the code to actually launch Camera app, not just fire the shutter.
I won't remove it: it's cool to have an option to double-click Home for Camera.
Added:
  * Camera wake (with button half-press) and unlock options
  * "Peek": releasing the half-pressed Camera button will
    turn the screen back off
  * Camera playback control

// AOSPA-LEGACY EDIT -- REMOVE CODE RELATED TO KEYGUARD/SECURITY

Change-Id: I711fe6b1a8d304b3d0ba9682a8757605992e1bde

Conflicts:

	res/values/cm_strings.xml
	res/xml/security_settings_cyanogenmod.xml
	src/com/android/settings/SecuritySettings.java
Remove 'Allow custom buttons' checkbox (2/2)

Let hardware buttons be rebound by default.

Change-Id: If19fb357cf9dcea419bea6242f4fc1f388916e4d

Conflicts:

	res/values-ca/cm_strings.xml
	res/values-de/cm_strings.xml
	res/values-es/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-nl/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-pt/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values-th/cm_strings.xml
	res/xml/button_settings.xml
Revert "Settings: updating policy list after switching mobile data switch"

This reverts commit d94a42ee730d01370307fd5be652e50e073942ee.
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)

Conflicts:

	Android.mk
	res/values/arrays.xml
	res/xml/settings_headers.xml
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/SecuritySettings.java
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