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

Commit 8e108270 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed an issue where the clipping would be wrong when collapsing" into main

parents 1028f413 09d84fe1

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationViewTest.kt

+9 −0
Original line number Diff line number Diff line
@@ -101,4 +101,13 @@ class ActivatableNotificationViewTest : SysuiTestCase() { 
        assertThat(mView.topRoundness).isEqualTo(1f)

        assertThat(mView.roundableState.hashCode()).isEqualTo(roundableState.hashCode())

    }



    @Test

    fun getBackgroundBottom_respects_clipBottomAmount() {

        mView.actualHeight = 100

        assertThat(mView.backgroundBottom).isEqualTo(100)



        mView.clipBottomAmount = 10

        assertThat(mView.backgroundBottom).isEqualTo(90)

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public abstract class ExpandableOutlineView extends ExpandableView { 
        if (mCustomOutline) {

            return mOutlineRect.bottom;

        }

        return getActualHeight();

        return getActualHeight() - getClipBottomAmount();

    }



    protected Path getClipPath(boolean ignoreTranslation) {