Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e658052 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Do not skip traversal of IME container when display is frozen" into... 

Merge "Do not skip traversal of IME container when display is frozen" into sc-v2-dev am: 48192913 am: 1e8267c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16334307

Change-Id: I5134605493dd75a1f1aa13aab5764b1111a8b316
parents e3b7d854 1e8267c3

services/core/java/com/android/server/wm/DisplayContent.java

+4 −6
Original line number Diff line number Diff line
@@ -1640,11 +1640,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            // to cover the activity configuration change.

            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 (!mAppTransition.isTransitionSet() || !mOpeningApps.contains(r)) {

                // Apply normal rotation animation in case of the activity set different requested
@@ -4830,7 +4825,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            // WindowState#applyImeWindowsIfNeeded} in case of any state mismatch.

            return dc.mImeLayeringTarget != null

                    && (!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} */