Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed unminimizing during battery saving mode" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-23 17:44:04 +00:00
committed by Android (Google) Code Review
parent 1bc0286ef8 04f34304fb
commit 5b49464dc6
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
View File

@@ -725,7 +725,8 @@ public class DividerView extends FrameLayout implements OnTouchListener,
mMinimizedSnapAlgorithm = null; mMinimizedSnapAlgorithm = null;
mDockedStackMinimized = minimized; mDockedStackMinimized = minimized;
initializeSnapAlgorithm(); initializeSnapAlgorithm();
if (!mIsInMinimizeInteraction && minimized) { if (mIsInMinimizeInteraction != minimized) {
if (minimized) {
mIsInMinimizeInteraction = true; mIsInMinimizeInteraction = true;
mDividerPositionBeforeMinimized = DockedDividerUtils.calculateMiddlePosition( mDividerPositionBeforeMinimized = DockedDividerUtils.calculateMiddlePosition(
isHorizontalDivision(), mStableInsets, mDisplayWidth, mDisplayHeight, isHorizontalDivision(), mStableInsets, mDisplayWidth, mDisplayHeight,
@@ -733,6 +734,12 @@ public class DividerView extends FrameLayout implements OnTouchListener,
int position = mMinimizedSnapAlgorithm.getMiddleTarget().position; int position = mMinimizedSnapAlgorithm.getMiddleTarget().position;
resizeStack(position, position, mMinimizedSnapAlgorithm.getMiddleTarget()); resizeStack(position, position, mMinimizedSnapAlgorithm.getMiddleTarget());
} else {
resizeStack(mDividerPositionBeforeMinimized, mDividerPositionBeforeMinimized,
mSnapAlgorithm.calculateNonDismissingSnapTarget(
mDividerPositionBeforeMinimized));
mIsInMinimizeInteraction = false;
}
} }
} }
} }