Revert "Merge branch 'HYBRID' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2"

This reverts commit 4ce5974ba1bffea4240c8a335af3674506cbc514, reversing
changes made to e622b87aceb3c39931501011b6a5190dd1cf57cf.

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml
Fix up a few strings, drawables

Dark Carbon icon we had looks weird imo :/
Refactor "Hidden Statusbar Pulldown (2/2)"

Make Hidden Statusbar Pulldown feature a dependency of Auto Hide Statusbar. The option for it now gets
disabled and greyed out when Auto Hide Statusbar is unchecked.

TO DO: Make the current 10 second timeout user configurable.
RC: Ribbon seperate the swipe ribbons.

Change-Id: I46b48c80895abc653b1fb6c3c6080e1cf4874924
Settings: Overwork LED colorpicker dialog

thanks danny

cheers

Change-Id: Idb7e4f6dfa677746a72a1857e01cf363dca89341

Conflicts:
	res/layout/dialog_light_settings.xml
	src/com/android/settings/notificationlight/LightSettingsDialog.java
google...that is no lockscreen setting :p

use other string old  pointed to wrong one

Change-Id: I3d57e7633f1684170e6b5fbe8af282f8d76066cb
Fix dialog not opening for app-specific notification light settings.

Change-Id: I8e8d098bcc07824803b9e9931595f5c4fdbabb7b
WLAN configuration (static address): reject IPv6 addresses.

Without this, entering an IPv6 address as the interface address (or possibly
also others, such as gateway address) will, on connection to that WLAN,
trigger an uncaught exception:

*** FATAL EXCEPTION IN SYSTEM PROCESS: WifiStateMachine
java.lang.IllegalArgumentException: command '59 interface setcfg wlan0 2001:db8::ffff 24 up' failed with '501 59 Flag unsupported'
	at com.android.server.NetworkManagementService.setInterfaceConfig(NetworkManagementService.java:546)
	at android.net.wifi.WifiStateMachine$ObtainingIpState.enter(WifiStateMachine.java:3449)
	at com.android.internal.util.StateMachine$SmHandler.invokeEnterMethods(StateMachine.java:958)
[etc.]

followed by a restart of the UI then another connection attempt. So long as
the misconfigured-for AP is present (and preferred?), this will continue to
happen.

Change-Id: I524480339c37ad079fd21d90a6b1fc5864089cb5

Conflicts:
	src/com/android/settings/wifi/WifiConfigController.java
[2/2] Power connect/disconnect notification support

part 1/2: frameworks/base PowerUI and Settings
http://review.cyanogenmod.org/#/c/35241/

part 2/2: packages/apps/Settings Sound settings
http://review.cyanogenmod.org/#/c/35242/

patchset 3:
    set settings persistence and dependencies in xml resource file
    shrink long lines
    add the default notification tone to the ringtone picker and
        remove the now redundant "use default" checkbox
    move values/strings.xml content to the cyanogenmod section
    improve (mostly delete) wording in values/strings.xml
    remove tab whitespace

patchset 5:
    move strings to cm_strings

patchset 6:
    make vibrate optional (default on)
    change heading text: power notifications -> power sounds

patchset 7:
    hide vibrate option if hw capability doesn't exist

patchset 8:
    change vibrate to default to off

Change-Id: I7ddd8a47ae4f9a62c586023d151ac42bbe8424c7

Conflicts:
	res/values/strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java
Hidden Statusbar Pulldown Timeout (2/2)

Make hidden Statusbar pulldown window user configurable.

Thanks to Steve Spear for the help!