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

Merge "Do not skip traversal of IME container when display is frozen" into sc-v2-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-11-24 16:04:44 +00:00
committed by Android (Google) Code Review
parent 85aacccba1 a8a067f484
commit 481929130e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1655,11 +1655,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// to cover the activity configuration change. // to cover the activity configuration change.
return false; return false;
} }
if (r.attachedToProcess() && mayImeShowOnLaunchingActivity(r)) {
// Currently it is unknown that when will IME window be ready. Reject the case to
// avoid flickering by showing IME in inconsistent orientation.
return false;
}
if (checkOpening) { if (checkOpening) {
if (!mAppTransition.isTransitionSet() || !mOpeningApps.contains(r)) { if (!mAppTransition.isTransitionSet() || !mOpeningApps.contains(r)) {
// Apply normal rotation animation in case of the activity set different requested // Apply normal rotation animation in case of the activity set different requested
@@ -4881,7 +4876,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// WindowState#applyImeWindowsIfNeeded} in case of any state mismatch. // WindowState#applyImeWindowsIfNeeded} in case of any state mismatch.
return dc.mImeLayeringTarget != null return dc.mImeLayeringTarget != null
&& (!dc.getDefaultTaskDisplayArea().isSplitScreenModeActivated() && (!dc.getDefaultTaskDisplayArea().isSplitScreenModeActivated()
|| dc.mImeLayeringTarget.getTask() == null); || dc.mImeLayeringTarget.getTask() == null)
// Make sure that the IME window won't be skipped to report that it has
// completed the orientation change.
&& !dc.mWmService.mDisplayFrozen;
} }
/** Like {@link #forAllWindows}, but ignores {@link #skipImeWindowsDuringTraversal} */ /** Like {@link #forAllWindows}, but ignores {@link #skipImeWindowsDuringTraversal} */