diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-22 12:27:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 12:27:51 +0000 |
| commit | aa7707ddc42ffc03070e7ab9a8c48e51b9cb9770 (patch) | |
| tree | fbbd2f2468b811de95eca609534ccdf82e9e6a9e /packages/SystemUI/src/com/android | |
| parent | 08a7b76441dd3dbdd9011201b287b6057d37a11a (diff) | |
| parent | 9cd731a013cca45807b2ae1ed19cecc53311a5c6 (diff) | |
| download | frameworks_base-aa7707ddc42ffc03070e7ab9a8c48e51b9cb9770.zip frameworks_base-aa7707ddc42ffc03070e7ab9a8c48e51b9cb9770.tar.gz frameworks_base-aa7707ddc42ffc03070e7ab9a8c48e51b9cb9770.tar.bz2 | |
Merge "Fix weird state with QS expansion."
Diffstat (limited to 'packages/SystemUI/src/com/android')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 7e3bf68..123a4f0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -545,6 +545,9 @@ public class NotificationPanelView extends PanelView implements } private void flingSettings(float vel, boolean expand) { float target = expand ? mQsMaxExpansionHeight : mQsMinExpansionHeight; + if (target == mQsExpansionHeight) { + return; + } ValueAnimator animator = ValueAnimator.ofFloat(mQsExpansionHeight, target); mFlingAnimationUtils.apply(animator, mQsExpansionHeight, target, vel); animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { |