init
AppDetail: Allow installed apps to be disabled

* Users can disable regularly installed apps.
While disabled, the app can be uninstalled or enabled again.

* When disabling an app (user or system), force close the
application.

* System apps can be disabled, or installed updates can be uninstalled.
Previous behavior only allowed updates to be uninstalled,
then be disabled.
Merge remote-tracking branch 'upstream/jellybean' into jellybean

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java
fix build
Merge remote-tracking branch 'upstream/jellybean' into jellybean
Storage Settings: Allow user to trigger a volume rescan
Lock screen: Hide initial pages hints feature (2/2)
LockSreen: Fix build
Remove Lockscreen shortcuts(1/2)
Settings: Forward port Slider shortcuts

Includes Change I683d9c22: Add the new lockscreen drawables to the
picker list by Bjorn Lunden (blunden)

Settings : Lockscreen targets alignment fix

Add separate layouts for different layouts to fix alignment issues.

Change-Id: I2453225e8a683244a1e11f0a8d3c18954ba5885f

Change-Id: I155824abc0578d98d3e2f1f5c2dcde3fa7b2ef84

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/settings_headers.xml
Revert "LockSreen: Fix build"

This reverts commit 6146d7694fdb0758c081b08805c032c5161f34f1.
Revert "Lock screen: Hide initial pages hints feature (2/2)"

This reverts commit 875f6e6f64d763d13e28e308cb3bc37fa617a049.
paranoid style
Lock screen: Hide initial pages hints feature (2/2)

This reverts commit 11876b25604d9c12c096149f13d560c825d4b7ac.
LockSreen: Fix build

This reverts commit 6dfd6a66fe90c878b5a3abe361f84561c26fa735.
fix build
Merge remote-tracking branch 'upstream/jellybean' into jellybean

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SecuritySettings.java
fix missing strings
fix missing strings
Merge branch 'jellybean' of github.com:ParanoidKang/android_packages_apps_Settings into jellybean