Merge "Remove ExpandableView.minClipTopAmount which had no effect." into tm-qpr-dev (aa829148) · Commits · e / os / android_frameworks_base

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
		private ArrayList<View> mMatchParentViews = new ArrayList<View>();
		private static Rect mClipRect = new Rect();
		private boolean mWillBeGone;
		private int mMinClipTopAmount = 0;
		private boolean mClipToActualHeight = true;
		private boolean mChangingPosition = false;
		private ViewGroup mTransientContainer;
		@@ -477,14 +476,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
		mWillBeGone = willBeGone;
		}

		public int getMinClipTopAmount() {
		return mMinClipTopAmount;
		}

		public void setMinClipTopAmount(int minClipTopAmount) {
		mMinClipTopAmount = minClipTopAmount;
		}

		@Override
		public void setLayerType(int layerType, Paint paint) {
		// Allow resetting the layerType to NONE regardless of overlappingRendering

+0 −19

Original line number	Diff line number	Diff line
		@@ -4526,31 +4526,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		mClearAllInProgress = clearAllInProgress;
		mAmbientState.setClearAllInProgress(clearAllInProgress);
		mController.getNoticationRoundessManager().setClearAllInProgress(clearAllInProgress);
		handleClearAllClipping();
		}

		boolean getClearAllInProgress() {
		return mClearAllInProgress;
		}

		@ShadeViewRefactor(RefactorComponent.ADAPTER)
		private void handleClearAllClipping() {
		final int count = getChildCount();
		boolean previousChildWillBeDismissed = false;
		for (int i = 0; i < count; i++) {
		ExpandableView child = (ExpandableView) getChildAt(i);
		if (child.getVisibility() == GONE) {
		continue;
		}
		if (mClearAllInProgress && previousChildWillBeDismissed) {
		child.setMinClipTopAmount(child.getClipTopAmount());
		} else {
		child.setMinClipTopAmount(0);
		}
		previousChildWillBeDismissed = canChildBeCleared(child);
		}
		}

		@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
		public boolean isFooterViewNotGone() {
		return mFooterView != null