diff options
3 files changed, 12 insertions, 8 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 8ebadfbd3b25..c27962a2f2f0 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 @@ -535,6 +535,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd private float mLastSentAppear; private float mLastSentExpandedHeight; private boolean mWillExpand; + private int mGapHeight; private int mWaterfallTopInset; @@ -1060,6 +1061,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd Resources res = context.getResources(); mCollapsedSize = res.getDimensionPixelSize(R.dimen.notification_min_height); + mGapHeight = res.getDimensionPixelSize(R.dimen.notification_section_divider_height); mStackScrollAlgorithm.initView(context); mAmbientState.reload(context); mPaddingBetweenElements = Math.max(1, @@ -5093,8 +5095,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd } @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) - public int getFooterViewHeight() { - return mFooterView == null ? 0 : mFooterView.getHeight() + mPaddingBetweenElements; + public int getFooterViewHeightWithPadding() { + return mFooterView == null ? 0 : mFooterView.getHeight() + + mPaddingBetweenElements + + mGapHeight; } @ShadeViewRefactor(RefactorComponent.SHADE_VIEW) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index e720d820fd76..0b664e68b426 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -2397,8 +2397,8 @@ public class NotificationPanelViewController extends PanelViewController { } @Override - protected int getClearAllHeight() { - return mNotificationStackScroller.getFooterViewHeight(); + protected int getClearAllHeightWithPadding() { + return mNotificationStackScroller.getFooterViewHeightWithPadding(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java index a902e1b0c960..caddc4a874f4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java @@ -537,9 +537,9 @@ public abstract class PanelViewController { // the animation only to the last notification, and then jump to the maximum panel height so // clear all just fades in and the decelerating motion is towards the last notification. final boolean clearAllExpandHack = expand && - shouldExpandToTopOfClearAll(getMaxPanelHeight() - getClearAllHeight()); + shouldExpandToTopOfClearAll(getMaxPanelHeight() - getClearAllHeightWithPadding()); if (clearAllExpandHack) { - target = getMaxPanelHeight() - getClearAllHeight(); + target = getMaxPanelHeight() - getClearAllHeightWithPadding(); } if (target == mExpandedHeight || getOverExpansionAmount() > 0f && expand) { notifyExpandingFinished(); @@ -1030,9 +1030,9 @@ public abstract class PanelViewController { protected abstract boolean isClearAllVisible(); /** - * @return the height of the clear all button, in pixels + * @return the height of the clear all button, in pixels including padding */ - protected abstract int getClearAllHeight(); + protected abstract int getClearAllHeightWithPadding(); public void setHeadsUpManager(HeadsUpManagerPhone headsUpManager) { mHeadsUpManager = headsUpManager; |