Fix string

Conflicts:
	core/res/res/values/oct_strings.xml
Fix the notification drawer that not closing after removing the notifications
Signed-off-by: nico <ndhouailly@gmail.com>

Change-Id: Ib49caaaa42667359c79c6439123bee61d2665f85

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Add Tentacles tile(1/2)
[1/2] Add battery level around unlock ring

PS2:
added missing change in KeyguardSelectorView.java

Change-Id: Ia4dbc2335657c096c34349ec67c4adfec0aeb91b

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
Frameworks: Statusbar clock and date customizations(1/3)
Some things changed on kitkat + our old code needed in general a bit
rework. All done with this patchset.

This commit add support for:

- Clock and date enable/disable
- Clock and date position
- AM/PM styles multilang support
- color
- Date format
- Date style

Author: kufikugel
Change-Id: I73d854ed5cfb57fa19e4b5554bb10cb2e1ce9b65

Conflicts:
	core/java/android/provider/Settings.java
Statusbar clock font style (1/2)
PS1: Initial
PS2: Int settings

Change-Id: Iafb811b9f819a100940fdeeaa2c657483c039950

Clock Font: Adding more styles
Change-Id: I7ff863fba0c33409f6cad28df5bf3003db2aae0f
Thanks CarbonDev

Conflicts:
	core/java/android/provider/Settings.java