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

Commit 2650e27c authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Relax condition to hide unready IME with fixed rotation" into udc-dev am: 0b7071fa 

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



Change-Id: Ie26455f7b34d680f3b9b2d8937ec9d5082743b9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5ff6b75 0b7071fa

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

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ class AsyncRotationController extends FadeAnimationController implements Consume 


    /** Hides the window immediately until it is drawn in new rotation. */

    void hideImmediately(WindowToken windowToken) {

        if (isTargetToken(windowToken)) return;

        final boolean original = mHideImmediately;

        mHideImmediately = true;

        final Operation op = new Operation(Operation.ACTION_FADE);

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

+3 −3
Original line number Diff line number Diff line
@@ -4158,13 +4158,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 


    /** @see WindowManagerInternal#onToggleImeRequested */

    void onShowImeRequested() {

        if (mImeLayeringTarget == null || mInputMethodWindow == null) {

        if (mInputMethodWindow == null) {

            return;

        }

        // If IME window will be shown on the rotated activity, share the transformed state to

        // IME window so it can compute rotated frame with rotated configuration.

        if (mImeLayeringTarget.mToken.isFixedRotationTransforming()) {

            mInputMethodWindow.mToken.linkFixedRotationTransform(mImeLayeringTarget.mToken);

        if (mFixedRotationLaunchingApp != null) {

            mInputMethodWindow.mToken.linkFixedRotationTransform(mFixedRotationLaunchingApp);

            // Hide the window until the rotation is done to avoid intermediate artifacts if the

            // parent surface of IME container is changed.

            if (mAsyncRotationController != null) {

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

+4 −2
Original line number Diff line number Diff line
@@ -2342,9 +2342,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    @Override

    public void onConfigurationChanged(Configuration newParentConfig) {

        mTempConfiguration.setTo(getConfiguration());

        // Get from super to avoid using the updated global config from the override method.

        final Configuration selfConfiguration = super.getConfiguration();

        mTempConfiguration.setTo(selfConfiguration);

        super.onConfigurationChanged(newParentConfig);

        final int diff = getConfiguration().diff(mTempConfiguration);

        final int diff = selfConfiguration.diff(mTempConfiguration);

        if (diff != 0) {

            mLastConfigReportedToClient = false;

        }

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+0 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,6 @@ public class DisplayContentTests extends WindowTestsBase { 


        // If the rotated activity requests to show IME, the IME window should use the

        // transformation from activity to lay out in the same orientation.

        mDisplayContent.setImeLayeringTarget(mAppWindow);

        LocalServices.getService(WindowManagerInternal.class).onToggleImeRequested(true /* show */,

                app.token, app.token, mDisplayContent.mDisplayId);

        assertTrue(asyncRotationController.isTargetToken(mImeWindow.mToken));