Merge remote-tracking branch 'pa/jellybean-legacy' into pa-4.2

Also moved the CM port in the arrays.xml higher...I hope to end the merge
conflicts everytime I merge from upstream. This will probably be piecemeal
until it isn't.

Conflicts:
	res/values/arrays.xml

Change-Id: Ifd57facbf9def2f55c8bf8436e972c6378246292
Remove privacy guard fragment in onDestroyView

Change-Id: I61cebe273fa6fd514f18c86894acd176701148f6
String: refactor in prep for 4.3

Change-Id: I211aae2881789416eff973db15a5cfcf84db0345
Clean up: tabs to spaces

Change-Id: I160d02ba85cd55bb0c4d2061c185afc36e8e389a
Clean Up:  style fix

Change-Id: Ia9a370b8daa55b2ade9280183eb85d4746b62e09
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy

Conflicts:
	res/values/strings.xml

Change-Id: I4c22cfdb6f4b9ad834c0f9c0c14a7157fb47a7ea
Check if fragment transaction is empty before attempting to remove it

Change-Id: I08591c89559d33fee30ac2934fdbcc30637147da

PrivacyGuard fragment fix - change from empty check to isDestroyed check

Change-Id: I52fe44b7446cd16793df6ac9cdbe31e2ddd70210

PrivacyGuardManager: Reduce calls to getFragmentManager

Change-Id: I74f07a58b09cf0e9114d0c1c56e9a97d55ab0900
HALO Size (2/2)

Change-Id: I630991372504b152af9dfa063c78c115c79d8c83
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Port "Option to control cursor in text fields using volume keys (2/2)"

Change-Id: I8dad625fd0fa7c56111814ef6b950bd04f2460ae

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/language_settings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
settings: Add option to toggle the pointer icon when using stylus

Change-Id: Ib9c22ecb05cc698ead5bfffa34d2a2ffa9c21e13

Conflicts:
	res/values/strings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Fix NPE in Settings -> Language & input -> Default -> Setup input
methods

If the InputMethodAndLanguageSettings fragment is launched in IME-only
mode, it removes most preferences, so we need to null-check them before
use.

Change-Id: I297cc9c6885f62ed6ff65937ef5da401ab7cd271
JIRA:CYAN-896

Conflicts:
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Shorten clumsy and repetitive gesture strings

Change-Id: I77e4d980bcb2f2ed64169450e2de225d9ab3c079

Conflicts:
	res/values/cm_strings.xml
Show the "no action" summary for unitialized gesture values

Change-Id: I023ee587669103aa4d2a819af700ce3daa53695d
Call ParanoidOTA on system updates check

Change-Id: Ic4332fb223ef24b28a26b183a7e6b326a5bbb78c
Merge remote-tracking branch 'pa/jellybean-legacy' into HEAD

Conflicts:
	res/values/strings.xml

Change-Id: Ie0068edfd68df85370a8587029ec55b1bf67738f
Remove leftover PA string from the upstream strings file

Finally. I am glad they did this, a fine method. Custom Android world is
finally embracing domain-driven development.

Change-Id: Iad295bc8f18dcdee3aa3ad3f635024800b43f7b9
Merge commit '7d3a1ec' into pa-4.2

Conflicts:
	res/values/arrays.xml

Change-Id: Ic99371bf2ecb515dd5dd9d895bf061fb229877ac