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

Commit 28c62b45 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Use pending transaction for setting transform hint" into udc-dev am: 9b195e0a 

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



Change-Id: I2c85e27588eb048a853b078b9938bc6d1052180e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9827424 9b195e0a

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

+2 −2
Original line number Diff line number Diff line
@@ -3592,11 +3592,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
                && !mTransitionController.useShellTransitionsRotation()) {

            if (deltaRotation != Surface.ROTATION_0) {

                updateSurfaceRotation(t, deltaRotation, null /* positionLeash */);

                t.setFixedTransformHint(mSurfaceControl,

                getPendingTransaction().setFixedTransformHint(mSurfaceControl,

                        getWindowConfiguration().getDisplayRotation());

            } else if (deltaRotation != mLastDeltaRotation) {

                t.setMatrix(mSurfaceControl, 1, 0, 0, 1);

                t.unsetFixedTransformHint(mSurfaceControl);

                getPendingTransaction().unsetFixedTransformHint(mSurfaceControl);

            }

        }

        mLastDeltaRotation = deltaRotation;

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

+2 −1
Original line number Diff line number Diff line
@@ -596,7 +596,8 @@ class WindowToken extends WindowContainer<WindowState> { 
                .build();

        t.setPosition(leash, mLastSurfacePosition.x, mLastSurfacePosition.y);

        t.reparent(getSurfaceControl(), leash);

        t.setFixedTransformHint(leash, getWindowConfiguration().getDisplayRotation());

        getPendingTransaction().setFixedTransformHint(leash,

                getWindowConfiguration().getDisplayRotation());

        mFixedRotationTransformLeash = leash;

        updateSurfaceRotation(t, rotation, mFixedRotationTransformLeash);

        return mFixedRotationTransformLeash;