summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Muyuan Li <muyuanli@google.com> 2016-08-08 18:01:55 +0000
committer android-build-merger <android-build-merger@google.com> 2016-08-08 18:01:55 +0000
commite0e89c36557951e328c6659860c83e8934db975e (patch)
tree599a3e379072201a823883e6da05f098f3886199
parentabc1c75b4498282dd4841a6e7fef7649d341c6a3 (diff)
parent4e6d4966748cadf38fbb7c5f1c0a33420c94eff0 (diff)
Prevents screenshot layer from dismissing IME. am: 36ca72c6c2
am: 4e6d496674 Change-Id: Ica057285c78c0c67183e1e50f7d22a7e684214e2
-rw-r--r--core/java/android/view/WindowManager.java2
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index fe2423093c88..1b37ed47c392 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -636,7 +636,7 @@ public interface WindowManager extends ViewManager {
/**
* Window type: shares similar characteristics with {@link #TYPE_DREAM}. The layer is
- * reserved for screenshot region selection.
+ * reserved for screenshot region selection. These windows must not take input focus.
* @hide
*/
public static final int TYPE_SCREENSHOT = FIRST_SYSTEM_WINDOW + 36;
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 85f3ddfeab91..be64a47be0b1 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2310,6 +2310,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
attrs.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
}
break;
+ case TYPE_SCREENSHOT:
+ attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+ break;
}
if (attrs.type != TYPE_STATUS_BAR) {