Google Now Recents button user-define (2/2)
Advanced low battery indicator options (2/2)

Based on a idea I saw on RootBox and from CR3C0 (thanks guys) which we
modified to an extended version

This commit introduces following new modes to indicate low battery

     * 0 = show dialog + play sound (default)
     * 1 = fire notification + play sound
     * 2 = show dialog only
     * 3 = fire notification only
     * 4 = play sound only
     * 5 = none

Notification behaviour is the same as Pop-up. User can dismiss it manually
or it is dismissed automatically if charger is connected. Also you user get a
status bar ticker message about the notification and notification is always
on first place of list. And last if vibration is enabled
notification vibrates.

cheers

Change-Id: Ia8fa8c420e6ef334266a7734fb080026a8396340

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml
	src/com/android/settings/carbon/InterfaceSettings.java

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/carbon/settings/fragments/InterfaceSettings.java
[Settings] Port Add Wifi name to notification drawer (2/2)

Patchset1: Remove this option for tablets/large screen, and non wifi devices.

Change-Id: I3a3f629ca6a274af77db964d67f2589ee18a6f1a

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml
	src/com/carbon/settings/fragments/InterfaceSettings.java
Settings: Notification Shortcuts (2/2)

Patchset 2: Added hide carrier label toggle, added multi-user support, fixed whitespace, cleanup of code.

Change-Id: I4e6c460289f5375acb419b4f980be15b290d8596

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/carbon/LockscreenInterface.java
	src/com/carbon/settings/fragments/InterfaceSettings.java
Configurable Notification Behavior [1/2]

Credit: Michele Primavera

Change-Id: I74c422a5acc95fc8ddde17809d6c5b3472772de9

Conflicts:
	res/values/strings.xml
	res/xml/notification_drawer_settings.xml
	src/com/android/settings/slim/NotificationDrawerSettings.java
Merge remote-tracking branch 'upstream/jb3' into jb3

Conflicts:
	res/values/strings.xml