Koush Superuser 4
Add direct launcher prefs access to home settings fragment.

Also move it up to interface, as it was placed there in previous CM
versions as well.

Change-Id: I55ef7e56be9e59f966da73f839b531b3c74c7a90

Conflicts:
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
Settings: Don't hide home category if user has a settings capable launcher

By default the settings app hides the home category if it notices the user
has 1 launcher. Due to the ability to have settings per launcher, if the
user only has one launcher which happens to support settings, hiding this
category renders that feature useless.

So now we check if the user has < 2 launchers AND whether they support
a settings panel.

Change-Id: Id5dd94091a31fd9ee3637e0975816481903255bf
Settings: Hide Development settings when it is turned off

This commit hides the Development and Performance settings items
when the user turns off Development settings. This sets things back
to tapping x number of times on the build number to once again enable
developer settings

Change-Id: I6003f73f5abee54bb000f01757ecffe7b68dba59

Settings: Make Perf settings act just like dev setting - start hidden

The Performance settings should not show until the owner of the
device enables development options, guest users should not be able
to turn it on.

Change-Id: Ib08d29bfd92ad44c71d02c115e12064ddf4704e0

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Development Settings: fix setting reset on disable

When Development Settings are disabled, some settings are
reset to values other than the default. This fixes it.

 - No need to have resetAdvancedReboot(), as it is already
   reset by the "unckeck all checkboxes" logic.

 - Adb notify should reset to enabled

 - Verify apps over usb should reset to enabled

Change-Id: If5d88d220d2a17d6e172b2f54facd4afa3bae904

Conflicts:
	src/com/android/settings/DevelopmentSettings.java

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Settings: Add missing up navigation in menus

Squashed forward port from cm-10.2

Change-Id: Ia9d51b53df8a3eb4c1b9dee1aeefb0b74eac0fde

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/profiles/NFCProfileWriter.java
Merge branch 'kk-ras-mr1.2_r2' of https://github.com/rascarlo/android_packages_apps_settings into kk
Revert "Settings: Integrate Voice+ into Settings (1/2)"

This reverts commit c34cad8424178217c69ad0dee59602c5fe2eed10.

Conflicts:
	res/values/ras_strings.xml
settings: Enable location mode header switch

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

Conflicts:
	src/com/android/settings/Settings.java
Settings : Switch state fix

Since the switch views are shared, we need to recreate them
in order to prevent from being reused as they don't share state.

Change-Id: I4d7038f37883e1791c8c2b0009f0adb85ebb2b88
Fix the icon size in app lists.

E.g. the "Select app" dialog in the profile group configuration uses
this layout to inflate the list dialog. However app icons can have
non-standard sizes so we enforce a consistent width and height.

Change-Id: I71731a9bb3548c699cc2e0e600a5ff371ceacbc3
Storage Settings: Allow user to trigger a volume rescan

This change allows to trigger a rescan of a volume with the next restrictions:
- Internal volumes if they are emulates
- Primary volumes
- Non-Removable volumes

Ported from: http://review.cyanogenmod.org/44586

Change-Id: I7e75a324938d8081fd715f702d50f1fdceabd96d

Conflicts:
	res/values/cm_strings.xml
Revert "Revert "Navigation bar buttons customization""

This reverts commit 1b56304c9d738149bddadedaaa1375ed4a7d97df.
Use holo alert drawable for nav bar editor
'When to daydream' dialog does not follow the JB dialog design guide

The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.

Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b