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

Commit 3cdbb9b0 authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Set mLastRectRotation to valid rotation" into ub-launcher3-rvc-dev

parents 210bb434 fb442a70

quickstep/src/com/android/quickstep/OrientationTouchTransformer.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -157,8 +157,9 @@ class OrientationTouchTransformer { 
                mMode != SysUINavigationMode.Mode.TWO_BUTTONS;

                mMode != SysUINavigationMode.Mode.TWO_BUTTONS;

        if (mEnableMultipleRegions) {

        if (mEnableMultipleRegions) {

            mQuickStepStartingRotation = info.rotation;

            mQuickStepStartingRotation = info.rotation;

        } else if (!enableMultipleRegions) {

        } else {

            mLastRectRotation = mQuickStepStartingRotation = QUICKSTEP_ROTATION_UNINITIALIZED;

            mLastRectRotation = 0;

            mQuickStepStartingRotation = QUICKSTEP_ROTATION_UNINITIALIZED;

        }

        }

        resetSwipeRegions(info);

        resetSwipeRegions(info);

    }

    }
@@ -293,6 +294,7 @@ class OrientationTouchTransformer { 
                        mLastRectTouched = rect;

                        mLastRectTouched = rect;

                        mLastRectRotation = rect.mRotation;

                        mLastRectRotation = rect.mRotation;

                        if (mEnableMultipleRegions && mCurrentDisplayRotation == mLastRectRotation) {

                        if (mEnableMultipleRegions && mCurrentDisplayRotation == mLastRectRotation) {

                            // TODO(b/154580671) might make this block unnecessary

                            // Start a touch session for the default nav region for the display

                            // Start a touch session for the default nav region for the display

                            mQuickStepStartingRotation = mLastRectTouched.mRotation;

                            mQuickStepStartingRotation = mLastRectTouched.mRotation;

                            resetSwipeRegions();

                            resetSwipeRegions();