Add entry to change lock wallpaper via themes
Change-Id: I79e7160629bc43d1f1ca993833ea2fc538550475

(cherry picked from commit 91983dd4ce37b641e9305a4f397b92180ed80a2a)
Revert "Create Omni audio theme's SoundPacks folder if necessary"

This reverts commit 879188cce39373f6c875982f35deed70c82f9653.

(cherry picked from commit 1d1957107b495bfa3d77334904023c09ffd095d9)
Revert "[4/4] Settings: Audio Themes Settings"

This reverts commit b423785e37280c3d0e09cce7f10cb97d40bb4757.

Conflicts:

	res/values/cr_strings.xml

(cherry picked from commit 0caa4341c48fd399fa55d15442f67f910c4d0f34)
Revert "[3/4] Settings: Audio Themes Settings"

This reverts commit 13206390c557119644fc507cd8b66c6f51548834.

Conflicts:

	AndroidManifest.xml

(cherry picked from commit 021d50da6dc52340758a03afa91321330a16651e)
Revert "settings: fix and pimp custom lockscreen handle (2/2)"

This reverts commit d7f55bb895b2ff83434029be65cf565ddc561211.

(cherry picked from commit ec072ad3fed1cc626faa5312aa1e938b2b692851)
Revert "Settings: Lockscreen Temasek Handle"

This reverts commit b9e4ac41a7669e967b90c4080a074a6019b7765b.

(cherry picked from commit cf847046372ca3ec6b13e8b3a9679c9bafbd6d29)

Conflicts:
	res/drawable/temasek_lock.png
	res/values/cr_strings.xml
Revert "Settings: Fix Lock Size"

This reverts commit b079e730eb3f020e3c731d69fe933701d2448c10.

(cherry picked from commit 74fd0e2258e7bbf502ff16b76e5b09fa768a3a74)
Revert "Settings: Lockscreen Colors and Lock Image [2/2]"

This reverts commit 47c22de3481a59a3ac58d79a8ca5d2f268319d96.

Conflicts:

	res/values/cr_arrays.xml
	res/values/cr_strings.xml

(cherry picked from commit 37aea684296a257a8ccda0616f60cdd23dc22c66)
add Custom Lockscreen switch

Change-Id: Icb96b85fb7ecf1b6716627f96f393f1fc9da09df

Conflicts:

	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

(cherry picked from commit 6669914a6fd92ea41145d9f9bf47ca31f2173990)

Conflicts:
	src/com/android/settings/Utils.java
Fix a number of aapt warnings.

The remaining warnings have their origin in AOSP.

Change-Id: I070d3cc1f5e9d4fc2bf7e442e58fe2bdc100ed0e
(cherry picked from commit 6c8e4cec79e23bc44b9f060cd4852f455876d718)
Settings: disable lockscreen settings appropriately

Give visual feedback on which features are unavailable
with the new lockscreen style.

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

Conflicts:

	src/com/android/settings/cyanogenmod/LockscreenInterface.java

(cherry picked from commit 0c738663523592a95c9989d55d6b5140b408f0b1)