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

Commit 159a8d06 authored by András Kurucz's avatar András Kurucz
Browse files

Rename ExpandableNotificationRow.setHeadsUpVisible to markHeadsUpSeen 

The current method name is misleading, as it's sometimes called when the
notification is disappearing (from the start of the HUN outro animation).

Bug: 325936094
Flag: NONE only renaming a method
Test: build systemui
Change-Id: I382b73834d3334ce33a6ed3faa2949a2adc973dd
parent 922f12ac

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ public final class NotificationEntry extends ListEntry implements NotificationRo 
    }



    public void setHeadsUpIsVisible() {

        if (row != null) row.setHeadsUpIsVisible();

        if (row != null) row.markHeadsUpSeen();

    }



    //TODO: i'm imagining a world where this isn't just the row, but I could be rwong

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

+2 −2
Original line number Diff line number Diff line
@@ -859,8 +859,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    }



    @Override

    public void setHeadsUpIsVisible() {

        super.setHeadsUpIsVisible();

    public void markHeadsUpSeen() {

        super.markHeadsUpSeen();

        mMustStayOnScreen = false;

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -637,7 +637,10 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable, Ro 
        return false;

    }



    public void setHeadsUpIsVisible() {

    /**

     * Called, when the notification has been seen by the user in the heads up state.

     */

    public void markHeadsUpSeen() {

    }



    public boolean showingPulsing() {

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

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public class ExpandableViewState extends ViewState { 
            expandableView.setInShelf(inShelf);



            if (headsUpIsVisible) {

                expandableView.setHeadsUpIsVisible();

                expandableView.markHeadsUpSeen();

            }

        }

    }
@@ -231,7 +231,7 @@ public class ExpandableViewState extends ViewState { 
        expandableView.setInShelf(this.inShelf);



        if (headsUpIsVisible) {

            expandableView.setHeadsUpIsVisible();

            expandableView.markHeadsUpSeen();

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ constructor(private val viewModel: NotificationListViewModel) { 
                            removed.forEach { key ->

                                val row = obtainView(key)

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

                                row.setHeadsUpIsVisible()

                                row.markHeadsUpSeen()

                            }

                        }

                    }