Reset Pattern:
 - If user cancels while creating new pattern, old pattern is restored

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
settings: Auto-brightness levels shouldn't fill the screen

On tall displays this ends up with a lot of useless padding
in the list.

Change-Id: I998b86ec12d531cf1db08db7d9c23d12d8641730
Themes: Allow changing theme to Holo.Light without crashing

Themes that attempt to change the settings theme's parent to
Holo.Light will end up crashing wifi settings.

Themers should override Theme.Settings.Base and leave Theme.Settings.Holo
alone.  Attempting to theme Theme.Settings.Holo will result in crashes
when accessing wifi settings.

This was patch was adapted from
https://github.com/tung91/android_packages_apps_Settings/commit/007f03b559c6d13115c63c4f601ebc4b9324d32d

Change-Id: I61951b892acac6304d2c3dd02668eb70af93eef9

Conflicts:
	res/values/themes.xml
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
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
Change "Stay Awake" description to match behavior

Stay awake acts on "plugged in" state, not "charging" state.  Update description to accurately reflect this behavior.

Change-Id: Ibad7eb8b465f31d1b6d835348eb23962657fd892
Fix translatability of modified dev countdown strings

Change-Id: I3bc1749e27068a63144fd4f3b059396344e7858d
Fix translatability of modified ADB strings

Change-Id: If16467496ff2d44c3f75574d4bfbb117d6d12692
Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_packages_apps_Settings into HEAD

Conflicts:
	res/values/themes.xml
	res/xml/development_prefs.xml