move ribbons

Change-Id: I5cd21241843953026e8d139f6fdb568d4aab4e56
Add hardware tunables (gamma, color, vibration strength).

Change-Id: I44e3e4e6cb444498a7c56048618cd92a0e2b8e59

Conflicts:
	proguard.flags
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/settings_headers.xml

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	AndroidManifest.xml
	res/values-es/slim_strings.xml
	res/values/slim_strings.xml
Settings: AdaptiveBacklight support

Add support for adaptive backlight technologies like NVIDIA SmartDimmer, QCOM CABL or Samsung CABC.

Patchset 2: Use internal shared prefs to store the smardimmer setting
Patchset 3: Rename to AdaptiveBacklight
Patchset 4: Reorganize settings and strings to follow design guidelines
Patchset 5: CleanUp
Patchset 6: Added suggestions
Patchset 7: Sync default value. CleanUp.

Depends	on http://review.cyanogenmod.org/#/c/48465/

Change-Id: Ib0e05770bf90b664a00e65f46d32cc9a07be1377
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/BootReceiver.java

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/slim/service/BootReceiver.java

Conflicts:
	res/values-es/slim_strings.xml
	src/com/android/settings/DisplaySettings.java
Add preferences for high touch sensitivity

Change-Id: I07d7f316d6d6e2679dbb12224ebfe0f3ac815150

Conflicts:
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values-es/slim_strings.xml
fix High touch sensitivity option sticking on

Change-Id: Ie6d0c0f454d054dff93ce8c5e59a42e6224ec97d
DisplaySettings: Add hardware-framework support for tap-to-wake

Since we have tap-to-sleep globally, might as well support the
wake gesture as a standalone thing through the HAF. Place it in
"Display".

Change-Id: I6facc2334ff9e80077581c54c428476594e91528

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values-es/slim_strings.xml
	src/com/android/settings/DisplaySettings.java
Settings: Add screen color settings

Add "Screen Color" item in settings.
This function support set Hue, Saturation, Contrast and Intensity value,
and screen color will be changed by this settings.

Change-Id: If6f6e7ee7f28862476a8b955cd3252175fefa2a1

Conflicts:
	AndroidManifest.xml
	res/values/mahdi_colors.xml
	res/values/mahdi_config.xml
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/values/strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/values-es/slim_strings.xml
	res/values/colors.xml
	res/values/config.xml
DisplaySettings: Add hardware-framework support for color enhancement

Change-Id: I9fa4e7409266ce9e658c93ae32940050cfe437d2

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values-es/slim_strings.xml
if we dont have any advanced preference, remove category

Change-Id: I57abd9a82434868c750fc02053fbe80f364a8fed
fix

Change-Id: Ie28d397edfc19bb3d0a33f03827f00c717730838
Move Shake Sensitivity to shake events

Conflicts:
	res/xml/accessibility_settings.xml
	src/com/android/settings/accessibility/AccessibilitySettings.java

Conflicts:
	res/xml/accessibility_settings.xml
	src/com/android/settings/accessibility/AccessibilitySettings.java

Change-Id: Icfc5d21ff67a7298d6c549d66ff7bd2bf5bd96e4

Conflicts:
	src/com/android/settings/accessibility/AccessibilitySettings.java
[1/2] Add option to change size of QS ribbon bar

Change-Id: I30697f84e5f066790d707bc052f63d1db979fd95
PS2: Use narrow for 2nd size
PS3: Rebase
PS4: Change narrow to automatic
PS5: Rename small to narrow

Change-Id: Ibdf37b667b54ca598bc133b89ae01a504bfac883

All Credits to CM / Alex Grund

Conflicts:
	res/values/kang_arrays.xml
	res/values/kang_strings.xml
	res/xml/notification_drawer_qs_settings.xml

Conflicts:
	res/values-es/slim_strings.xml
	res/values/slim_strings.xml
	res/xml/status_bar_settings.xml
Settings: Squashed commits for traffic meter on statusBar (2/2)

Change-Id: I5610c18a03cbaab04f5c0cc028dadccf983c7ab3

Conflicts:
	AndroidManifest.xml
	res/values-es/revo_strings.xml
	res/values/slim_arrays.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/slim/StatusBar.java
Add native java screen recorder [2/2]

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

Change-Id: I416a3c80eb4ba892497ce46afea979290d0460af

Conflicts:
	res/values/vendor_arrays.xml
	res/values/vendor_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/slim_interface_settings.xml

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	src/com/android/settings/SecuritySettings.java
Screen recorder: add ability to record audio from mic [2/3]

Change-Id: Id64bdc332505a7c7d9bafe76c78032d24630062e

Conflicts:
	res/values/vendor_strings.xml

Conflicts:
	res/values/slim_strings.xml
fix derp

Change-Id: I1c4b77d4db68a65b3196e21bedd1e71e3b7c5ad9
screenrecorder: check for supported video encoder resolutions.

-Only supported video encoder resolutions will be displayed. Video
encoder support is outlined in /etc/media_profiles.xml and
/etc/media_codecs.xml

-In my testing selecting and unsupported resolution causes screen-
recorder to fail. If the devices encoder resolutions are not in the static list
(such as 480p 480x720) there is no way to set the correct resolution. This fixes
those issues.

-More info on Media Encoders: https://source.android.com/devices/media.html

Change-Id: I13b32b8f10655a5cf13ae55ae56eeb4de69ae68e
options to screenrecorder power menu

Change-Id: Id6376c362b95693d97f8172ac8b8e7c62343876b

Conflicts:
	res/values-es/slim_strings.xml
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
Quick Settings: Weather tile

You can check the weather to make it easier.

Dokdo Project - Gwon Hyeok

Conflicts:
	res/values-ko/dokdo_strings.xml
	res/values/dokdo_strings.xml
	src/com/android/settings/quicksettings/QuickSettingsUtil.java

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java

Change-Id: Ic22a91e9c4d886d8c444bde935b754088dace95f

Conflicts:
	res/values-es/slim_strings.xml
	res/values/slim_strings.xml
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java