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

Merge "PIP window cant be ime target." into rvc-dev

Browse Source
This commit is contained in:
Taran Singh
2020-06-15 22:42:02 +00:00
committed by Android (Google) Code Review
parent c5304b1a61 b38e5406b0
commit 466a3e5bfa
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -2198,10 +2198,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
@Override @Override
boolean isFocusable() { boolean isFocusable() {
return super.isFocusable() && (canReceiveKeys() || isAlwaysFocusable());
}
boolean canReceiveKeys() {
// TODO(156521483): Propagate the state down the hierarchy instead of checking the parent // TODO(156521483): Propagate the state down the hierarchy instead of checking the parent
boolean canReceiveKeys = getWindowConfiguration().canReceiveKeys() return getWindowConfiguration().canReceiveKeys()
&& getTask().getWindowConfiguration().canReceiveKeys(); && (task == null || task.getWindowConfiguration().canReceiveKeys());
return super.isFocusable() && (canReceiveKeys || isAlwaysFocusable());
} }
boolean isResizeable() { boolean isResizeable() {
@@ -2370,10 +2373,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// For the apps below Q, there can be only one app which has the focused window per // For the apps below Q, there can be only one app which has the focused window per
// process, because legacy apps may not be ready for a multi-focus system. // process, because legacy apps may not be ready for a multi-focus system.
return false; return false;
} }
} }
return (getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable()) return (canReceiveKeys() || isAlwaysFocusable()) && getDisplay() != null;
&& getDisplay() != null;
} }
/** /**