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

Commit 834c18b3 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix Keyboard stays on while startSeamlessRotation" into rvc-dev... 

Merge "Merge "Fix Keyboard stays on while startSeamlessRotation" into rvc-dev am: 641c8844" into rvc-dev-plus-aosp
parents 96bdc2d7 f15c74a0

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

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.app.WindowConfiguration.isSplitScreenWindowingMode; 
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.os.PowerManager.DRAW_WAKE_LOCK;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;

import static android.view.InsetsState.ITYPE_IME;

import static android.view.SurfaceControl.Transaction;

import static android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;

import static android.view.View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
@@ -757,6 +758,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            oldRotation = mPendingSeamlessRotate.getOldRotation();

        }



        // Skip performing seamless rotation when the controlled insets is IME with visible state.

        if (mControllableInsetProvider != null

                && mControllableInsetProvider.getSource().getType() == ITYPE_IME) {

            return;

        }



        if (mForceSeamlesslyRotate || requested) {

            if (mControllableInsetProvider != null) {

                mControllableInsetProvider.startSeamlessRotation();