Disable status bar clock seconds option if clock is disabled
Revert "[1/2] Settings: Add Captive Detection toggle"

This reverts commit 81c9e7536866ab8fb46fe74fd37a54b9720410b9.

Conflicts:
	res/values/pa_strings.xml
Settings: status bar notification count (2/2)

credit: burnsra & rmcc (cm)
Settings: Skip apps where the LED's already set up

The Settings app should not have shown a package in the "Choose
application" dialog if it was already configured with custom
notification lights since it just introduces confusion

Change-Id: Ib64fc3733601a5a5c3e61068b376f82b5f4720ae
AOSPAL-Platlogo[1/2]
Add Lightbulb NavRing target (2/2)
Apps: Add blacklist interface [2/2]

Now with 100% more hidden checkboxes

Signed-off-by: Evan Anderson <evan@thelinuxman.us>
Change-Id: Ied375cfe2ff6494c25acb9d80b19e824daed755d
Merge "Settings: Skip apps where the LED's already set up" into kitkat
Automatic Translation Import

Change-Id: Icc9e3115c8aa175f51270313823d03d51d4b8a63
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

Conflicts:
	res/values-ca/pa_strings.xml
	res/values-de/pa_strings.xml
Settings: Remove Wallpaper selection from Display

Let the launcher handle wallpaper selection.

Change-Id: I7f0eb20a5bc01d82fdb98905524b9743fee447c6
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	res/xml/display_settings.xml
Theme Engine [4/8]

Squashed Theme Engine related changes.
Added custom lockscreen wallpaper and keyguard changes from cm too.

------------------------------ HISTORY ------------------------------

[+]
Settings: Lockscreen custom wallpaper (2/2)

Hide see throught till we add it as a component for Theme Engine.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

[+]
Settings: read keyguard package name from overlays

Signed-off-by: Roman Birg <roman@cyngn.com>

[+]
Settings: move keyguard wallpaper to system (2/2)

Change-Id: Id3bb66aa78c2e3dbd1170e74e33fcd160e5a70bb
Signed-off-by: Roman Birg <roman@cyngn.com>

[+]
Add wallpaper pickers to seperate package [2/2]

Change-Id: I233b90aa52b5a8c408fa3adfe3bdad07330cc2ad

[+]
Make LinearColorBar themeable

Move colors to resources and use them instead.

Change-Id: I923e5daa219f302dc24e62faab666483109e6620
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>

[+]
Cleanup

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Change-Id: I981ea7118ff38287df02fe37e72fc7009bd90c84
Merge "Settings: Remove Wallpaper selection from Display" into kitkat
Merge "Theme Engine [4/8]" into kitkat
Fix translations derp.
Remove this one, can't look fixing another language.
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

Phew...

Conflicts:
	res/xml/display_settings.xml
	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
	src/com/android/settings/Settings.java
Revert "Custom wallpaper: use PNG"

This reverts commit 2ca7372e63df8debd3d1a7b8769ba551b0f9441f.

Conflicts:
	src/com/android/settings/AOSPAL/AdditionalSettings.java
Revert "Custom lockscreen wallpaper [2/2]"

This reverts commit 2884f0d7ef4d504a347414db6912ebf2ad94066c.

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
	src/com/android/settings/SecuritySettings.java
Uncomment Lockscreen Blur & See Through for TE