Revert "Smart Cover Settings"

This reverts commit 79cb17f37f3803eee07b53a1715debc04729e935.

Conflicts:
	res/values/vikas_strings.xml
Settings: disable lock screen heads up (2/2)

This disables heads up notifications from showing
on the lock screen while using wake on notification

Change-Id: I89bbbb439e330921d5f517e01b586fc284ef33a6

Conflicts:
	res/values/crom_strings.xml
	src/com/android/settings/crom/LockscreenNotifications.java
DataUsageSummary: Add CDMA support for showing usage for devices without sim cards

Change-Id: Ib6774b0ad1cd9421a669349321a4f75517f24719
Settings : Dismiss glowpad view on trigger

Conflicts:
	src/com/android/settings/liquid/LockscreenTargets.java

Change-Id: I36b34e9e5878b1e2c74f276543ed93b58dabb961
Status bar expanded: Reworked Weather, part 2 (WIP), (2/2):

For more informations:
https://github.com/XXMrHyde/android_frameworks_base/commit/6bcd1b066548a09a7090b046e1335e45179520be

Conflicts:
	AndroidManifest.xml
	res/values-de/dk_strings.xml
	res/values/dk_arrays.xml
	res/values/dk_strings.xml
	res/xml/status_bar_expanded_weather.xml
	src/com/android/settings/Settings.java
derp