Settings: fix NPE in ButtonSettings

Change-Id: Ib2ab4d7d5ed3aaceeba8fe942b7a29cd01f003fb
Merge remote-tracking branch 'cm/cm-12.0' into HEAD
Settings: Gesture Lockscreen (2/2)

Changes needed for lollipop

Change-Id: Icf2f5a5cd3474ea325097437bc2956c10e2ae9d7
Gesture panel [1/2]

This includes shortcut picker addition from cm author: Danesh
https://github.com/VanirAOSP/packages_apps_Settings/commit/ed26d12ca6c8b025810b91e4a4fd6010df2d71e0

This adds a gesture panel to launch custom actions.  The panel can be
opened from the navbar or quicksettings panel.  Hardware key binding
support will be added next

Squashed commit of the following:

commit 5c3c770ce764c81d2e8b07c5c621d58d879c88ff
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Thu Aug 28 22:32:33 2014 -0400

    hide gesture menu.. it's accessible from the gesture panel now

    Change-Id: Id39b0f7bc67ebf46c6e1c7f83c746dec327afcb2

commit 7fd93ce683b136941c6a407180d905889792b4c1
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Tue Aug 26 18:29:49 2014 -0400

    QS: add Gesture panel tile

    Change-Id: I6ecb534815198204467f0bb8020640a5727b7ba5

commit b156a65dacb9579e4d588e2f870abfe3b111e9c7
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Mon Aug 25 22:26:14 2014 -0400

    Add gesture panel support

    currently only used for the navbar, will be moved to vanir actions and
    made into a QS tile and as a bindable action for hardware button devices.

    Thanks to chameleonOS for the gesture activity creater code this is based on

    Change-Id: Iacd509fa337d67b652b13ee6bc3b26ec1686c02a

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	res/values/colors.xml
	res/values/vanir_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/cyanogenmod/SystemUiSettings.java
	src/com/android/settings/quicksettings/QuickSettingsUtil.java

Conflicts:
	AndroidManifest.xml
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/androidx/HomeButtonSettings.java

Change-Id: Ia4bbe4128c51768e52d94d2fd9c5db6df9884f84

Conflicts:
	AndroidManifest.xml
Lowercase to uppercase

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

Change-Id: I2e8b7f606a0c82bc448a07a28829203c96e1d5a3
Merge branch 'cm' into HEAD
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
Keydisabler: fix button light restore logic

Do not assign default button brightness if backup key is not found.
Instead do nothing. This will prevent brightness being reset to default
on boot when navbar is disabled.

If backup key is not found when actually toggling navbar then we've got
bigger problems.

Change-Id: I649bf1480a42f2cbe94d0a47a0c6055c934b4f56
Fix exception being thrown if CMHW is not installed.

Happens during debugging when mmp'ing the app.

Change-Id: Ief84a812696ef3f2515701790f96649cbde0f7d9
Settings: Change 'Model Number' to 'Model Name'

Most devices have the Model Number set to something like 'One' rather
than 'PN072', therefore they are using the Model Name not the Model
Number. Therefore, either every device should update to properly refer
to the Model Number, or we should update Settings to correctly state
that it is the Model Name.

Change-Id: I70981d3a46e7a7e26f4bfcb6c5d768a00314e3b9
[2/2] Forward port power connect/disconnect notification support

Original commit info:

    [2/2] Power connect/disconnect notification support

    part 1/2: frameworks/base PowerUI and Settings
    http://review.cyanogenmod.org/#/c/35241/

    part 2/2: packages/apps/Settings Sound settings
    http://review.cyanogenmod.org/#/c/35242/

    Change-Id: I7ddd8a47ae4f9a62c586023d151ac42bbe8424c7

    Power sound notifications: fix ringtone picker title

    Change-Id: Ied0a08ec1607b778324e69a7b40bac056235bebf

    Settings: Rename 'Power sounds' to 'Charging sounds' and add summary

    VOld_Change-Id: I1cb872917e2d03f0a1c77c25c27f2a0496f9bc05

Old_Change-Id: Ibde52fcd6fd0fabc9eeefc7e6f5a3971527285d7

Change-Id: If247c184c5ea2a1e13dd22ef121cbc9d5d542fd5
Signed-off-by: STELIX <ssspinni@gmail.com>
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

Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12

Settings: Start service as explicit intent

Needed for API level 21. Add some ressource bits, set text color to
white.

Change-Id: I9c4a9139be69fa5c6d6c74055b5475f0d930c93a
Forward port button/keyboard backlight options

Change-Id: Ica02fad15392201b719144c4b911407d5b370cee
Development settings: Checkboxes to switches

Change-Id: I6f323e43d3c6c90052d6c364d5859812e15ca0d4
Settings: Move quickboot preference under advanced reboot

Change-Id: I8739768cdef9a8d2b07769bba15356de567ac114
Forward port 'Swap volume buttons' (3/3)

Change-Id: I44a2b37b95848fff24c53c4c3561a3c000c487a1
Settings : date and Time - Checkbox --> Switches

Changes Date & Time Settings from checkboxes to on/off switches, as
recommended: http://developer.android.com/design/building-blocks/switches.html
This also adds some more design consistency.

Change-Id: I1e7848ae46859161f45a3a952e5a8d06ad52a023
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: I1c4e9bfa59c90146ffd77d5d5dcdc894af3fd7bc
Merge branch 'L5' of https://github.com/VanirAOSP/packages_apps_Settings into HEAD

Conflicts:
	AndroidManifest.xml
	res/layout/gesture_create_gestures.xml
	res/layout/gesture_gestures_item.xml
	res/layout/gesture_gestures_list.xml
	res/values/cm_strings.xml
	res/values/vanir_dimens.xml
	res/values/vanir_strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/ButtonSettings.java
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/notification/OtherSoundSettings.java
	src/com/android/settings/vanir/gesturepanel/CreateGestureActivity.java
	src/com/android/settings/vanir/gesturepanel/GestureBuilderActivity.java