Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ExpandableView.minClipTopAmount which had no effect." into tm-qpr-dev

Browse Source
This commit is contained in:
Jeff DeCew
2022-05-23 18:31:40 +00:00
committed by Android (Google) Code Review
parent 85fc0ce347 4fa65dc364
commit aa829148ed
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
private ArrayList<View> mMatchParentViews = new ArrayList<View>(); private ArrayList<View> mMatchParentViews = new ArrayList<View>();
private static Rect mClipRect = new Rect(); private static Rect mClipRect = new Rect();
private boolean mWillBeGone; private boolean mWillBeGone;
private int mMinClipTopAmount = 0;
private boolean mClipToActualHeight = true; private boolean mClipToActualHeight = true;
private boolean mChangingPosition = false; private boolean mChangingPosition = false;
private ViewGroup mTransientContainer; private ViewGroup mTransientContainer;
@@ -477,14 +476,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
mWillBeGone = willBeGone; mWillBeGone = willBeGone;
} }
public int getMinClipTopAmount() {
return mMinClipTopAmount;
}
public void setMinClipTopAmount(int minClipTopAmount) {
mMinClipTopAmount = minClipTopAmount;
}
@Override @Override
public void setLayerType(int layerType, Paint paint) { public void setLayerType(int layerType, Paint paint) {
// Allow resetting the layerType to NONE regardless of overlappingRendering // Allow resetting the layerType to NONE regardless of overlappingRendering

19
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -4526,31 +4526,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
mClearAllInProgress = clearAllInProgress; mClearAllInProgress = clearAllInProgress;
mAmbientState.setClearAllInProgress(clearAllInProgress); mAmbientState.setClearAllInProgress(clearAllInProgress);
mController.getNoticationRoundessManager().setClearAllInProgress(clearAllInProgress); mController.getNoticationRoundessManager().setClearAllInProgress(clearAllInProgress);
handleClearAllClipping();
} }
boolean getClearAllInProgress() { boolean getClearAllInProgress() {
return mClearAllInProgress; 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) @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
public boolean isFooterViewNotGone() { public boolean isFooterViewNotGone() {
return mFooterView != null return mFooterView != null