diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java | 6 |
1 files changed, 2 insertions, 4 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 eb1efd76a5c2..f688bb0e376e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -729,7 +729,7 @@ public class NotificationStackScrollLayout extends ViewGroup } private void updateAlgorithmLayoutMinHeight() { - mAmbientState.setLayoutMinHeight(mQsExpanded && !onKeyguard() || isHeadsUpTransition() + mAmbientState.setLayoutMinHeight(mQsExpanded || isHeadsUpTransition() ? getLayoutMinHeight() : 0); } @@ -2453,7 +2453,6 @@ public class NotificationStackScrollLayout extends ViewGroup } int finalHeight = ExpandableViewState.getFinalActualHeight(lastView); int finalBottom = finalTranslationY + finalHeight - lastView.getClipBottomAmount(); - finalBottom = Math.min(finalBottom, getHeight()); if (mAnimateNextBackgroundBottom || mBottomAnimator == null && mCurrentBounds.bottom == finalBottom || mBottomAnimator != null && mEndAnimationRect.bottom == finalBottom) { @@ -2462,7 +2461,6 @@ public class NotificationStackScrollLayout extends ViewGroup } else { bottom = (int) (lastView.getTranslationY() + lastView.getActualHeight() - lastView.getClipBottomAmount()); - bottom = Math.min(bottom, getHeight()); } } else { top = mTopPadding; @@ -2475,7 +2473,7 @@ public class NotificationStackScrollLayout extends ViewGroup top = Math.max(0, top); } mBackgroundBounds.top = top; - mBackgroundBounds.bottom = Math.min(getHeight(), Math.max(bottom, top)); + mBackgroundBounds.bottom = Math.max(bottom, top); } private ActivatableNotificationView getFirstPinnedHeadsUp() { |