Settings: Forward port Performance settings

Change-Id: Ib510b35fc2763c6942737afa33873aa5d349a173

Performance settings: remove dithering setting

This setting has no effect in CM10.2, as SurfaceFlinger has now been
taught to automatically Do The Right Thing [tm] with regards to deciding
when to enable surface dithering.

Change-Id: I67fba732440507c1209f2793d826badd4b4d34d5

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
Settings: Forward port Change behavior when back pressed in PerformanceSettings

When back key pressed, finish this activity if user does NOT accept 'Ok'
in warning dialog rather than show it.
Id: Ied763db4f76a3a2a36f134bd93a0f18047c6cf5c

Change-Id: I07d41d43d00e4fb42ad526d27ee9188d830906ea
Settings: Fix aapt locale set

This allow to display Settings in other language other than default

Change-Id: Ie0d94a85b6b3f26cad853298b911c7fece0a1247
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:

	Android.mk
Merge branch 'kitkat' of github.com:AOSPA/android_packages_apps_Settings into kitkat
Settings: add Advanced menu for device-specific settings app

Change-Id: Ib022a224fe71522eb2432a112d2bdf64bc08c926
Merge branch 'kitkat' of github.com:AOSPA/android_packages_apps_Settings into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
Update proguard.flags

Change-Id: Ic65261680797422f092768e6d68d3aef7aaf4612
Volume rocker: Option to control cursor in text fields (2/2)

* Added also custom pa_arrays xml.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

PS2:

* Make it indipendent from disable full screen option, now hardcoded.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

PS3:

* Better strings and category title, just additional settings.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Change-Id: I53f5f21f9d8e23a7cf256085515cf22e34d64c50

Conflicts:

	res/values/pa_strings.xml
Hide Performance settings til Developer options are visible

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

Conflicts:
	res/values/pa_strings.xml

Change-Id: Ic55d91b8f718bf2e83297865278b2982b788183f
Stylus gestures features (2/2)

Change-Id: If4fa001a124874b3264ea1980e846e1ab9de50e8
inputmethod: Fixup remove stylus preference for non stylus devices
This commit included following changes

 * Move show stylus icon checkbox to Pointer Settings Category
 * Fixup issues stylus preference doesn't remove if not supported
 * Improve the code remove stylus preference if not supported
 * Remove an unnecessary variable introduced on http://review.cyanogenmod.org/#/c/33774/

Change-Id: Ic83715bab9cd51f5b6e2ad3206b504fb908bebf1
Merge remote-tracking branch 'aospa/kitkat' into kitkat

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml

Change-Id: I32458ba0c0b1547f4fdea9ad5dded33c272aad9b
Bluetooth: Set isPreferred to true for PanProfile Connections.

isPreferred is always true for PAN profile so that DUT can
initiate connection with remote device. Curretnly we are
returning true only when pan profile is in connected, so
it will return false when pan profile is not connected and
will never initiate connection on click.

Change-Id: I7c789add73ca944d074b0ecd8af223f6d61b547a
CRs-fixed: 463887
(cherry picked from commit ca3988a7394eb189835647a5aaa04707fe5c2517)
(cherry picked from commit ea5ce47bf7b918affc66467adf4e38b1c870e86f)
(cherry picked from commit 2a3bfb2ed0102de6aa6e659ee7714ce8fcec25cd)
Bluetooth: Handle pairing Cancel intent.

Receive Pairing cancel intent and clear pairing request
from notification window.

CRs-fixed: 463362

Change-Id: I63c9299edca4356485f26cbc6332e3be9bdfbf17
(cherry picked from commit fc82c5a6a3e74aeba6139e0ccf48f634fd970e62)
(cherry picked from commit dc299471edd42a5b30c0f54ef8d33730e33d03a3)
(cherry picked from commit 32f973cbe79d2474d0815d7dd90c6960af120b3c)
Bluetooth: Security: Add Null check during pairing cancel intent.

Added null check, so before posing event we can restrict events,
if cached device list is empty

Change-Id: I458d181abe5eec2497b80b1713ddbc3502b79786
CRs-Fixed: 546364
(cherry picked from commit 7d7222c3e5c1054b4e2f3e59cc40cb182a72b040)
(cherry picked from commit 8ce523155dd030d82c32cf502d317023b017645b)
(cherry picked from commit 938686e749bca911e5f63150223116d1c381da8e)