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

Commit 6275f85d authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge "Remove ExpandableNotificationRow#getExtraBottomPadding()" into... 

Merge "Remove ExpandableNotificationRow#getExtraBottomPadding()" into tm-qpr-dev am: 44831bc1 am: b87f2980 am: a8ea1593 am: 45509e3f

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



Change-Id: I6dd9ce474798158f5a6532b988cf5ab4d1f35a10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df5d26c5 45509e3f

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

+0 −9
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private int mMaxSmallHeight;

    private int mMaxSmallHeightLarge;

    private int mMaxExpandedHeight;

    private int mIncreasedPaddingBetweenElements;

    private int mNotificationLaunchHeight;

    private boolean mMustStayOnScreen;
@@ -3068,14 +3067,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;

    }

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

+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.

     */

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

+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,