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

Commit 9cbd4a0f authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Fix calculating Notification amountInShelf" into main

parents 3784154c 7b75db9f

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+0 −1
Original line number Diff line number Diff line
@@ -766,7 +766,6 @@ public class NotificationShelf extends ActivatableNotificationView { 
            }



        } else if (viewEnd >= shelfClipStart

                && view.isInShelf()

                && (mAmbientState.isShadeExpanded()

                || (!view.isPinned() && !view.isHeadsUpAnimatingAway()))) {

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

+3 −0
Original line number Diff line number Diff line
@@ -720,6 +720,9 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro 
        mInShelf = inShelf;

    }



    /**

     * @return true if the view is currently fully in the notification shelf.

     */

    public boolean isInShelf() {

        return mInShelf;

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ open class NotificationShelfTest : SysuiTestCase() { 


        whenever(expandableView.minHeight).thenReturn(25)

        whenever(expandableView.shelfTransformationTarget).thenReturn(null) // use translationY

        whenever(expandableView.isInShelf).thenReturn(true)

        whenever(expandableView.isInShelf).thenReturn(false)



        whenever(ambientState.isOnKeyguard).thenReturn(true)

        whenever(ambientState.isExpansionChanging).thenReturn(false)