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

Commit bdb8b938 authored by 0's avatar 0 Committed by Shawn Lee
Browse files

[flexiglass] Do not generateHeadsUpAnimation when dragging HUN 

In flexiglass, we now call generateHeadsUpAnimation whenever a notification is unpinned, which when we are dragging a HUN incorrectly sets ExpandableNotificationRow.mHeadsupDisappearRunning to true and leads us to provide the wrong height value to the HUN placeholder.

Bug: 357661886
Test: manually verified HUN height is correct throughout drag gesture (HUN expands to its expandedHeight as the shade expands)
Flag: com.android.systemui.scene_container
Change-Id: Ic1f3d681ef2a5a9b9ee8d7cc1efd891b0d1935d2
parent d611bb1d

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

+1 −1
Original line number Diff line number Diff line
@@ -5745,7 +5745,7 @@ public class NotificationStackScrollLayout 
        return mDisallowScrollingInThisMotion;

    }



    boolean isBeingDragged() {

    public boolean isBeingDragged() {

        return mIsBeingDragged;

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/ui/viewbinder/HeadsUpNotificationViewBinder.kt

+3 −1
Original line number Diff line number Diff line
@@ -51,7 +51,9 @@ constructor(private val viewModel: NotificationListViewModel) { 
                            }

                            removed.forEach { key ->

                                val row = obtainView(key)

                                if (!parentView.isBeingDragged()) {

                                    parentView.generateHeadsUpAnimation(row, /* isHeadsUp= */ false)

                                }

                                row.markHeadsUpSeen()

                            }

                        }