Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Merge branch 'jb43' of github.com:ParanoidAndroid/android_packages_apps_Settings into jb43-legacy

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/deviceinfo/MiscFilesHandler.java
Apn settings fixes / code maintainence

Depends on : http://review.cyanogenmod.com/#change,13743

Cleanup unecessary resources and use global ones
  - This fixes the duplicate id issue currently causing apn's to be un-editable

Bring the ui aspect of the preference up to speed with ics
 - Use ics highlight / layout...etc
 - Use fragments

Patchset 5 : Remove theme for ApnEditor
             Use static access for variables
Patchset 6 : Launch apn editor internally as a fragment
	     Replace deprecated managedQuery with CursorLoader

Change-Id: I069415b29846f30665ce76e52f04115d1b65e455

Conflicts:
	AndroidManifest.xml
	res/layout/apn_preference_layout.xml
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ApnSettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/profiles/ProfilesPreference.java

Updated with CM10.2 source!
Add missing resources

Change-Id: I23ced72877f509878c862d51cf21a6e738dc9e5c
Fix app ops details not displaying permissions under certain conditions.

If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.

Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
appops first draft

Change-Id: Idf8772ae4926ba064391749d72c3b47884ee27d2
Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jb43-legacy
suÃper derp

Change-Id: I1d6481705e3649296c7c8ac39eef182299e7d61e
ForwardPort: Nfc Polling Mode
Add preference for enabling root access (3/3)

 * Root over ADB is now disabled by default on non-eng builds
 * Requires support in su binary and adbd
 * Root access can be configured to use ADB only, apps only, or all

Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23

Conflicts:
	res/values/arrays.xml
	src/com/android/settings/DevelopmentSettings.java
optional encryption password sync

Option to use 2 different tokens for encryption and locking.
Allows convenient usage and strong encryption at the same time.

Inspired by reading next:
https://santoku-linux.com/howto/mobile-forensics/how-to-brute-force-android-encryption

Related discussion:
http://code.google.com/p/android/issues/detail?id=29468

Change-Id: I71a31e7a04b84910d5be317e6f531c41d7ad002f
Increasing ring volume

Change-Id: I97ba5d6f70e670b67888dc73167b9bdc8557ea9f
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SoundSettings.java
Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jb43-legacy

Conflicts:
	res/values/arrays.xml

Change-Id: Ifdf0009cf26d6c25737fd36f245c3dc73729297d
Merge branch 'jb43-legacy' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into HEAD

Conflicts:
	res/values/pa_strings.xml

Change-Id: I6ea610c7d4fbf637ff051ecaf8bc8ea244e079e2