| commit | 1419db40f75be642f9d503e51ecc2b205f792bcd | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Wed Nov 12 16:29:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 16:29:24 2014 +0000 |
| tree | c1239c1be97d399ba99fa4df9d486bd2a997d1f1 | |
| parent | 087c96f8c9ae18831707b0c93f37d0d3438e88e1 [diff] | |
| parent | 89444a380d85f8961a4a900734590571375b4f3f [diff] |
am 89444a38: Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev * commit '89444a380d85f8961a4a900734590571375b4f3f': Solved notification overlay issue once and for all
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index ab25c45..e63be97 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -2008,6 +2008,9 @@ mStackScrollAlgorithm.onExpansionStopped(); if (!mIsExpanded) { mOwnScrollY = 0; + + // lets make sure nothing is in the overlay anymore + getOverlay().clear(); } }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java index 674642b..a56440c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
@@ -794,6 +794,11 @@ mHostLayout.getOverlay().remove(changingView); } }); + } else if (event.animationType == + NotificationStackScrollLayout.AnimationEvent.ANIMATION_TYPE_REMOVE_SWIPED_OUT) { + // A race condition can trigger the view to be added to the overlay even though + // it is swiped out. So let's remove it + mHostLayout.getOverlay().remove(changingView); } mNewEvents.add(event); }