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

Commit 504d791c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use clipped content translation when dismissing a HUN." into sc-v2-dev... 

Merge "Use clipped content translation when dismissing a HUN." into sc-v2-dev am: da7e1b88 am: 3383e55c

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

Change-Id: I93286ac1b3abe41ea960c08f51a95bd2d83db8ba
parents 06f5fdba 3383e55c

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

+6 −1
Original line number Diff line number Diff line
@@ -3973,6 +3973,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            updateChronometers();

            requestChildrenUpdate();

            updateUseRoundedRectClipping();

            updateDismissBehavior();

        }

    }
@@ -4936,6 +4937,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        StringBuilder sb = new StringBuilder("[")

                .append(this.getClass().getSimpleName()).append(":")

                .append(" pulsing=").append(mPulsing ? "T" : "f")

                .append(" expanded=").append(mIsExpanded ? "T" : "f")

                .append(" headsUpPinned=").append(mInHeadsUpPinnedMode ? "T" : "f")

                .append(" qsClipping=").append(mShouldUseRoundedRectClipping ? "T" : "f")

                .append(" qsClipDismiss=").append(mDismissUsingRowTranslationX ? "T" : "f")

                .append(" visibility=").append(DumpUtilsKt.visibilityString(getVisibility()))

                .append(" alpha=").append(getAlpha())

                .append(" scrollY=").append(mAmbientState.getScrollY())
@@ -5463,7 +5468,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        // On the split keyguard, dismissing with clipping without a visual boundary looks odd,

        // so let's use the content dismiss behavior instead.

        boolean dismissUsingRowTranslationX = !mShouldUseSplitNotificationShade

                || mStatusBarState != StatusBarState.KEYGUARD;

                || (mStatusBarState != StatusBarState.KEYGUARD && mIsExpanded);

        if (mDismissUsingRowTranslationX != dismissUsingRowTranslationX) {

            mDismissUsingRowTranslationX = dismissUsingRowTranslationX;

            for (int i = 0; i < getChildCount(); i++) {