From 4fa65dc364f93a83c4217be0b7b89914fda2c044 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Fri, 20 May 2022 15:37:10 +0000 Subject: [PATCH] Remove ExpandableView.minClipTopAmount which had no effect. Bug: 230080345 Test: manual Change-Id: I0b116776a6b5b311f0b34804d5f70dfb86ebb294 --- .../notification/row/ExpandableView.java | 9 --------- .../stack/NotificationStackScrollLayout.java | 19 ------------------- 2 files changed, 28 deletions(-) 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 22a6b0a4bae48..4f018ba2b3385 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 @@ -58,7 +58,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable { private ArrayList mMatchParentViews = new ArrayList(); 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 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 24369e7b860f1..5e2ae6b6b0cbc 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 @@ -4519,31 +4519,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