diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java | 16 |
1 files changed, 7 insertions, 9 deletions
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 9c26c69045d5..ccb0de4efd47 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -2041,11 +2041,9 @@ public class NotificationStackScrollLayout extends ViewGroup } private int getScrollRange() { - int contentHeight = getContentHeight(); - int scrollRange = Math.max(0, contentHeight - mMaxLayoutHeight); + int scrollRange = Math.max(0, mContentHeight - mMaxLayoutHeight); int imeInset = getImeInset(); - scrollRange += Math.min(imeInset, Math.max(0, - getContentHeight() - (getHeight() - imeInset))); + scrollRange += Math.min(imeInset, Math.max(0, mContentHeight - (getHeight() - imeInset))); return scrollRange; } @@ -2146,10 +2144,6 @@ public class NotificationStackScrollLayout extends ViewGroup return count; } - public int getContentHeight() { - return mContentHeight; - } - private void updateContentHeight() { int height = 0; float previousPaddingRequest = mPaddingBetweenElements; @@ -2213,7 +2207,11 @@ public class NotificationStackScrollLayout extends ViewGroup } } mIntrinsicContentHeight = height; - mContentHeight = height + mTopPadding + mBottomMargin; + + // We don't want to use the toppadding since that might be interpolated and we want + // to take the final value of the animation. + int topPadding = mAmbientState.isFullyDark() ? mDarkTopPadding : mRegularTopPadding; + mContentHeight = height + topPadding + mBottomMargin; updateScrollability(); clampScrollPosition(); mAmbientState.setLayoutMaxHeight(mContentHeight); |