Some more corrections :-)
Settings: Lockscreen rework WIP

Moved quick unlock to settings/security

Only show option if pin or password lockscreen selected.

Change-Id: I33d6fc1020a81c9011ff8ec476b91db73a4fe361
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:
	src/com/android/settings/SecuritySettings.java
Merge pull request #17 from gaich/patch-3

Some more corrections :-)
Settings : Fix App & Widget Pickers.

Fix the Theme settings for App & Widget pickers.
corrects the 'White on White' condition of those
two pickers.

Change-Id: Ib8a355d10c471e62836d9e74baef886240565b8f
Signed-off-by: Zaphod <mwilson@acesappraisal.com>

Conflicts:
	AndroidManifest.xml
Merge branch 'jb2' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2
2 fixups.
Settings: MediaScanner behavior on boot (3/3)

Lets you enable/disable/ask (with a notification) media scanning on boot.
Can speed up boot and reduce initial boot lag from MediaScanner

Change-Id: I266f0adc1aaf2b28a7735d5b9cc965e699f06a6c

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Remove whitespace.
RC: "Ribbon options" to "Ribbons"

IMO its understood that since its in RC then it has options. Plus
all the other options in RC are "NavBar Ring Options" but they don't
have the word options after them. Just a UX thing, not sure if you guys
agree :)

PS2: Ribbon -> Ribbons

Change-Id: I92ed78d4f2a3414b0943302398ffda7b2bf71555
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Settings: Broadcast ACTION_DATE_CHANGED

Send ACTION_DATE_CHANGED when user change the format of the date

Change-Id: I89ef0354ae2b0825378a6e8939341c4eccf63e17
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Overhaul auto-brightness level UI.

This changes a few things:
- Don't imply a 'bucket' type of algorithm is used by showing an ambient
  brightness range for each line
- Allow manually entering the screen brightness
- Add a preview window for the cubic spline interpolation
- Add a help text

JIRA:CYAN-612
Change-Id: I64274280872b9fe4f6fdc368d654aca81e0a4e0c

Conflicts:
	res/values-af/strings.xml
	res/values-da/cm_strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-nl/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-pt/cm_strings.xml
	res/values-pt/strings.xml
	res/values-ru/strings.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/attrs.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	src/com/android/settings/AutoBrightnessCustomizeDialog.java
Improve brightness curve preview

- Avoid log spamming
- Add a little margin around the grid so outer control points aren't cut

Change-Id: Idb6cd2773186f9e7011486dc62f21e2fab85e245
Correctly restore brightness customize dialog hierarchy.

This is especially important when rotating the device.

Change-Id: Iaf1ceb46943e9d0a171d6a75d3d446dbec205095
Led Settings : Hex input for colorpicker

Allow users to specify hex color codes

Change-Id: I644b624d569e5c2fbb0fc48683c73041b4193d27
Fixups.
Merge branch 'jb2' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2
Merge remote-tracking branch 'CarbonDev/jb2' into jb2

Conflicts:
	res/values/dimens.xml
	res/xml/crom_settings.xml