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

Browse Source 
am: e8dceabd98

Change-Id: I8f6b3e2f853ff5a066de02ae0a006ebb4f157078
This commit is contained in:
Selim Cinek
2017-06-21 19:07:12 +00:00
committed by android-build-merger
parent 1d50b00962 e8dceabd98
commit 9dfc970b63
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

@@ -303,10 +303,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()) {
@@ -611,6 +611,9 @@ public abstract class PanelView extends FrameLayout {
protected void cancelHeightAnimator() {
if (mHeightAnimator != null) {
if (mHeightAnimator.isRunning()) {
mPanelUpdateWhenAnimatorEnds = false;
}
mHeightAnimator.cancel();
}
endClosing();