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

Commit 1ccb1ece authored by András Kurucz's avatar András Kurucz
Browse files

Rename isHeadsUpGoingAway to headsUpAnimatingAway 

There is a temporarily state for heads up notifications, when they are
not pinned anymore, but they are still visible on top of the screen for
animation reasons. We refer to this state by two different names from
the code. This CL unifies these namings.

Bug: 325936094
Test: atest SystemUITests
Flag: N/A
Change-Id: I818693757651c28cfb69ced65c07ecbc467ae99a
parent 8d91a33f

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ class KeyguardClockInteractorTest : SysuiTestCase() { 
            val value by collectLastValue(underTest.clockShouldBeCentered)

            kosmos.shadeRepository.setShadeMode(ShadeMode.Split)

            kosmos.activeNotificationListRepository.setActiveNotifs(1)

            kosmos.headsUpNotificationRepository.headsUpAnimatingAway.value = true

            kosmos.headsUpNotificationRepository.isHeadsUpAnimatingAway.value = true

            kosmos.keyguardRepository.setIsDozing(true)

            assertThat(value).isEqualTo(false)

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/TestableHeadsUpManager.java

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class TestableHeadsUpManager extends BaseHeadsUpManager { 
    }



    @Override

    public boolean isHeadsUpGoingAway() {

    public boolean isHeadsUpAnimatingAwayValue() {

        throw new UnsupportedOperationException();

    }
@@ -115,7 +115,7 @@ class TestableHeadsUpManager extends BaseHeadsUpManager { 
    }



    @Override

    public void setHeadsUpGoingAway(boolean headsUpGoingAway) {

    public void setHeadsUpAnimatingAway(boolean headsUpAnimatingAway) {

        throw new UnsupportedOperationException();

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/data/repository/HeadsUpRepository.kt

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ interface HeadsUpRepository { 


    /**

     * True if we are exiting the headsUp pinned mode, and some notifications might still be

     * animating out. This is used to keep the touchable regions in a reasonable state.

     * animating out. This is used to keep their view container visible.

     */

    val headsUpAnimatingAway: Flow<Boolean>

    val isHeadsUpAnimatingAway: Flow<Boolean>



    /** The heads up row that should be displayed on top. */

    val topHeadsUpRow: Flow<HeadsUpRowRepository?>

packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ class HeadsUpNotificationInteractor @Inject constructor(repository: HeadsUpRepos 
        }



    val isHeadsUpOrAnimatingAway: Flow<Boolean> =

        combine(hasPinnedRows, repository.headsUpAnimatingAway) { hasPinnedRows, animatingAway ->

        combine(hasPinnedRows, repository.isHeadsUpAnimatingAway) { hasPinnedRows, animatingAway ->

            hasPinnedRows || animatingAway

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java

+15 −14
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 
            StateFlowKt.MutableStateFlow(null);

    private final MutableStateFlow<Set<HeadsUpRowRepository>> mHeadsUpNotificationRows =

            StateFlowKt.MutableStateFlow(new HashSet<>());

    private final MutableStateFlow<Boolean> mHeadsUpGoingAway = StateFlowKt.MutableStateFlow(false);

    private final MutableStateFlow<Boolean> mHeadsUpAnimatingAway =

            StateFlowKt.MutableStateFlow(false);

    private boolean mReleaseOnExpandFinish;

    private boolean mTrackingHeadsUp;

    private final HashSet<String> mSwipedOutKeys = new HashSet<>();
@@ -184,7 +185,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 
    //  Public methods:



    /**

     * Add a listener to receive callbacks onHeadsUpGoingAway

     * Add a listener to receive callbacks {@link #setHeadsUpAnimatingAway(boolean)}

     */

    @Override

    public void addHeadsUpPhoneListener(OnHeadsUpPhoneListenerChange listener) {
@@ -264,7 +265,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 
        if (isExpanded != mIsExpanded) {

            mIsExpanded = isExpanded;

            if (isExpanded) {

                mHeadsUpGoingAway.setValue(false);

                mHeadsUpAnimatingAway.setValue(false);

            }

        }

    }
@@ -274,20 +275,15 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 
     * animating out. This is used to keep the touchable regions in a reasonable state.

     */

    @Override

    public void setHeadsUpGoingAway(boolean headsUpGoingAway) {

        if (headsUpGoingAway != mHeadsUpGoingAway.getValue()) {

    public void setHeadsUpAnimatingAway(boolean headsUpAnimatingAway) {

        if (headsUpAnimatingAway != mHeadsUpAnimatingAway.getValue()) {

            for (OnHeadsUpPhoneListenerChange listener : mHeadsUpPhoneListeners) {

                listener.onHeadsUpGoingAwayStateChanged(headsUpGoingAway);

                listener.onHeadsUpAnimatingAwayStateChanged(headsUpAnimatingAway);

            }

            mHeadsUpGoingAway.setValue(headsUpGoingAway);

            mHeadsUpAnimatingAway.setValue(headsUpAnimatingAway);

        }

    }



    @Override

    public boolean isHeadsUpGoingAway() {

        return mHeadsUpGoingAway.getValue();

    }



    /**

     * Notifies that a remote input textbox in notification gets active or inactive.

     *
@@ -504,8 +500,13 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 


    @Override

    @NonNull

    public Flow<Boolean> getHeadsUpAnimatingAway() {

        return mHeadsUpGoingAway;

    public Flow<Boolean> isHeadsUpAnimatingAway() {

        return mHeadsUpAnimatingAway;

    }



    @Override

    public boolean isHeadsUpAnimatingAwayValue() {

        return mHeadsUpAnimatingAway.getValue();

    }



    ///////////////////////////////////////////////////////////////////////////////////////////////