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

Commit 873a664e authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Fixed unminimizing during battery saving mode" into oc-dev am: 5b49464d 

am: 37b03b9e

Change-Id: I12e1586a3c1a7a9e506db822c3a779f7c633c50d
parents 45ef07f7 37b03b9e

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+15 −8
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            mMinimizedSnapAlgorithm = null;

            mDockedStackMinimized = minimized;

            initializeSnapAlgorithm();

            if (!mIsInMinimizeInteraction && minimized) {

            if (mIsInMinimizeInteraction != minimized) {

                if (minimized) {

                    mIsInMinimizeInteraction = true;

                    mDividerPositionBeforeMinimized = DockedDividerUtils.calculateMiddlePosition(

                            isHorizontalDivision(), mStableInsets, mDisplayWidth, mDisplayHeight,
@@ -733,6 +734,12 @@ public class DividerView extends FrameLayout implements OnTouchListener, 


                    int position = mMinimizedSnapAlgorithm.getMiddleTarget().position;

                    resizeStack(position, position, mMinimizedSnapAlgorithm.getMiddleTarget());

                } else {

                    resizeStack(mDividerPositionBeforeMinimized, mDividerPositionBeforeMinimized,

                            mSnapAlgorithm.calculateNonDismissingSnapTarget(

                                    mDividerPositionBeforeMinimized));

                    mIsInMinimizeInteraction = false;

                }

            }

        }

    }