fixes for the cherrypicks+ more

...

 Changes to be committed:
	modified:   AndroidManifest.xml
	new file:   res/drawable-hdpi/ic_navigation_ring_hint_activated.png
	new file:   res/drawable-hdpi/ic_navigation_ring_hint_normal.png
	new file:   res/drawable-hdpi/ic_purity_trds.png
	new file:   res/drawable-hdpi/ic_settings_nav_bar_glow.png
	new file:   res/drawable-hdpi/ic_settings_purity.png
	new file:   res/drawable-mdpi/ic_navigation_ring_hint_activated.png
	new file:   res/drawable-mdpi/ic_navigation_ring_hint_normal.png
	new file:   res/drawable-mdpi/ic_purity_trds.png
	new file:   res/drawable-mdpi/ic_settings_nav_bar_glow.png
	new file:   res/drawable-xhdpi/ic_navigation_ring_hint_activated.png
	new file:   res/drawable-xhdpi/ic_navigation_ring_hint_normal.png
	new file:   res/drawable-xhdpi/ic_purity_trds.png
	new file:   res/drawable-xhdpi/ic_settings_nav_bar_glow.png
	new file:   res/drawable-xhdpi/ic_settings_purity.png
	new file:   res/drawable/ic_navigation_ring_hint.xml
	new file:   res/drawable/navbar_search_outerring.xml
	new file:   res/layout-land/dialog_light_settings.xml
	new file:   res/layout-land/navigation_ring_targets.xml
	new file:   res/layout-sw600dp-land/navigation_ring_targets.xml
	new file:   res/layout-sw600dp/navigation_ring_targets.xml
	modified:   res/layout/dialog_light_settings.xml
	new file:   res/layout/navigation_ring_targets.xml
	modified:   res/layout/preference_application_light.xml
	modified:   res/layout/preference_dialog_ringervolume.xml
	modified:   res/values-sw600dp/dimens.xml
	modified:   res/values/arrays.xml
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
	modified:   res/xml/device_info_settings.xml
	new file:   res/xml/display_rotation.xml
	modified:   res/xml/display_settings.xml
	modified:   res/xml/language_settings.xml
	modified:   res/xml/lockscreen_interface_settings.xml
	new file:   res/xml/nav_control.xml
	modified:   res/xml/security_settings.xml
	new file:   res/xml/security_settings_cyanogenmod.xml
	modified:   res/xml/security_settings_pattern.xml
	new file:   res/xml/security_settings_slide_delay_cyanogenmod.xml
	modified:   res/xml/settings_headers.xml
	modified:   res/xml/status_bar.xml
	modified:   res/xml/system_settings.xml
	modified:   src/com/android/settings/DataUsageSummary.java
	modified:   src/com/android/settings/DateTimeSettings.java
	modified:   src/com/android/settings/DisplaySettings.java
	modified:   src/com/android/settings/RingerVolumePreference.java
	modified:   src/com/android/settings/SecuritySettings.java
	modified:   src/com/android/settings/Settings.java
	modified:   src/com/android/settings/Utils.java
	modified:   src/com/android/settings/accounts/AccountSyncSettings.java
	modified:   src/com/android/settings/applications/ManageApplications.java
	new file:   src/com/android/settings/cyanogenmod/ColorPickerDialog.java
	new file:   src/com/android/settings/cyanogenmod/DisplayRotation.java
	modified:   src/com/android/settings/cyanogenmod/LockscreenInterface.java
	new file:   src/com/android/settings/cyanogenmod/NavControl.java
	new file:   src/com/android/settings/cyanogenmod/NavRing.java
	new file:   src/com/android/settings/cyanogenmod/SeekBarPreference.java
	modified:   src/com/android/settings/cyanogenmod/StatusBar.java
	new file:   src/com/android/settings/cyanogenmod/TRDSEnabler.java
	modified:   src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
	modified:   src/com/android/settings/notificationlight/AlphaPatternDrawable.java
	modified:   src/com/android/settings/notificationlight/ApplicationLightPreference.java
	modified:   src/com/android/settings/notificationlight/ColorPickerView.java
	modified:   src/com/android/settings/notificationlight/LightSettingsDialog.java
	modified:   src/com/android/settings/notificationlight/NotificationLightSettings.java
	modified:   src/com/android/settings/wifi/WifiEnabler.java
	modified:   src/com/android/settings/wifi/WifiSettings.java
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:
	Android.mk
	proguard.flags

 Changes to be committed:

	modified:   Android.mk
	modified:   AndroidManifest.xml
	modified:   proguard.flags
	modified:   res/values/strings.xml
	modified:   res/xml/settings_headers.xml
	new file:   src/com/android/settings/cyanogenmod/superuser/MultitaskSuRequestActivity.java
	new file:   src/com/android/settings/cyanogenmod/superuser/NotifyActivity.java
	new file:   src/com/android/settings/cyanogenmod/superuser/PolicyNativeFragment.java
	new file:   src/com/android/settings/cyanogenmod/superuser/RequestActivity.java
	new file:   src/com/android/settings/cyanogenmod/superuser/SuReceiver.java
fixes for cherry-picks, bring back crossbones cpu and gpu settings.

...

 Changes to be committed:
	modified:   AndroidManifest.xml
	modified:   proguard.flags
	deleted:    res/drawable-hdpi/ic_purity_trds.png
	new file:   res/drawable-hdpi/ic_raumzero_trds.png
	new file:   res/drawable-hdpi/ic_settings_cpu.png
	deleted:    res/drawable-mdpi/ic_purity_trds.png
	new file:   res/drawable-mdpi/ic_raumzero_trds.png
	new file:   res/drawable-mdpi/ic_settings_cpu.png
	deleted:    res/drawable-xhdpi/ic_purity_trds.png
	new file:   res/drawable-xhdpi/ic_raumzero_trds.png
	new file:   res/drawable-xhdpi/ic_settings_cpu.png
	modified:   res/values/arrays.xml
	modified:   res/values/config.xml
	modified:   res/values/strings.xml
	new file:   res/xml/cpu_settings.xml
	modified:   res/xml/display_settings.xml
	modified:   res/xml/settings_headers.xml
	new file:   src/com/android/settings/CPUSettings.java
	modified:   src/com/android/settings/DisplaySettings.java
	new file:   src/com/android/settings/KernelUtils.java
	new file:   src/com/android/settings/OnBootCompleted.java
	renamed:    src/com/android/settings/cyanogenmod/superuser/MultitaskSuRequestActivity.java -> src/com/android/settings/raumzero/superuser/MultitaskSuRequestActivity.java
	renamed:    src/com/android/settings/cyanogenmod/superuser/NotifyActivity.java -> src/com/android/settings/raumzero/superuser/NotifyActivity.java
	renamed:    src/com/android/settings/cyanogenmod/superuser/PolicyNativeFragment.java -> src/com/android/settings/raumzero/superuser/PolicyNativeFragment.java
	renamed:    src/com/android/settings/cyanogenmod/superuser/RequestActivity.java -> src/com/android/settings/raumzero/superuser/RequestActivity.java
	renamed:    src/com/android/settings/cyanogenmod/superuser/SuReceiver.java -> src/com/android/settings/raumzero/superuser/SuReceiver.java