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.

(ported to cm11 - cyanogen)

Change-Id: Ie2da961d87b5ca7286dd72562e7d9fbdf5bf954d

Conflicts:

	res/xml/account_settings.xml
(2/2) SQUASHED Lockscreen see through, blur and fixes for slim

All credits to David96 / AOSPA

Conflicts:

	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_lockscreen.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/SecuritySettings.java
[SQUASHED] Lockscreen Notifications (2/2)

Following commits inside (with minor adaptations)
https://github.com/AOSPAL/android_packages_apps_Settings/commit/10ccffd1ca698aa204479d1c935a3ce3fa47edb2
https://github.com/AOSPAL/android_packages_apps_Settings/commit/17c7bcf21b56a8d977b26f62921d58a3db024a98
https://github.com/AOSPAL/android_packages_apps_Settings/commit/db6757742959c983d2a3477c217fe68e870a6969
https://github.com/AOSPAL/android_packages_apps_Settings/commit/8fc910a7d0a3d559b125706ddf4b65b71bada6c1
https://github.com/AOSPAL/android_packages_apps_Settings/commit/a73649abfce893d99ddc902a04d495970c0f117f
https://github.com/AOSPAL/android_packages_apps_Settings/commit/9b8a305b968018ab4b26fd35720a1e98ccd3852c
https://github.com/AOSPAL/android_packages_apps_Settings/commit/cb18eca4bf63833428b4487c54b1bc3b1b96f66b
https://github.com/AOSPAL/android_packages_apps_Settings/commit/b2ff326f86c6641486dc92de9e02c36a727f5040

Change-Id: Ib13c39cb67839bec92a660000eae23bdb7fdfa30
AOKP custom system animations (2/2)

ported fom here: http://gerrit.aokp.co/#/c/12305/

Thanks to Steve Spear

Change-Id: Ibd978f0516521579e5339f21ac81a360740358e8

Conflicts:

	res/xml/screen_and_animations.xml
	src/com/android/settings/SettingsPreferenceFragment.java

Conflicts:

	res/values/cr_strings.xml
Adding preference slider
Settings: add Quicksettings Notification Ribbons (2/2)

Conflicts:

	res/values/jisoo_strings.xml

Conflicts:

	res/xml/notification_drawer_settings.xml
QS: Fliptile animation [2/2]

Change-Id: I321cb4070eaf7d6fa60df107ec8ab6bcd671b52a

Conflicts:

	res/values/jisoo_strings.xml
[1/2] Add option to change size of QS ribbon bar

Change-Id: I30697f84e5f066790d707bc052f63d1db979fd95
PS2: Use narrow for 2nd size
PS3: Rebase
PS4: Change narrow to automatic
PS5: Rename small to narrow

Change-Id: Ibdf37b667b54ca598bc133b89ae01a504bfac883

All Credits to CM / Alex Grund

Conflicts:

	res/values/kang_arrays.xml
	res/values/kang_strings.xml
	res/xml/notification_drawer_qs_settings.xml

Conflicts:

	res/values/jisoo_arrays.xml
QuickSettings: Camera tile [2/2]

Change-Id: I7425695cb7c1dc201f438c8b6e57f1717e3861a1

Conflicts:

	res/values/slim_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java

Conflicts:

	res/values/jisoo_strings.xml

Conflicts:

	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java

Conflicts:

	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java
Settings: Add battery level around unlock ring [2/2]

Credit xplodwild

Signed-off-by: hany <hany.alsamman@gmail.com>

Conflicts:

	res/xml/security_settings_lockscreen.xml
	src/com/android/settings/SecuritySettings.java
Revert "settings: add and pimp several help/reset dialogs"

This reverts commit 16695a4776cc96752fa1234fcd48c498c978c750.

Conflicts:

	res/values/slim_strings.xml
Revert "Put fragment in specific activity's whitelist"

This reverts commit 37f06a4c87e5b0dbfda75ea76716aafadef66d32.
Revert "privacy guard manager: fix intent call on fragment"

This reverts commit 73d71e1f45417ccfdd4f0de5b71b58be8de790cc.
Revert "Improve apps ops detail screen"

This reverts commit 3b4adee76a20a70ab3ea02982f4cb2a61b446b48.
Revert "Privacy Guard Slim version (2/2)"

This reverts commit 20ba27afd7f42b7596ed05ea9dd27c5a2bcc80a3.

Conflicts:

	res/values/slim_strings.xml
	res/xml/security_settings_app_slim.xml
	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:

	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:

	res/xml/security_settings_app_slim.xml
CM privacy guard manager [1/2]

[1/2] Settings AppOps: Forward port wifi/bluetooth/mobile/wakeup ops
[1/2] Settings AppOps: show/hide app type and allow/deny counters
[1/2] Settings: AppOps: Add bootup template
Add support for MODE_ASK mode and enable App Ops under security settings.
AppOps: Add advanced menu link from privacyguard
Allow disabling the privacy guard notifcation
PrivacyGuard: confirm permissions reset

Conflicts:

	AndroidManifest.xml
	res/layout/installed_app_details.xml
	src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:

	res/xml/lockscreen_settings.xml
Force Expanded Notifications (2/2)
This will force expanded notifications for all apps that support
expanded notifications

Conflicts:

	res/values/jisoo_strings.xml
fix derp in heads up and CM privacy guard merge
Disable Immersive Messages [1/2]

Change-Id: I63ca47f9eecf8e3dcfc0b5b0c6cdb70b7c1a0d6c

Conflicts:

	res/values/jisoo_strings.xml
	src/com/android/settings/DisplaySettings.java
Internal Memory Quick Panel

Change-Id: Icc72c1f784363dcbae517e1065120c823ab540fd