Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevents screenshot layer from dismissing IME." into nyc-mr1-dev

Browse Source
This commit is contained in:
Muyuan Li
2016-08-08 17:43:10 +00:00
committed by Android (Google) Code Review
parent c1aac02a37 36ca72c6c2
commit a6b1a9485c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/WindowManager.java
View File

@@ -636,7 +636,7 @@ public interface WindowManager extends ViewManager {
/** /**
* Window type: shares similar characteristics with {@link #TYPE_DREAM}. The layer is * 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 * @hide
*/ */
public static final int TYPE_SCREENSHOT = FIRST_SYSTEM_WINDOW + 36; public static final int TYPE_SCREENSHOT = FIRST_SYSTEM_WINDOW + 36;

3
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2229,6 +2229,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
attrs.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD; attrs.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
} }
break; break;
case TYPE_SCREENSHOT:
attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
break;
} }
if (attrs.type != TYPE_STATUS_BAR) { if (attrs.type != TYPE_STATUS_BAR) {