diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2014-12-05 02:34:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 02:34:26 +0000 |
| commit | 26af8c197c17487ac0400a7a3310037e57eda2a0 (patch) | |
| tree | c4071fc7e3c986fbf47cf3e8c2bc37bc1a66b8f7 /services/core | |
| parent | 53966f6268ac1861d62bda97f361cf67b2156f6c (diff) | |
| parent | 26b187711fdf6224e14df465a58f30f510011b49 (diff) | |
| download | frameworks_base-26af8c197c17487ac0400a7a3310037e57eda2a0.zip frameworks_base-26af8c197c17487ac0400a7a3310037e57eda2a0.tar.gz frameworks_base-26af8c197c17487ac0400a7a3310037e57eda2a0.tar.bz2 | |
am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
* commit '26b187711fdf6224e14df465a58f30f510011b49':
Private Window flag to disable touch events in WallpaperService.
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/wm/InputMonitor.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index 0327cb3..27ac32a 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -242,6 +242,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { final WindowStateAnimator universeBackground = mService.mAnimator.mUniverseBackground; final int aboveUniverseLayer = mService.mAnimator.mAboveUniverseLayer; boolean addedUniverse = false; + boolean disableWallpaperTouchEvents = false; // If there's a drag in flight, provide a pseudowindow to catch drag input final boolean inDrag = (mService.mDragState != null); @@ -282,8 +283,14 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { final boolean hasFocus = (child == mInputFocus); final boolean isVisible = child.isVisibleLw(); + if ((privateFlags + & WindowManager.LayoutParams.PRIVATE_FLAG_DISABLE_WALLPAPER_TOUCH_EVENTS) + != 0) { + disableWallpaperTouchEvents = true; + } final boolean hasWallpaper = (child == mService.mWallpaperTarget) - && (privateFlags & WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD) == 0; + && (privateFlags & WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD) == 0 + && !disableWallpaperTouchEvents; final boolean onDefaultDisplay = (child.getDisplayId() == Display.DEFAULT_DISPLAY); // If there's a drag in progress and 'child' is a potential drop target, |