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
Frameworks: Port all carrier label options (1/2)

Also included commit: a14f63ed90820e362923635d4496a27b483449ed
UI not updated correctly in expanded statusbar
Sometimes when getting status changes in expanded statusbar the
text disappear. Both NetworkController and PhoneStatusBar handles
UI updates and they are not in sync. This fix allows PhoneStatusBar
to update UI when NetworkController is updating the UI.

Author: Kent Persson
Conflicts:
	packages/Keyguard/src/com/android/keyguard/CarrierText.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: I00776b2df61eb20ce20fbf9e81d29b13cf2f174a

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Configurable up to user (LTE or 4G)

Credit Daxx for the original implementation

Change-Id: I80711a547851ec94c2391169ca9c2a1da877fac7

Conflicts:
	core/java/android/provider/Settings.java
System bar color WIP

Both status and navigation

Ps3: fixes for 4.4.1

Change-Id: Iea59a7550925bcaf85e4faf86811562d039668cc

Conflicts:
	core/java/android/provider/Settings.java
Frameworks: notification drawer background (1/2)

so after keyguard is mostly done let us start notification drawer
and QS. First one custom background.....either color or picture
with custom alpha and ability to set a landscape picture seperatly
(landscape phone only)

Compared to the 4.3 included version completly recoded and better
integrated. No idea what I thought 1 year ago on the old implementation

cheeers

Change-Id: Id7d0f718acd05d34fab57bb250c29ed944bdcd58

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: Id7d0f718acd05d34fab57bb250c29ed944bdcd58

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
fb: notification transparency (1/2)

this add back notification transparency...compared to 4.3
it controlls as well the notification icon backgound transparency
which felt in the past dissplaced. As well codecleanup of the old
implementation.

largeIcon support I did not add due that google does not support it
as well at current status...it is only a placeholder in
NotificationData

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: Ic5bb8998f64cac573d70005fad909104accc9e96

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Statusbar Brightness Control (AOKP impl) (1/2)

Find it more effective than CM...

re-implement statusbar brightness slider

TODO: allow it to be disabled by adding a System.Setting?

Signed-off-by: Roman Birg <romanbirg@gmail.com>

SystemUI: add statusbar slider preference

Change-Id: Ibad11cd0495aa5fc2aa31e6f6c1e1cf85b8a582b
Signed-off-by: Roman Birg <romanbirg@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java
Battery Bar: Default bar color to white
Add people lookup settings keys

Change-Id: I2ff9bb7684d04f4f9b640939c7db269873aa3308

Conflicts:
	core/java/android/provider/Settings.java
base: quicksettings: allow flip animation on clicking a tile (1/2)

ported from https://github.com/BeerGang/android_frameworks_base/commit/ba144b2defd209c2c020366316c65b288bf68880

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/LteTile.java

Change-Id: Ic5e3b6c1eee902fd59c1d54ac6c5efb8cffad4ba

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/quicksettings/PerformanceProfileTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/ProfileTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuietHoursTile.java
base: Fix derp

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: I79e0e44738ad1b32b5f30f2f1223e20711c9b3e4

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/AirplaneModeTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/PerformanceProfileTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/ProfileTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuietHoursTile.java
Default Lockscreen Notifications to off
Frameworks: Fix 0% battery QS tile

when tile is recreated. Fetch the values from
BatteryController

Change-Id: Id0539016e1c479ac1f75535647d91a26f69a76b5
Screen recorder: add ability to record audio from mic [1/2]

Change-Id: I2422a3c651e469bc9ffeb6b101f43e145dc5de85

Conflicts:

	core/java/android/provider/Settings.java

Change-Id: I2422a3c651e469bc9ffeb6b101f43e145dc5de85
LED customization
original commit CM

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/oct_arrays.xml
	core/res/res/values/oct_symbols.xml
	services/java/com/android/server/NotificationManagerService.java