Fix derp
HeadsUp: User configurable timeout [1/2]

Change-Id: I263f8ea013f99488c2d1af97eff517db2b9d634b

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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
HeadsUp: option to launch in floating window [1/2]

This commit also affects Hover

Change-Id: Ia8ffb4088f5b48b222a77ef486ba8b14e193c26f

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHelper.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHelper.java