Lockscreen Notifications: Disable "Pocket Mode" by default
Merge remote-tracking branch 'settings/kitkat-staging' into kitkat
DevSettings: Translations for .25x & .75x animation speeds

translations for https://gerrit.paranoidandroid.co/#/c/4341/

 *thanks to Kufikugel

Change-Id: Ie25c1879ac6a2688083ec05c322875964f462c47
Signed-off-by: houst0nn <houstonn@gmail.com>
Merge remote-tracking branch 'settings/kitkat-staging' into kitkat
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

Conflicts:
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Automatic Translation Import

Change-Id: I02e2c6e4422b6471b5d5297e687e7c7d4b8b7b90
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging
Merge remote-tracking branch 'settings/kitkat-staging' into kitkat
Revert "Lockscreen Notifications: Disable "Pocket Mode" by default"

This reverts commit 4fdb3a370c1d422f54e088127614d0d8d656df14.
Rambar settings: Set proper default color for active apps
Security: LockscreenWallpaper: Dirty trace of old setting location

Moved to Theme Engine, burn this derp.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Settings: remove auto_brightness_adjustment_title string

The controls which used this string were removed.

Change-Id: Ia1b2aa93f2beea27c17546e293b9aa7c2aa62931
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Settings: Add HeadsUp setting.

Change-Id: Ib7a59145843bedb16aacc87bf6d3c6da143e8d3e

PS2: addition menu drawable

dresadd09691@gmail.com

Conflicts:
	res/values/cm_strings.xml
	res/xml/notification_drawer.xml
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Settings: Allow All Widgets On Keyguard (2/2)

Another user request with zero device impact
	for daily usage, so I went ahead and
	did it.

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

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
Merge "DevSettings: Translations for .25x & .75x animation speeds" into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

Conflicts:
	res/values-af/arrays.xml
	res/values-am/arrays.xml
	res/values-ar/arrays.xml
	res/values-es-rUS/arrays.xml
	res/values-et/arrays.xml
	res/values-fa/arrays.xml
	res/values-hu/arrays.xml
	res/values-iw/arrays.xml
	res/values-pt-rPT/arrays.xml
	res/values-pt/arrays.xml
	res/values-ru/arrays.xml
	res/values-sw/arrays.xml
	res/values-th/arrays.xml
	res/values-zu/arrays.xml
	res/xml/security_settings_pin.xml