Settings: Generic Blacklist support (1 of 5)

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/security_settings_app_cyanogenmod.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java

Change-Id: I58aff50637b9bf71095ec791e16efd520e6c29a3
Separate Change Encryption Password Entry (1 of 2)

Separates the link between changing the lockscreen password and changing the device encryption password.
This permits the use of a longer, more secure, password when deriving the filesystem encryption key,
yet doesn't affect ease-of-use when regularly unlocking the screen, as a short password or PIN
can be used. Patch requires framework modification as well as this, to function.

Resolves Android bug 29468

Conflicts:
	res/values/custom_strings.xml

Change-Id: I45481dda1959d40c99cf9c260ddef8b8d143b258
Settings: Add Advanced reboot option
By DvTonder

This commit adds a setting in Development settings for including options
in the power menu for rebooting into recovery or bootloader, defauled to
off.

When enabled, the Advanced reboot options will only be available once the
device is unlocked.

Change-Id: I692fb732ec1b14ae9a71f2de4b343a05934cdcf9
Hide Adb Notification icon (settings)

Change-Id: I1f118f1c09a1d7a300a80760cac0be083a453c6a

Conflicts:
	res/values/strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java

Conflicts:
	src/com/android/settings/DevelopmentSettings.java

Change-Id: Ic2fd03849d044bd77e4b1295f7a85e5463d24c1c
Merge "Settings: Add Advanced reboot option By DvTonder" into android-4.3
Settings: Forward port CM Screen Security settings (Part 1 of 2)
by DvTonder

includes:
- Menu Unlock, Quick Unlock, Home unlock and Slide lock delay settings
  Author: DvTonder
- Lockscreen cleanup: Rework the logic to separate cm lockscreen
  settings from stock lockscreen settings.
  Author: Danesh M
  Id: Ic3eebc30fbb55afa6254889b17bde6e3083d1847
- Fix unknown sources crash
  Modify logic to only make cmsecurity specify the extra,
  any other time, default to stock security
  Author: Danesh M
  Id: Ida4b8ccc2f41d79aa9013029b4245ae4d3cd4496
- Adjust available options based on screen lock picked
  Disable / enable the available screen security aditional options based
  on what screen lock was picked.
  Author: jfassad
  Id: I634b18b58d0e1a1c075f9808776fc4f685316221
- Add home button unlock option
  Author: invisiblek
  Id: I10b96b2f788ca26bc45f1758e612b9dfe7beff59

Change-Id: I49c31c1a3bdf31adfe972c467eac0b7624ea4ef8
Settings: Add first Interface section

Change-Id: I779b1b1cc2977b4646e8309275370bebc8ce3748
Settings: Build OmniGears as part of Settings APK

Change-Id: Ie472f1f21fa5bc3edf89da405da6e100ba79ecb1
[1/2] Settings: Add lockscreen shortcuts settings

Change-Id: Ia38797d27ea1255a4f35f214c5c7ace126334f1c
Merge tag 'android-4.3_r3.1' into HEAD

Android 4.3 Release 3.1
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18
Settings: Add bridge to PerformanceControl

Change-Id: I259323366ca0aac8b8d334bc9629dec5acc9108a
Merge "Settings: Add bridge to PerformanceControl" into android-4.3
settings: embed custom led notifications into display

Thats how I would do it :)
I have just commented out the original code

Change-Id: Id68074f79967167a892b51796ca10a3a2359dceb
SecuritySettings: Fix crash when lockscreen is set to a secure mode

Change-Id: Ie6d7de057dac4cdae72aed622f3145fa8e7271eb
settings: performance icons

Change-Id: I612d1d1a94198140fedbb2f2713f56d01ccb08c3
Merge "settings: performance icons" into android-4.3
Add Omni Version

Change-Id: Ie8d17a4607a4e1cb4979d8ac009b582bc169df0a
Add HALO [2/2]

HALO is Androids one and only multitasking solution.

Change-Id: I640b407770a9f93e1a2a64b4fbfe11fe378c3541
Merge commit 'refs/changes/80/1480/3' of https://gerrit.omnirom.org/android_packages_apps_Settings into cm-10.2

Conflicts:
	AndroidManifest.xml
	proguard.flags
	res/drawable-hdpi/ic_settings_performance.png
	res/drawable-mdpi/ic_settings_performance.png
	res/drawable-xhdpi/ic_settings_performance.png
	res/layout/installed_app_details.xml
	res/xml/blacklist_prefs.xml
	res/xml/development_prefs.xml
	res/xml/display_settings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/blacklist/PreferenceFragment.java
	src/com/android/settings/blacklist/ToggleImageView.java