diff options
2 files changed, 7 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index fbcfef3964af..153ba514fc33 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -2554,12 +2554,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable int childCount = getChildCount(); for (int i = 0; i < childCount; i++) { ExpandableView child = (ExpandableView) getChildAt(i); - if (child.getVisibility() != View.GONE && !(child instanceof StackScrollerDecorView) - && child != mShelf) { + if (child.getVisibility() != View.GONE + && !(child instanceof StackScrollerDecorView) + && child != mShelf + && !mAmbientState.getDraggedViews().contains(child)) { children.add(child); } } - return children; } @@ -5524,10 +5525,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable void addDraggedView(View view) { mAmbientState.onBeginDrag(view); + updateFirstAndLastBackgroundViews(); } void removeDraggedView(View view) { mAmbientState.onDragFinished(view); + updateFirstAndLastBackgroundViews(); } void setTopHeadsUpEntry(NotificationEntry topEntry) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 7cee365bc7d3..f5385050f063 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -463,7 +463,7 @@ public class NotificationStackScrollLayoutController { @Override public void onChildSnappedBack(View animView, float targetLeft) { - mView.addDraggedView(animView); + mView.removeDraggedView(animView); mView.updateContinuousShadowDrawing(); mView.updateContinuousBackgroundDrawing(); if (animView instanceof ExpandableNotificationRow) { |