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

Commit fab0cbf9 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Rename alerting: LaunchFSIProvider, RowAppearCoordinator" into main

parents 23d331a9 51cc4824

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinator.kt

+1 −1
Original line number Diff line number Diff line
@@ -76,6 +76,6 @@ class RowAppearanceCoordinator @Inject internal constructor( 
        // Show/hide the feedback icon

        controller.setFeedbackIcon(mAssistantFeedbackController.getFeedbackIcon(entry))

        // Show the "alerted" bell icon

        controller.setLastAudiblyAlertedMs(entry.lastAudiblyAlertedMs)

        controller.setLastAudibleMs(entry.lastAudiblyAlertedMs)

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/LaunchFullScreenIntentProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class LaunchFullScreenIntentProvider @Inject constructor() { 
    private val listeners = ListenerSet<Listener>()



    /**

     * Registers a listener with this provider. These listeners will be alerted whenever a full

     * Registers a listener with this provider. These listeners will be updated whenever a full

     * screen intent should be launched for a notification entry.

     */

    fun registerListener(listener: Listener) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NotifRowController.kt

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ interface NotifRowController { 
    fun setSystemExpanded(systemExpanded: Boolean)



    /**

     * Sets the timestamp that the notification was last audibly alerted, which the row uses to

     * Sets the timestamp that the notification was last audible, which the row uses to

     * show a bell icon in the header which indicates to the user which notification made a noise.

     */

    fun setLastAudiblyAlertedMs(lastAudiblyAlertedMs: Long)

    fun setLastAudibleMs(lastAudibleMs: Long)



    /** Shows the given feedback icon, or hides the icon if null. */

    fun setFeedbackIcon(icon: FeedbackIcon?)

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

+2 −2
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ public class ExpandableNotificationRowController implements NotifViewController 
    }



    @Override

    public void setLastAudiblyAlertedMs(long lastAudiblyAlertedMs) {

        mView.setLastAudiblyAlertedMs(lastAudiblyAlertedMs);

    public void setLastAudibleMs(long lastAudibleMs) {

        mView.setLastAudiblyAlertedMs(lastAudibleMs);

    }



    @Override

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinatorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ class RowAppearanceCoordinatorTest : SysuiTestCase() { 
    @Test

    fun testSetLastAudiblyAlerted() {

        afterRenderEntryListener.onAfterRenderEntry(entry1, controller1)

        verify(controller1).setLastAudiblyAlertedMs(eq(17.toLong()))

        verify(controller1).setLastAudibleMs(eq(17.toLong()))

    }



    @Test