[2/2] Settings: Hide power menu on secure lock screen (SpasilliumNexus)
Credits to Euphoria-OS: https://github.com/Euphoria-OS/android_packages_apps_Settings/commit/44e856da42e358aa977c9c12bfae68131aba6de4

(cherry picked from commit b5fd2ac746245629aefc3d6ba100dc29e0d95866)
bluetooth: Show a refresh icon on the select devices screen

The refresh menu is hidden behind an overflow which is
pointless. This patch shows the refresh icon if there is
enough room.

Change-Id: I35f19c42054b05388f7b8fcb82e0f3bd60e2d618

(cherry picked from commit fc3d7f3ace1609d497835913e771f83635052110)
Move show/hide power menu option below automatic lock

(cherry picked from commit 5b355b1a4897b3606bab31ad79eea6167f793ba3)
Display Settings: Better font size control

Use a SeekBar instead of a list/spinner to determine the font scaling.
For consistency, an approximate size (small, normal, etc.)
 and the exact percentage are displayed.
Show a preview of the selected font size immediately

Ported from CM 10.2, squashed commits 46678 and 49167.
Credit to Veeti Paaananen for the latter commit.

Change-Id: I754d7fdcaf27c23dfccf9d56291956e70b23f63e

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

(cherry picked from commit b3f536d5f2c74571bd41b229a055eb5c38594f3d)
Revert Add vibration intensity support
Revert "Port: Wake on plug (2/2)"

This reverts commit 49451ddea0a2f122357cdc0b8e079ff3c542ef14.

(cherry picked from commit c0d2801e588562aa59b266439d8ef31d05953720)
Port: Wake on plug (2/2)

Change-Id: I22ee2a05040561cca796814573adc5226f1f03d4

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

(cherry picked from commit ed9edf7b723069c1395a1a5f3010d169c4c0e773)

Conflicts:
	src/com/android/settings/DisplaySettings.java
settings: Squashed commit of CMHW features

Add hardware tunables (gamma, color, vibration strength).

Change-Id: I44e3e4e6cb444498a7c56048618cd92a0e2b8e59

Settings: restore hardware tunable values on boot

Change-Id: I9d2720947d615cab6a7ab9b596b24b8033dd0b4f

Settings: Add default value for display color control (2/2)

Change-Id: I50b684abe504c21ef49492f99b18873d75509697

settings: Move headset option, hide MoreDeviceSettings if empty

 * This option fits much better in the sound menu under "automation
   and effects", and on many devices it's the only option in the
   "More..." menu under Tap & Pay.
 * Move it, and remove the MoreDeviceSettings top-level category if
   there's nothing else in it.

Change-Id: Idd82f582a1ba54f8b45fbd4fbe631057e9515f86

Remove 'More device settings' menu

Change-Id: I86cd84f6f6c408b26c04d92529e9a031c4fed1f7

DisplayColor: Properly handle a minValue

* Previously setting anything as a minValue would cause the
  percentages to get out of whack. For instance, setting it to 35
  would cause the maximum percentage to climb above 100% as well
  as still allowing the value to be set lower than the min.
* This makes the maximum for the slider the max value minus the min
  (so we get the proper spread for min to max) and then adds the min
  back on before setting so we can't possibly go below the min.

Change-Id: I8dcdc422f54847940351fae10c74af6301d1e1be

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: I52cb990f36593b265a00b46a5f63590515822ea5

settings: Add support for SRE

 * Add support for sunlight readability enhancement
 * Optionally depends on adaptive backlight, depending on HAL

Change-Id: I9ca388ffd68080f0e497edb81d5f8616c194ea1d

Cleanup.

Now that button and keyboard backlight don't use the HW framework
anymore, there's no point in having an abstraction for a single use case.

Change-Id: Ib66b2a29a105d53e3ba4273abb06977b132c1fc8

Conflicts:
	proguard.flags
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

(cherry picked from commit bd01512c668092237c82d35022f67d9685e99ed2)

Conflicts:
	proguard.flags
	src/com/android/settings/DisplaySettings.java
Setting: add app move to external storage

Add support tp move APP to external storage.

Change-Id: I9d8fef2df2f36b4d8b611d8ffe87990407b44742

(cherry picked from commit 32c14c9192fb8819a9c18b5333a035957ccc3151)

(cherry picked from commit 718c1681dc45cc63b917aaeb48bda3e17fca1435)
fixed build

(cherry picked from commit ebf4231cd8a7766c16075d9a252dfe9d54d30605)
Settings: StatusBar Ticker (2/2)

PS: MIspeeliings.

Change-Id: I02cf9192c3ba62111a41e7da52cf4c343a589392
(cherry picked from commit 775589fe2798a2b61a3f7a3471bbeee35e271021)

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

(cherry picked from commit 22f56661054dcc53657ee4ed8e795fd29220720a)
Forward Port: Volume button seek on screen off [2/2]

Change-Id: I788fc4cfbb688d99de241991821ebf7e277d19ad
(cherry picked from commit c51efd121bfdf5db44310bc624dcae087ee18a06)

Conflicts:
	res/values/slim_strings.xml

(cherry picked from commit 8533412ad091c26b7210f12e4d2d5700f6c07e0c)
derp