Revert "Battery: Disable 'Text only' icon"

This reverts commit 3d184905978838cbf80066e6e15fbfbf055641c6.
Settings: forward port HeadsUp options (2/2)

-Global on/off
-Blacklist and Do not disturb

Altaf-Mahdi: Materialized to match Blacklist and profiles

Conflicts:
	AndroidManifest.xml
	res/values/custom_strings.xml
	res/xml/notification_settings.xml
	src/com/android/settings/notification/NotificationSettings.java
HeadsUp: add timeout option (2/2)

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
Change check for syncActive

In Manage Account settings if account is in syncing state
option provided to user is "sync now" which should be
"Cancel sync".

syncActive is set to true if getCurrentSyncsAsUser() returns
an empty list which means there are no active syncs.

syncActive should be set to false if getCurrentSyncsAsUser()
returns an empty list.

Change-Id: If78247a90bbca3e1a12553b6facb1315321f52cf
OpenDelta !
Don't think this was suppose to get removed. lol
OpenDelta integration fix

Sorry :D
OCD