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

Merge "Fixed a bug where the panel could be stuck" into oc-dev am: e8dceabd98

Browse Source 
am: 9dfc970b63

Change-Id: I00ea048b80625dfeda1ca532d4b7c90f3e57b96f
This commit is contained in:
Selim Cinek
2017-06-21 19:14:34 +00:00
committed by android-build-merger
parent 9a95f99f59 9dfc970b63
commit 978f98a3e1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
View File

@@ -304,10 +304,10 @@ public abstract class PanelView extends FrameLayout {
trackMovement(event);
if (!mGestureWaitForTouchSlop || (mHeightAnimator != null && !mHintAnimationRunning)
|| mPeekAnimator != null) {
cancelHeightAnimator();
cancelPeek();
mTouchSlopExceeded = (mHeightAnimator != null && !mHintAnimationRunning)
|| mPeekAnimator != null;
cancelHeightAnimator();
cancelPeek();
onTrackingStarted();
}
if (isFullyCollapsed() && !mHeadsUpManager.hasPinnedHeadsUp()) {
@@ -612,6 +612,9 @@ public abstract class PanelView extends FrameLayout {
protected void cancelHeightAnimator() {
if (mHeightAnimator != null) {
if (mHeightAnimator.isRunning()) {
mPanelUpdateWhenAnimatorEnds = false;
}
mHeightAnimator.cancel();
}
endClosing();