Merge "Remove ExpandableNotificationRow#getExtraBottomPadding()" into tm-qpr-dev (44831bc1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −8

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -591,13 +591,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro
		return mTransientContainer;
		}

		/**
		* @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.
		*/

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,