wifi: forward port avoid poor connection setting

Change-Id: I22d0866e2c5d9b7f119b7ad42cc66e78bfd6ada0
 [2/2] Left handed navbar during landscape mode

original author @https://github.com/shuhaowu
fixup "wifi: forward port avoid poor connection setting"

Change-Id: I3545e874bd6519a586744fc36297f7f3f3cb1f42
Settings: fix NPE in ButtonSettings

Change-Id: Ib2ab4d7d5ed3aaceeba8fe942b7a29cd01f003fb

Conflicts:
	src/com/android/settings/ButtonSettings.java
Lowercase to uppercase

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

Change-Id: I2e8b7f606a0c82bc448a07a28829203c96e1d5a3
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'

authored by@ https://github.com/kalaker
[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>

Conflicts:
	res/values/cm_strings.xml
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

Conflicts:
	res/values/cm_colors.xml
	res/values/cm_strings.xml
	res/values/config.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Forward port button/keyboard backlight options

Change-Id: Ica02fad15392201b719144c4b911407d5b370cee

Conflicts:
	res/xml/button_settings.xml
	src/com/android/settings/ButtonSettings.java
Development settings: Checkboxes to switches

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

authored by @https://github.com/mikeNG
Clean up