Settings: add never sleep screen mode (2/2)

see fb patch

Change-Id: I17776173c2f35e3fe1c9bd803340e5ee86cfb272

Conflicts:
	res/values/slim_arrays.xml
Active display: Allow apps to be excluded from being displayed [2/2]

Change-Id: Ic8988251120069edd47be8a9e782d422999da4ea

Conflicts:
	res/values-ko/cm_strings.xml
	res/values/cm_strings.xml
	res/xml/active_display_settings.xml
	src/com/android/settings/chameleonos/ActiveDisplaySettings.java
Active display: Option to change display timeout [2/2]

Change-Id: I0775958cc47163da084d10c5fb80fa06814a32c5

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/active_display_settings.xml
	src/com/android/settings/chameleonos/ActiveDisplaySettings.java
Settings: Ability to Enable/Disable Smart Wake covers

Change-Id: I4339245881d682a653b84a1b8ef57182e650156e

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Settings: Add bridge to PerformanceControl

Change-Id: I259323366ca0aac8b8d334bc9629dec5acc9108a

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/drawable-hdpi/ic_settings_performance.png
	res/drawable-mdpi/ic_settings_performance.png
	res/values/custom_strings.xml
	src/com/android/settings/Settings.java
fixes

Change-Id: Iaf0c3c43f538fb8664853d14cb36157aa09ac41e
Add more animation speeds thanks to vanir

Change-Id: Ie2ac6a232eab93c6d9f4de01e72043c55eab1b03
Settings: Add link to AppOps

Change-Id: I7385b87ffc82e5ccefefb0add26e9c7cb20217ea
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>

Conflicts:
	res/xml/settings_headers.xml
Settings: Fix app ops details not displaying permissions under certain
conditions.

If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.

Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
Settings: Make app ops more usable

gets rid of the arbitrary categories,
shows all operations, not just the ones that were in use

operations != permissions. app ops is not permission management

PS2: Hide the tabstrip as we only have one category

Change-Id: I8570bd14a4b739f33417442d23c400fd2d264904
Squashed: Auto brightness dialog from CM

Add back backlight curve adjustment.

Patch set 1-8: Initial commits
Patch set 9  : Shortened strings to better fit Design Guidelines

Change-Id: I1eb370f8911d1c92ef06e553cc1c1be81e83cb95

Conflicts:
	res/values/strings.xml
	src/com/android/settings/BrightnessPreference.java

Some post-merge cleanup for automatic brightness adjustment

- Remove some unused strings
- Use (device-dependant) minimum brightness level (as calculated by
  DisplayPowerController) as '0%' instead of the actual value 0.

Change-Id: I79123d2421c9ab35fa0f1808d82d785463e8fbaa

Settings: fix incorrect value in autobrightness adjustment

If the user drag the progress bar below the min value, the incorrect
setting will be saved since seekBar.setProgress code path does not
return to the "getItem(pos).backlight = ..." line.

Change-Id: I4796e22ba9c44315be92de4040f6cd8451bdf153

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/cm_strings.xml
	res/values/colors.xml
	res/values/dimens.xml

Correctly restore brightness customize dialog hierarchy.

This is especially important when rotating the device.

Change-Id: Iaf1ceb46943e9d0a171d6a75d3d446dbec205095

Make menu item title and help text consistent.

Change-Id: Ia14fbb200fbc19bcdc654bd542dbe3ba15fbf6ea

Conflicts:
	res/values-af/cm_strings.xml
	res/values-da/cm_strings.xml
	res/values-de/cm_strings.xml
	res/values-el/cm_strings.xml
	res/values-es/cm_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-nb/cm_strings.xml
	res/values-nl/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-pt/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/cm_strings.xml
Housekeeping, part 1

Settings:
	Remove redundant and unused imports

Change-Id: I4a42aab221f4678e952ba36dd31b4ef3f10cda29