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 
am: 5b49464dc6

Change-Id: Id5efa71298cd71bb91aa3f08fb4bfe4eff43a183
This commit is contained in:
Matthew Ng
2017-05-23 17:57:26 +00:00
committed by android-build-merger
parent 9d08fca62f 5b49464dc6
commit 37b03b9e72
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -725,14 +725,21 @@ public class DividerView extends FrameLayout implements OnTouchListener,
mMinimizedSnapAlgorithm = null; mMinimizedSnapAlgorithm = null;
mDockedStackMinimized = minimized; mDockedStackMinimized = minimized;
initializeSnapAlgorithm(); initializeSnapAlgorithm();
if (!mIsInMinimizeInteraction && minimized) { if (mIsInMinimizeInteraction != minimized) {
mIsInMinimizeInteraction = true; if (minimized) {
mDividerPositionBeforeMinimized = DockedDividerUtils.calculateMiddlePosition( mIsInMinimizeInteraction = true;
isHorizontalDivision(), mStableInsets, mDisplayWidth, mDisplayHeight, mDividerPositionBeforeMinimized = DockedDividerUtils.calculateMiddlePosition(
mDividerSize); isHorizontalDivision(), mStableInsets, mDisplayWidth, mDisplayHeight,
mDividerSize);
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;
}
} }
} }
} }