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

Commit 0ea7bc87 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix clipTopAmount when read in 2 more critical places" into tm-dev am:... 

Merge "Fix clipTopAmount when read in 2 more critical places" into tm-dev am: 8d2aafe8 am: f796907b am: 8c437d1e

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



Change-Id: Ie0d353bc816a7f4e3b743be5a843a05585cea900
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 306c6975 8c437d1e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -421,7 +421,7 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable { 
            outRect.top += getTop() + getTranslationY();

            outRect.top += getTop() + getTranslationY();

        }

        }

        outRect.bottom = outRect.top + getActualHeight();

        outRect.bottom = outRect.top + getActualHeight();

        outRect.top += getClipTopAmount();

        outRect.top += Math.max(0, getClipTopAmount());

    }

    }





    public boolean isSummaryWithChildren() {

    public boolean isSummaryWithChildren() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -855,7 +855,7 @@ public class NotificationChildrenContainer extends ViewGroup 
        for (int childIdx = 0; childIdx < count; childIdx++) {

        for (int childIdx = 0; childIdx < count; childIdx++) {

            ExpandableNotificationRow slidingChild = mAttachedChildren.get(childIdx);

            ExpandableNotificationRow slidingChild = mAttachedChildren.get(childIdx);

            float childTop = slidingChild.getTranslationY();

            float childTop = slidingChild.getTranslationY();

            float top = childTop + slidingChild.getClipTopAmount();

            float top = childTop + Math.max(0, slidingChild.getClipTopAmount());

            float bottom = childTop + slidingChild.getActualHeight();

            float bottom = childTop + slidingChild.getActualHeight();

            if (y >= top && y <= bottom) {

            if (y >= top && y <= bottom) {

                return slidingChild;

                return slidingChild;