Merge branch 'cm-10.1' of ssh://review.mfunz.com:29418/github/CyanogenMod/android_frameworks_base into jb-mr1_mkt
rename to ro.mk.version

Change-Id: I5bfc89ac0a378ac107c96a3d1fe993e985a51940
add Lunar support

Change-Id: I7cc6e218923fc9e7f3a845c638f3a861aa0b4ddd
add lunar display fot lockscreen

Change-Id: I4737c176b92b99e281f8f3cda6220123628eff74
add lost import

Change-Id: Ibe696a23dd3bafd5cbd9443810b967c6a52d7c94
test DO NOT MERGE

Change-Id: I1cb4c46fa44feeced331d5d2f5fee2860b98361a
test 1 DO NOT MERGE

Change-Id: I4866a15f32c943c6c6d707d2e50cb0b0403b91d3
fix lockscreen lunar display and merge test commit

Change-Id: If6be66306ff8f2a42a6993ea52a2d5757b6ebee0
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into jb-mr1_mkt
fix 24hours bind bug

Change-Id: Ifae8862e4308929fa9ca7f9ff3eadf8fdf31a4ca
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into martincz
Fixed aapt warnings

Change-Id: I35389697266b3ec59a38b4142a8983d0a8cc31ac
PT-BR: Added missing translations

Change-Id: I0616fbbd61742553bd03c1d64a2c792ad55fb2e9
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
frameworks/base: Dutch translations

Change-Id: I7adf723e44389fa05a1920d785cc6434c3473336
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
Framework/SystemUI: Update Greek translations

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I2a9978b20ce0d70621e88913841758553721e6a8
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