| commit | 89444a380d85f8961a4a900734590571375b4f3f | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Wed Nov 12 16:27:26 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 12 16:27:28 2014 +0000 |
| tree | 32658faaa412ee415acbf946cfa3fc6e168be00c | |
| parent | 046757300c0a9b2043ff71e49bc3be50d5279443 [diff] | |
| parent | f336f4c13ad3be15e2b44266cd786685975425f2 [diff] |
Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev
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); }