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

Commit c2b0f4ce authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fix Keyboard stays on while startSeamlessRotation" into rvc-dev am: 641c8844 am: 49a272a5 am: 13d03e04 am: 9df6bc32

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

Change-Id: I90bc18606fcb50a5ab13c5bdf8be82a40d572f0c
parents d1998614 9df6bc32

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

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; 
import static android.graphics.GraphicsProtos.dumpPointProto;

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;
@@ -761,6 +762,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();