Revert "[2/2] Settings: Make menu unlock configurable"

This reverts commit ddce7e5582d75ac13a74562cbde5649621611cf0.

Conflicts:
	res/values/pa_strings.xml
	res/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java
Settings: Home & menu unlock

credits CM

Change-Id: If89f4234f0262269c2b099c91371f3ba52d83e15

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/SecuritySettings.java
Add native java screen recorder [2/2] (WIP)

PS2:
Change framerate related stuff to bitrate since the setting
is actually the bitrate and not the frame rate ;)

Carbon PS2:
Meld vendor_arrays/strings with cr
Carbon PS3:
Fixup for patches merged
Carbon PS4:
Fixup for merge conflict
Carbon PS5:
Fixup, moar merge conflicts

Change-Id: I416a3c80eb4ba892497ce46afea979290d0460af

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
Screen recorder: add ability to record audio from mic [2/2]

Change-Id: Id64bdc332505a7c7d9bafe76c78032d24630062e

Conflicts:

	res/values/vendor_strings.xml

Change-Id: Id64bdc332505a7c7d9bafe76c78032d24630062e

Conflicts:
	res/values/cr_strings.xml
Add global action for screen recording. [2/2]

Change-Id: I231cc0df818c8bf1092021e72ec2ff197e352df5

Conflicts:
	res/values/vendor_strings.xml
	res/xml/power_menu_settings.xml
	src/com/android/settings/chameleonos/PowerMenu.java
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	res/values/pa_strings.xml
Add global action for screen recording. [2/2]

Change-Id: I231cc0df818c8bf1092021e72ec2ff197e352df5

Conflicts:
	res/values/vendor_strings.xml
	res/xml/power_menu_settings.xml
	src/com/android/settings/chameleonos/PowerMenu.java
Revert "Add global action for screen recording. [2/2]"

This reverts commit f0c93655562e8255bf7b9f8983c86ec1380b8ecb.
Revert "Screen recorder: add ability to record audio from mic [2/2]"

This reverts commit da16d3198b5c051e5ec91b7a2ec898da03a37db6.
Revert "Add native java screen recorder [2/2] (WIP)"

This reverts commit cf173d41bdd9541afd3d8e7901b1fa7e3c96b10d.
Revert "Add global action for screen recording. [2/2]"

This reverts commit ff3a5c42e6a4f7b112eb2a4b756b2a9e3a658e5c.
Revert "Screen recorder: add ability to record audio from mic [2/2]"

This reverts commit da16d3198b5c051e5ec91b7a2ec898da03a37db6.
Revert "Add native java screen recorder [2/2] (WIP)"

This reverts commit cf173d41bdd9541afd3d8e7901b1fa7e3c96b10d.

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/AOSPAL/ScreenRecorderSettings.java
Gesture Lockscreen [2/2]

Change-Id: If5bb620cbc69fc8771e2b6211a2daf78bc50a995

Conflicts:
	res/values/custom_strings.xml
	src/com/android/settings/SecuritySettings.java
Enable Back-key when go to Emergency call

When go to "Emergency call" from lock screen, back key is disappeared.
It is difficult for user to find the way to go back to previous screen.
This might be bad user experience. So we are going to make it enable.

Change-Id: Iefcca9b8943472c24ddbca6e3ec3441e93e5be91

Patchset: 2
http://review.cyanogenmod.org/#/c/57524/
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/SecuritySettings.java
Revert "Gesture Lockscreen [2/2]"

This reverts commit 0a6a0e3e5d5b8156a3f0059bbccc3c9cc496fe8f.
[1/2] Settings: Add Captive Detection toggle

http://jira.omnirom.org/browse/OMNI-356

Change-Id: I284ce5951c9c4bf8a6875e129a947fb3912df71d

Patchset: 6
https://gerrit.omnirom.org/#/c/4827/

Conflicts:
	src/com/android/settings/WirelessSettings.java
Statusbar: double-tap to sleep (settings part)

Change-Id: Ifb8f1ab1d84ba39942357ee6f8694764799d4103
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/SecuritySettings.java