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

Commit 1e8267c3 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 sc-v2-dev am: 48192913 

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

Change-Id: I80908eec5e1e69525f5be56b8882560aebf4c776
parents b4123126 48192913

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

+4 −6
Original line number Original line Diff line number Diff line
@@ -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} */