Merge remote-tracking branch 'upstream/jellybean-legacy' into jellybean-legacy
Merge remote-tracking branch 'upstream/jellybean-legacy' into jellybean-legacy
implement 1% battery on select devices

Change-Id: I3dfeaf33c1a1c29dc2012335ce8927dc789f8dc3
Fix Menu Overflow Toggle

Toggle didn't work before, overflow would always show. Original authors: BMc08GT & xLaMbChOpSx

Change-Id: I708ca65039dcf6aec673a729d159cedeeb56852d
HALO Style revamp

- speech bubbles are centered
- number batches are roundand simplified, same color as in g+
- markers appear as dots above the bubble
- hiding and dimissing triggers text hints
- couple of bugfixes

WARNING: some of the drawables are good for xhdpi only for now and must
be scaled down for the other resolutions

Change-Id: Ib656664f6f8c42b747df18d65d1e3fb40cb7480c
Finish the floating activity again

Change-Id: I1db29ddd2c056d7645f1028e084face815a44e0c
HALO hiddenstate-fix + smaller numberbatch

once HALO is hidden an orientationchange won't wake it up getting in
your way.

Change-Id: Id7c2232e4e3e6e49392becbdcddeb1a494faafc8
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean
HALO cleanup & better drawables

Change-Id: I7afb5f1e473e9611059e1ea2acfaa9d307696449
HALO hide bugfix, smaller numberbatch still

Change-Id: I5a94e0a7c39a7369cae2b0cabdbe8696eb15dbc5
HALO new vertical gestures (NOT READY FOR RELEASE)

itroduces step gestures

-- Clear all notifications
-- Clear current notification

(*)

-- Hide HALO
-- Silence HALO until woken

Change-Id: I4b5bb7ec612dc0eb1d95e970348b15fba1d79df0
HALO clearall/silence (STILL NOT READY FOR RELEASE)

but working ...

Change-Id: Ie1c25f4ad60d2fac6321417c6fcf93e3dccd9d93
HALO clearall-fix + dismiss icon (READY, BUT NEW STYLE IS XHDPI ONLY!)

Change-Id: I5d47a2dda9139445503f4e93f9a72c02b48cb88d
Better strings

Change-Id: I8e1c97d9ab8df29947e672a214ca006f1f26ba1e
HALO cleanup & clearall-nap

Change-Id: I05e45812fa10e3f6b3818ac4a96d94c7d0d5d125
HALO: make a trusted overlay

Change-Id: I009be0361c73ec536277641d235b0c495bc43db6
Use sticky broadcast to convey torch state (1/2).

It doesn't really make sense to store the (non-persistent) state of the
torch in a (persistent) setting. As the torch is sending a broadcast
anyway, make that broadcast sticky and use it to convey the state.

Also unify the torch constants (actions, extras, activity names) at a
common place.

Change-Id: If845bef27cc79990794aa748dce18cfea3bac1f5

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/quicksettings/TorchTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/FlashlightButton.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
Halo: tablet mode support

Change-Id: I2c735b68b28ac0e2ccddc6a45e11e467321cf5fe
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean-legacy
Merge pull request #46 from alteredlikeness/jellybean-legacy

1% step battery