Clean up, Dbl entry
Make them Switches,Instead of checkboxes
Add:Quick Unlock 1/1

thanks Slim @kufikugel
Settings: Gesture Anywhere - bring it back [2/2]

AICPfy lp5.0
- Haven't added icon on purpose for now
- Added CM's ShortcutPickHelper because it
  used it in KK base and no need to modify anything

Change-Id: I51ead6cc35684104ecc1211df0a598d1a0b816c1

@alviteri: Aicp'fy --> crDroid'fy also remove uneeded spaces at SeekBarPreference

Conflicts:
	AndroidManifest.xml
	res/values/candy_arrays.xml
	res/values/candy_attrs.xml
	res/values/candy_strings.xml
	res/xml/crdroid_custom_settings.xml
	src/com/android/settings/candy/SeekBarPreference.java
Settings: Switch needs an setOnPreferenceChangeListener

So today is derp day....another 4am morning fix.

Will stop today for sure.

Sorry again

Change-Id: I04eea381a2930995ef0f8820c0f251bc40df4820

Conflicts:
	src/com/android/settings/SecuritySettings.java
Merge branch 'c5' of https://github.com/matthew0776/packages_apps_Settings into c5
Seetings:Forward port Vol Long press skips track 2/2
Rearrange Buttons option into Candy interface
and remove unwanted options that were brought into Buttons from CM
Remove QuickBoot preference if package isn't available

Change-Id: I6f00b6be8d87c1013d2c695d93e66d276017b0a1
Settings: fix custom SIM name lost on reboot

NAME_SOURCE_USER_INPUT should be set or the value won't
be saved in the database

Change-Id: I007eba76af5cb5a37988413a0d551eab60a9d4ca
Settings: EL AOSP translation fixes

Come on AOSP, we're fixing these since ICS...

Change-Id: Ic94f25a2335d187c98d8712e8dbd3bcaac82cfb9

Settings: Modify AOSP EL translations

Change-Id: I7e3a59412a2884c26a5eb165676e381d003f0fca
Settings: Fix the failing strings

Change-Id: I93865d793eef711f8738e00e843e9d4670724c66
Settings: Fix AOSP WiFi AP translations

* Add missing spaces between SSID and AP security

Change-Id: Idcd284a16cbd10a0e73db8bfda988f2ad3e6e6f1
Revert "Bluetooth: Add Manifest configure to fix settings crash issue."

* This breaks up navigation in Bluetooth settings

This reverts commit bc8b9a471cec7fcfc2737dc844c1002ff9b9793c.

Change-Id: Iadd8f301d5c78bc08846d639b02a4ae6db189e88
Merge branch 'c5' of https://github.com/CandyRoms/packages_apps_Settings into c5
wifi: forward port avoid poor connection setting

Change-Id: I22d0866e2c5d9b7f119b7ad42cc66e78bfd6ada0
[2/2] Left handed navbar during landscape mode

This patch allows for the navbar to be moved to the left side of the
screen during landscape mode. Left handed people are more used to this
option.

Screenshot: http://i.imgur.com/jWqJcEV.png

Contributors:

Decad3nce
https://github.com/CyanogenMod/android_packages_apps_Settings/commit/a2b5ff1542e802f4257e7a7746ceb9e1c9cf333e

romanbb
https://github.com/CyanogenMod/android_packages_apps_Settings/commit/34344a5fa2a03d849901f09340f3dd8010e2a7fe

crpalmer
https://github.com/CyanogenMod/android_packages_apps_Settings/commit/6833e8c627e0b44b0ee7191fce714556ab3eac25

Change-Id: Ic95e3fda1f55efd2ec908c8d7226e638ec0ab80a

Conflicts:
	src/com/android/settings/ButtonSettings.java
fixup "wifi: forward port avoid poor connection setting"

Change-Id: I3545e874bd6519a586744fc36297f7f3f3cb1f42
Settings: fix NPE in ButtonSettings

Change-Id: Ib2ab4d7d5ed3aaceeba8fe942b7a29cd01f003fb
Lowercase to uppercase

http://i.imgur.com/xdt0REV.jpg

Change-Id: I2e8b7f606a0c82bc448a07a28829203c96e1d5a3
Buttons: Prevent toggling disable hardware keys too quickly

* Apparently the phone window manager _really_ doesn't like it when you
  do toggle this too quickly.

Change-Id: I936c6554927ffcdc7c78edaf25f71aedba497ac8