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

Commit 0310eb67 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "ViewRootImpl: Fix display install orientation query for transform hint"

parents cd4d015a 6732df29

core/java/android/service/wallpaper/WallpaperService.java

+1 −3
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ public abstract class WallpaperService extends Service { 
        private Display mDisplay;

        private Context mDisplayContext;

        private int mDisplayState;

        private @Surface.Rotation int mDisplayInstallOrientation;

        private float mWallpaperDimAmount = 0.05f;

        private float mPreviousWallpaperDimAmount = mWallpaperDimAmount;

        private float mDefaultDimAmount = mWallpaperDimAmount;
@@ -1159,7 +1158,7 @@ public abstract class WallpaperService extends Service { 
                            mSurfaceControl, mInsetsState, mTempControls, mSyncSeqIdBundle);



                    final int transformHint = SurfaceControl.rotationToBufferTransform(

                            (mDisplayInstallOrientation + mDisplay.getRotation()) % 4);

                            (mDisplay.getInstallOrientation() + mDisplay.getRotation()) % 4);

                    mSurfaceControl.setTransformHint(transformHint);

                    WindowLayout.computeSurfaceSize(mLayout, maxBounds, mWidth, mHeight,

                            mWinFrames.frame, false /* dragResizing */, mSurfaceSize);
@@ -1420,7 +1419,6 @@ public abstract class WallpaperService extends Service { 
            mWallpaperDimAmount = mDefaultDimAmount;

            mPreviousWallpaperDimAmount = mWallpaperDimAmount;

            mDisplayState = mDisplay.getState();

            mDisplayInstallOrientation = mDisplay.getInstallOrientation();



            if (DEBUG) Log.v(TAG, "onCreate(): " + this);

            onCreate(mSurfaceHolder);

core/java/android/view/ViewRootImpl.java

+2 −6
Original line number Diff line number Diff line
@@ -428,8 +428,6 @@ public final class ViewRootImpl implements ViewParent, 
    final DisplayManager mDisplayManager;

    final String mBasePackageName;



    private @Surface.Rotation int mDisplayInstallOrientation;



    final int[] mTmpLocation = new int[2];



    final TypedValue mTmpValue = new TypedValue();
@@ -1134,7 +1132,6 @@ public final class ViewRootImpl implements ViewParent, 
            if (mView == null) {

                mView = view;



                mDisplayInstallOrientation = mDisplay.getInstallOrientation();

                mViewLayoutDirectionInitial = mView.getRawLayoutDirection();

                mFallbackEventHandler.setView(view);

                mWindowAttributes.copyFrom(attrs);
@@ -1905,7 +1902,6 @@ public final class ViewRootImpl implements ViewParent, 
        updateInternalDisplay(displayId, mView.getResources());

        mImeFocusController.onMovedToDisplay();

        mAttachInfo.mDisplayState = mDisplay.getState();

        mDisplayInstallOrientation = mDisplay.getInstallOrientation();

        // Internal state updated, now notify the view hierarchy.

        mView.dispatchMovedToDisplay(mDisplay, config);

    }
@@ -8235,7 +8231,7 @@ public final class ViewRootImpl implements ViewParent, 
        }



        final int transformHint = SurfaceControl.rotationToBufferTransform(

                (mDisplayInstallOrientation + mDisplay.getRotation()) % 4);

                (mDisplay.getInstallOrientation() + mDisplay.getRotation()) % 4);



        WindowLayout.computeSurfaceSize(mWindowAttributes, winConfig.getMaxBounds(), requestedWidth,

                requestedHeight, mWinFrameInScreen, mPendingDragResizing, mSurfaceSize);