Revert "Fix up"

This reverts commit d308c2d59b82392a5f46958b494f978340d0cc1e.
Fix strings
Revert "[2/2] Add option to change size of QS ribbon bar"

This reverts commit 55c58f1d439e972684d3bbb8a354b1121fa83dd2.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
Fix slim recent double floating menu
Add Weather Status Bar Header (1/4)

AICPfy:
It was a bitch to get the layout just like I want it.
Pushed bloody SystemUI like 30 times to test
PhoneStatusbar and layouts are done by me, rest is TeamEOS
so they get the credit of course

Change-Id: I1dbddd01584717226dec5393994b1b99681c30f3

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/status_bar_expanded.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

FWB: Option to hide weather icon in statusbar (1/2)

Change-Id: Id376f3a3d5aba06cd5ad8dcbefea9f612de14dd3

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

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

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Disable Immersive Messages [2/2]

Based off Xposed module by GermainZ

https://github.com/GermainZ/ImmersiveModeDontPanic

Change-Id: I4835cac08a9e525ec15aa4d1ee84329970ec6a72

Conflicts:
	core/java/android/provider/Settings.java
Fix SwiftKey disappearing issue

Change-Id: I3b13acc430d260a6ef56ce581c587650861b19cd