Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e69d7c9 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Remove ExpandableView.minClipTopAmount which had no effect." into... 

Merge "Remove ExpandableView.minClipTopAmount which had no effect." into tm-qpr-dev am: aa829148 am: 1ceb9ddc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18530878



Change-Id: I7fe744e24201e0665b2bb7553b0bd0285d505653
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c254b0fe 1ceb9ddc

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

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

+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