Fixed aapt warnings

Change-Id: I35389697266b3ec59a38b4142a8983d0a8cc31ac
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
Screenshot : Pass current user

Needed to complete the snapshot procedure

Change-Id: I40f63e261e213136cd739c06da6f005173427ae0
PowerWidget: fix airplane mode toggle

Settings.System -> Settings.Global

Change-Id: Ic1a874ec694e76153d0838fdb81650fe384bae59
Merge "Fixed aapt warnings" into cm-10.1
Merge "Screenshot : Pass current user" into cm-10.1
Merge "Disable touch while using the stylus (Galaxy Note)" into cm-10.1
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.

Change-Id: Ib7f23e8b69589e3f875d150caf05065b64676e44

Conflicts:
	services/input/InputReader.cpp
	services/input/InputReader.h
	services/jni/com_android_server_input_InputManagerService.cpp
GlobalActions: Fix dialog dismissal

The themeability of the global actions dialog introduced by
change I644e2e8d7d4abf07bae639b606197d691f16adac broke the
hook that prevented multiple instances of that dialog, and
multiple instances of it will cause framework crashes due to
mismatches variable references (besides looking weird).

Fix it by restoring the original dismissal condition and forcing
a recreation of the theme context if necessary.

Change-Id: Ic6e06bef18fa9e09c84c774fa273f1b7e3bf9630
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
For devices without home key bind long press to nothing

Change-Id: I02e80f42bb460c6d22f1324e2714f0526521a63f
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1
Add layout for tablet status bar search panel

Change-Id: I3a07edeba872f294cfd06fb315412649cab6609a
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7-linaro