Fix typo.

Change-Id: I9c69b1c9b3b739a1fd9e1fab28ed8fa6b2880476
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Merge remote-tracking branch 'PA-settings/kitkat' into kitkat
Settings: Added cpu info and memory info to About Phone Settings

This is pulled from gingerbread. No code looked like it needed to
be re-done. This contains code from the following two commits.

shafty023<gameboy45@gmail.com>:
http://review.cyanogenmod.com/#change,1774

Keyan Mobli<persiansown@gmail.com>:
http://review.cyanogenmod.com/#change,1820

Patchset 2: Fix string constants
Patchset 3:
- Moved file paths to string constants
- Check for meminfo and cpuinfo files, if bad don't show preference
Patchset 4:
- Created variables for each operation.
- Wrote Long to print -1.
Patchset 5:
- Simplified and refactored
Patchset 6:
- Fix authorship herp derp
Patchset 7:
- Show only total memory, available memory would probably cause users to
  kill apps en masse.

Change-Id: Ib0550a5af515ae3a48481412c5c9c504cd80b743

Conflicts:
	res/values/strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
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
[2/2] settings: add CPU info overlay

this shows
CPU temp (if available)
for every core governor + online + freq

Change-Id: I28c1e48c2e613b33c301b61cead70678ab6a2e9b

Conflicts:
	res/values/custom_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/DevelopmentSettings.java
Forward port Quiet Hours settings

Change-Id: I57ad089a2b2f7d6ed3df773ca69ad67f7b8fe185

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SoundSettings.java

Conflicts:
	res/values/strings.xml
Display options: allow configuration of wake on plug behavior (1/2)

Adds a global setting to the Display section to enable or disable wake-on-plug.
Default is disabled.  When enabled, the device will wake when the charger
is connected or disconnected.  When disabled, the device's wake state
will be left alone.

PS 2: Change wording of setting per DvT's recommendation

PS 3: Pull default value of setting from config.xml

PS 4: Reduce scope of variable

PS 5,6: Rebase

Cherry-picked from: I779a4aa4feeca87879c932be6e1fa032e4b4afc8

Change-Id: I106b7d901a788c19e08454d6231daebf3ff4872c

	modified:   res/values/pa_strings.xml
	modified:   res/xml/tool_bar_settings.xml
	modified:   src/com/android/settings/paranoid/Toolbar.java

https://github.com/CarbonDev/android_packages_apps_CarbonFibers/commit/7b5585fb371419a33d7ea52d3e39faf4ff79a9f3#L2R122

Conflicts:
	res/xml/tool_bar_settings.xml
	src/com/android/settings/paranoid/Toolbar.java
Custom Carrier Label (2/2)

Change-Id: Ib9af0419bfcbe9285ecc47770fb0504518d1d344

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	src/com/android/settings/DisplaySettings.java
[2/3] settings: add support for adb over network

PS6:
rebased to solve merge conflict

PS7:
now its correct

Change-Id: Ibc577c36e4f3dec348da11ae5603e6406db6571c

Conflicts:
	res/values/custom_strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java

Conflicts:
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Remove this line
Revert "Forward port Quiet Hours settings"

This reverts commit da6fd11399227268d5ce10867b79c64942145659.

Conflicts:
	res/values/pa_strings.xml
Remove this code

This has nothing to do for the performance settings
Revert "Custom Carrier Label (2/2)"

This reverts commit 31f48ad8d61e26b07b135b6c482c760836a6ee50.

Conflicts:
	res/values/pa_strings.xml
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:
	Android.mk
	proguard.flags

Conflicts:
	Android.mk
Fix scrollbars appearing out of place in Superuser.

Change-Id: Ia206623716192e479901c02cf94de84a29e0479e
appLists: set height and width for app icon

due that the app icons on a lot apps are a mess now and not consistent
due of changes in kitkat let us set them for dialogs to our fixed
36dp value which was a good value in the past for all app icons
in settings

Change-Id: I00cab4aa4ded517ef63a193b58a03138abd355d8
Settings: Wi-Fi country code

Change-Id: I8a078bde0ab40818784635477eb466510a1c230e

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
Settings: safe headset volume option (2 of 2)

Implemented for PA

Original commit: https://github.com/SlimRoms/packages_apps_Settings/commit/d4d016010e1ff66bbbd96d30b09ed38599b2ebcc

Thanks to kufikugel