Merge "Fixed flickering in panel overscroll" into lmp-preview-dev
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 b8a46c4..0ed3eec 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -700,8 +700,6 @@
// TODO: Figure out transition for collapsing when QS is open, adjust height here.
int maxPanelHeight = super.getMaxPanelHeight();
int emptyBottomMargin = mNotificationStackScroller.getEmptyBottomMargin();
- emptyBottomMargin = (int) Math.max(0,
- emptyBottomMargin - mNotificationStackScroller.getCurrentOverScrollAmount(true));
emptyBottomMargin += mStackScrollerContainer.getHeight()
- mNotificationStackScroller.getHeight();
int maxHeight = maxPanelHeight - emptyBottomMargin - mTopPaddingAdjustment;