FW_Base [01/21] - Revert "HeadsUp: option to launch in floating window (1/2)"

This reverts commit 40e55da4b5869ee7faf05ac74fe4bec765b745f6.

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

Change-Id: Iec81ff385a482607a4ca0424d7274f597a523b82
Signed-off-by: STELIX <ssspinni@gmail.com>
FW_Base [02/21] - Revert "Floating window: Fix possible NPE"

This reverts commit e7360702af0c36b4239ec1ce106222c50eb5cd89.

Conflicts:
	packages/SystemUI/res/values/cr_strings.xml

Change-Id: Id6414a166390e6602bc2d33cfb8dfcb4c9a966ed
Signed-off-by: STELIX <ssspinni@gmail.com>