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

Commit e5e6da43 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set IME showing in ImeInsetsSourceProvider#onPostLayout" into main

parents fb8ccc5e 0e9155e2

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

+5 −3
Original line number Diff line number Diff line
@@ -5081,9 +5081,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

        }



        if (!android.view.inputmethod.Flags.refactorInsetsController()) {

            // This should be called after the insets have been dispatched to clients and we have

            // committed finish drawing windows.

            mInsetsStateController.getImeSourceProvider().checkAndStartShowImePostLayout();

        }



        mLastHasContent = mTmpApplySurfaceChangesTransactionState.displayHasContent;

        if (!inTransition() && !mDisplayRotation.isRotatingSeamlessly()) {

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

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
                ImeTracker.forLogging().onProgress(mStatsToken,

                        ImeTracker.PHASE_WM_POST_LAYOUT_NOTIFY_CONTROLS_CHANGED);

                mStateController.notifyControlChanged(mControlTarget);

                setImeShowing(true);

            } else if (wasServerVisible && mServerVisible && mGivenInsetsReady

                    && givenInsetsPending) {

                // If the server visibility didn't change (still visible), and mGivenInsetsReady
@@ -113,6 +114,8 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
                ImeTracker.forLogging().onCancelled(mStatsToken,

                        ImeTracker.PHASE_WM_POST_LAYOUT_NOTIFY_CONTROLS_CHANGED);

                mStatsToken = null;

            } else if (wasServerVisible && !mServerVisible) {

                setImeShowing(false);

            }

        }

    }