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

Commit 61bcaf85 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Rename flag 

Renaming flag to send deleteIntent on user-initiated dismiss in order to
restart the workflow

Flag: com.android.systemui.media_controls_user_initiated_deleteintent
Bug: 342366185
Bug: 335875159
Test: atest NotificationMediaManagerTest
Change-Id: Ib742012138fe1a71b3480d78e9ebe9f12b05fc4c
parent 14d9971f

packages/SystemUI/aconfig/systemui.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ flag { 
}



flag {

  name: "media_controls_user_initiated_dismiss"

  name: "media_controls_user_initiated_deleteintent"

  namespace: "systemui"

  description: "Only dismiss media notifications when the control was removed by the user."

  bug: "335875159"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationMediaManagerTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ class NotificationMediaManagerTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DISMISS)

    @EnableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT)

    fun mediaDataRemoved_userInitiated_dismissNotif() {

        val notifEntryCaptor = argumentCaptor<NotificationEntry>()

        val notifEntry = mock<NotificationEntry>()
@@ -93,7 +93,7 @@ class NotificationMediaManagerTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DISMISS)

    @EnableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT)

    fun mediaDataRemoved_notUserInitiated_doesNotDismissNotif() {

        listenerCaptor.lastValue.onMediaDataRemoved(KEY, false)
@@ -101,7 +101,7 @@ class NotificationMediaManagerTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DISMISS)

    @DisableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT)

    fun mediaDataRemoved_notUserInitiated_flagOff_dismissNotif() {

        val notifEntryCaptor = argumentCaptor<NotificationEntry>()

        val notifEntry = mock<NotificationEntry>()

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

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.systemui.statusbar;



import static com.android.systemui.Flags.mediaControlsUserInitiatedDismiss;

import static com.android.systemui.Flags.mediaControlsUserInitiatedDeleteintent;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -178,7 +178,7 @@ public class NotificationMediaManager implements Dumpable { 


            @Override

            public void onMediaDataRemoved(@NonNull String key, boolean userInitiated) {

                if (mediaControlsUserInitiatedDismiss() && !userInitiated) {

                if (mediaControlsUserInitiatedDeleteintent() && !userInitiated) {

                    // Dismissing the notification will send the app's deleteIntent, so ignore if

                    // this was an automatic removal

                    Log.d(TAG, "Not dismissing " + key + " because it was removed by the system");