diff options
3 files changed, 2 insertions, 18 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 951db43ed6cf..e28d486dc9fb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -191,7 +191,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private int mMaxSmallHeight; private int mMaxSmallHeightLarge; private int mMaxExpandedHeight; - private int mIncreasedPaddingBetweenElements; private int mNotificationLaunchHeight; private boolean mMustStayOnScreen; @@ -3109,14 +3108,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView return showingLayout != null && showingLayout.requireRowToHaveOverlappingRendering(); } - @Override - public int getExtraBottomPadding() { - if (mIsSummaryWithChildren && isGroupExpanded()) { - return mIncreasedPaddingBetweenElements; - } - return 0; - } - public void setInlineReplyAnimationFlagEnabled(boolean isEnabled) { mIsInlineReplyAnimationFlagEnabled = isEnabled; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java index 25c7264af047..9df6ba9910cc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java @@ -451,7 +451,7 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro protected void updateClipping() { if (mClipToActualHeight && shouldClipToActualHeight()) { int top = getClipTopAmount(); - int bottom = Math.max(Math.max(getActualHeight() + getExtraBottomPadding() + int bottom = Math.max(Math.max(getActualHeight() - mClipBottomAmount, top), mMinimumHeightForClipping); mClipRect.set(Integer.MIN_VALUE, top, Integer.MAX_VALUE, bottom); setClipBounds(mClipRect); @@ -592,13 +592,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro } /** - * @return padding used to alter how much of the view is clipped. - */ - public int getExtraBottomPadding() { - return 0; - } - - /** * @return true if the group's expansion state is changing, false otherwise. */ public boolean isGroupExpansionChanging() { 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 e2e2a2382976..2c088fa66a8a 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 @@ -4499,7 +4499,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable expandableView.setFakeShadowIntensity(0.0f, 0.0f, 0, 0); } else { float yLocation = previous.getTranslationY() + previous.getActualHeight() - - expandableView.getTranslationY() - previous.getExtraBottomPadding(); + expandableView.getTranslationY(); expandableView.setFakeShadowIntensity( diff / FakeShadowView.SHADOW_SIBLING_TRESHOLD, previous.getOutlineAlpha(), (int) yLocation, |