Merge "Fixed unminimizing during battery saving mode" into oc-dev (37b03b9e) · Commits · e / os / android_frameworks_base

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;
		}
		}
		}
		}