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

Merge "Don't include IME in app screenshot while in multi-window mode" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-09 18:22:28 +00:00
committed by Android (Google) Code Review
parent 8a111f5f20 a5434dd987
commit de5a7afc79
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6150,12 +6150,19 @@ public class WindowManagerService extends IWindowManager.Stub
WindowState appWin = null;
boolean appIsImTarget;
boolean includeImeInScreenshot;
synchronized(mWindowMap) {
appIsImTarget = mInputMethodTarget != null
&& mInputMethodTarget.mAppToken != null
&& mInputMethodTarget.mAppToken.appToken != null
&& mInputMethodTarget.mAppToken.appToken.asBinder() == appToken;
final AppWindowToken imeTargetAppToken =
mInputMethodTarget != null ? mInputMethodTarget.mAppToken : null;
// We only include the Ime in the screenshot if the app we are screenshoting is the IME
// target and isn't in multi-window mode. We don't screenshot the IME in multi-window
// mode because the frame of the IME might not overlap with that of the app.
// E.g. IME target app at the top in split-screen mode and the IME at the bottom
// overlapping with the bottom app.
includeImeInScreenshot = imeTargetAppToken != null
&& imeTargetAppToken.appToken != null
&& imeTargetAppToken.appToken.asBinder() == appToken
&& !mInputMethodTarget.isInMultiWindowMode();
}
final int aboveAppLayer = (mPolicy.windowTypeToLayerLw(TYPE_APPLICATION) + 1)
@@ -6174,7 +6181,7 @@ public class WindowManagerService extends IWindowManager.Stub
continue;
}
if (ws.mIsImWindow) {
if (!appIsImTarget) {
if (!includeImeInScreenshot) {
continue;
}
} else if (ws.mIsWallpaper) {