Halo: Avoid showing Halo))) icons in status bar while added to Halo (Credits @Anu6is)
Kill floating activities running in the same thread when tapping outside
This change makes all activities from the same app to be finished when we tap outside the halo window. Other apps running in different threads
(floating or not) won't be finished.

Change-Id: I3c51eafdcee7032fa90876411da3ff1eae0106c3
Completely hide Halo))) icons while tasking
- previous commit by BigBrother1984 stopped the highlighting of Halo))) icons
  this should remove them completely. Other status bar icons are still highlighted
Merge pull request #54 from Anu6is/hideHaloIcons

Completely hide Halo))) icons while tasking. Complete this commit: a404d6eaf9206fc658f050ccc2d974a589edfe3b

Thanks @Anu6is
Halo: Merge new icons order in expanded Pie notification shade
Better Icons II & White Halo Toggle

Change-Id: Ic299f16fccdb47001713b49ed3f85c25bf10a743
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean-legacy
Disable touch while using the stylus (Galaxy Note)

Android 4.0 cannot form multitouch events from multiple input
devices. So it is not possible to report one touchpoint from the
stylus position and, at the same time, another touchpoint from a
finger touch. Instead, when a new input device starts up the currently
active input is cancelled. This is highly undesirable while writing
with the pen.

The easiest solution is to ignore non-stylus touch events while the
stylus is within range (hovering) of the touchscreen. For example,
N-trig digitizers implement this in hardware. But wacom digitizers do
report pen data simultaneously with touch data. This patch disables
(non-stylus) touch input within 50ms of stylus data. On my Galaxy
Note this is necessary to make stylus input usable.

Change-Id: I9f458d85d8bf83d6cf03b467d46ce066fd55b7e0

Conflicts:
	services/input/InputReader.cpp
	services/input/InputReader.h
input: Add option to toggle pointer icon when using stylus

* The visible pointer icon when hovering or drawing with the stylus is
  quite annoying when trying to actually draw with it. Turn it off by
  default and add an option to turn it on.

Patchset2
- clean up

Change-Id: Ib7f23e8b69589e3f875d150caf05065b64676e44

Conflicts:
	services/input/InputReader.cpp
	services/input/InputReader.h
	services/jni/com_android_server_input_InputManagerService.cpp
Ignore null stylus gesture settings

If the user performs a stylus gesture that has not been configured in
the settings at all, the gesture filter would incorrectly interpret the
setting's null value as an app launch action.

Change-Id: If7f600a688bb7b5e0a9a2e912c3d6183a9c9a69e
Merge branch 'jellybean-legacy' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean-legacy