Show statusbar in expanded desktop [2/2]
Credit CM

Conflicts:
	res/values/ldroid_arrays.xml
	res/values/ldroid_strings.xml
	res/xml/statusbar_settings.xml
	src/com/android/settings/ldroid/StatusBarSettings.java
Move halo blacklist box to the button
	modified:   res/layout/blacklist_dialog.xml
	modified:   res/layout/installed_app_details.xml
	modified:   res/values/liquid_strings.xml
	modified:   src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:
	res/layout/blacklist_dialog.xml
Squash Hover Improvements

Master Switch
Option To Disable Notification drawer Icon
Options to exclude non-clearable and low priority notification

Conflicts:
	res/xml/liquid_interface_settings.xml
Settings: Add CM Profiles (2/2)

Autor:    Danny Baumann <dannybaumann@web.de>

	modified:   AndroidManifest.xml
	new file:   res/drawable-hdpi/ic_location.png
	new file:   res/drawable-hdpi/ic_menu_add.png
	new file:   res/drawable-hdpi/ic_menu_nfc_writer_dark.png
	new file:   res/drawable-hdpi/ic_menu_trash_holo_dark.png
	new file:   res/drawable-hdpi/ic_settings_profiles.png
	new file:   res/drawable-hdpi/nfc_writer.png
	new file:   res/drawable-mdpi/ic_location.png
	new file:   res/drawable-mdpi/ic_menu_add.png
	new file:   res/drawable-mdpi/ic_menu_trash_holo_dark.png
	new file:   res/drawable-mdpi/ic_settings_profiles.png
	new file:   res/drawable-xhdpi/ic_location.png
	new file:   res/drawable-xhdpi/ic_menu_add.png
	new file:   res/drawable-xhdpi/ic_menu_nfc_writer_dark.png
	new file:   res/drawable-xhdpi/ic_menu_trash_holo_dark.png
	new file:   res/drawable-xhdpi/ic_settings_profiles.png
	new file:   res/drawable-xhdpi/nfc_writer.png
	new file:   res/layout/nfc_select.xml
	new file:   res/layout/nfc_writer.xml
	new file:   res/layout/preference_name.xml
	new file:   res/layout/preference_profiles.xml
	new file:   res/layout/preference_streamvolume.xml
	new file:   res/layout/profile_name_dialog.xml
	new file:   res/layout/profile_tabs.xml
	modified:   res/values/kang_arrays.xml
	modified:   res/values/kang_strings.xml
	modified:   res/values/styles.xml
	modified:   res/xml/additional_settings.xml
	new file:   res/xml/appgroup_list.xml
	new file:   res/xml/application_list.xml
	new file:   res/xml/profile_config.xml
	new file:   res/xml/profile_settings.xml
	new file:   res/xml/profiles_settings.xml
	modified:   res/xml/recent_panel_settings.xml
	modified:   res/xml/settings_headers.xml
	modified:   src/com/android/settings/Settings.java
	modified:   src/com/android/settings/Utils.java
	new file:   src/com/android/settings/profiles/AbstractTriggerPreference.java
	new file:   src/com/android/settings/profiles/AppGroupConfig.java
	new file:   src/com/android/settings/profiles/AppGroupList.java
	new file:   src/com/android/settings/profiles/ApplicationItemPreference.java
	new file:   src/com/android/settings/profiles/BluetoothTriggerPreference.java
	new file:   src/com/android/settings/profiles/NFCProfile.java
	new file:   src/com/android/settings/profiles/NFCProfileSelect.java
	new file:   src/com/android/settings/profiles/NFCProfileUtils.java
	new file:   src/com/android/settings/profiles/NFCProfileWriter.java
	new file:   src/com/android/settings/profiles/NamePreference.java
	new file:   src/com/android/settings/profiles/ProfileAirplaneModePreference.java
	new file:   src/com/android/settings/profiles/ProfileConfig.java
	new file:   src/com/android/settings/profiles/ProfileConnectionPreference.java
	new file:   src/com/android/settings/profiles/ProfileEnabler.java
	new file:   src/com/android/settings/profiles/ProfileGroupConfig.java
	new file:   src/com/android/settings/profiles/ProfileRingModePreference.java
	new file:   src/com/android/settings/profiles/ProfileRingtonePreference.java
	new file:   src/com/android/settings/profiles/ProfilesList.java
	new file:   src/com/android/settings/profiles/ProfilesPreference.java
	new file:   src/com/android/settings/profiles/ProfilesSettings.java
	new file:   src/com/android/settings/profiles/StreamVolumePreference.java
	new file:   src/com/android/settings/profiles/TriggersFragment.java
	new file:   src/com/android/settings/profiles/WifiTriggerAPPreference.java

Change-Id: I049eaf5deccc1bf173d4625a295c332c8abe45df

Conflicts:
	res/layout/liquid_logo_row.xml
	res/values/kang_arrays.xml
	res/values/kang_strings.xml
	res/xml/recent_panel_settings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java

Conflicts:
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
Add Profiles to SlimActions

Change-Id: Ia0848b16baad69c7e5f388291e70e4419c416e47

Conflicts:
	res/values-de/slim_strings.xml
QuickSettings: Added ProfileTile [2/2]

see frameworks commit for details

Patchset 2:
  using blunden's png resource
  making ProfileSettings reachable from the outside

Patchset 3:
  The profile tile should not be available if profiles are turned off

Side rant: I really hate manifest cleanups. i would wish for our
settings not beeing such a mess and comply with fragments properly.

Change-Id: I3e7bcce4b5f54b9bed065780779c9946a73936be

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/liquid/quicksettings/QuickSettingsUtil.java

Conflicts:
	src/com/android/settings/ldroid/quicksettings/QuickSettingsUtil.java
Fix Up Hover Title

Conflicts:
	src/com/android/settings/Settings.java
Fix
Revert "Settings: Add an option to reset custom user preferences"

This reverts commit d68562aca58cd8edfab1563fd4aca08c5194c8e5.
Revert "On-the-spot preferences"

This reverts commit b3cad19ee1553a76e1e4d0e5cfb7d2617551dab8.
Revert "Revert "On-the-spot preferences""

This reverts commit 73c5ac61bd7f37d300e94dda332a81de313823bc.
Revert "Revert "Settings: Add an option to reset custom user preferences""

This reverts commit 1651fbe5f021c994f77ff57108ac0c2b2e8e5ecd.
Fix up Hover
Custom lockscreen wallpaper [2/2]

Based on commit of ParanoidAndroid on android 4.3

Lockscreen wallpaper: show error if cropping not supported

Custom wallpaper: use PNG

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/ldroid_strings.xml
	src/com/android/settings/ldroid/LockscreenInterface.java
	src/com/android/settings/ldroid/LockscreenStyle.java
Move lockscreen wallpapers back to lockscreen style