Settings: remove Active Display (1/2)

commit b24ccc06cfa2a188e03e74b08d781b439607a79f
Author: Mahdi-Rom <mahdi.rom@gmail.com>
Date:   Sun Jan 12 10:16:52 2014 +0000

    Revert "Add active display from ChameleonOS [2/2]"

    This reverts commit 7a6770933152254c19cdbe5256303bf463173917.

commit b24ccc06cfa2a188e03e74b08d781b439607a79f
Author: Mahdi-Rom <mahdi.rom@gmail.com>
Date:   Sun Jan 12 10:16:52 2014 +0000

    Revert "[2/2] Settings: Pimp up ActiveDisplay"

    This reverts commit fbe6c64aa13d052c295efa9549d9fc17624e126e.

commit 374b936189823c86b42e34cab6b32fc8bfd2d016
Author: Mahdi-Rom <mahdi.rom@gmail.com>
Date:   Sun Jan 12 10:16:27 2014 +0000

    Revert "[1/2] Settings: Fix pimp up ActiveDisplay"

    This reverts commit af8233fc2ef6f5ff213726c3d87ddfcf3cf4b75c.
[2/2] Settings: Lockscreen Notifications

PS6:
    [2/2] Lockscreen Notifications: make offset top user configurable & add privacy mode

Change-Id: Ic66c0ff9d36bc390f5a434559468fe3752faf285
[2/2] Settings: Update network traffic indicator

*Update settings option to cycle through display modes Off->bit/s->Bytes/s

*Minor formatting changes

Change-Id: I9add610a8d14f5a48f2af0a82ced0c186224e282

Conflicts:

	res/values/custom_strings.xml
	src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
Dont show "Erase SD Card" when there is none

On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:

 Card present and mounted -> Erase enabled
 Card present but unmounted -> Erase enabled
 No card present -> Erase disabled
 Card present and MTP attached -> Erase disabled

Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
AndroidManifest.xml: fix derp