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

Commit af933898 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Chip] Add annotations to enable/disable ChipsModernization in test 

I frequently find myself writing
`@EnableFlags(StatusBarChipsModernization.FLAG_NAME)` in a test without
remembering to also enable StatusBarRootModernization, which
ChipsModernization is dependent on. This can cause test failures like
b/396595475 which are non-obvious.

This CL marks StatusBarChipsModernization.FLAG_NAME as deprecated to
discourage people from using it directly in tests and instead adds two
test annotations that should be used instead:

 - @EnableChipsModernization enables both ChipsModernization &
   RootModernization
 - @DisableChipsModernization that disables just ChipsModernization

This CL updates some test classes to use the new annotations, other test
classes will be updated in the next CL.

Bug: 372657935
Bug: 396595475
Flag: com.android.systemui.status_bar_chips_modernization
Test: atest OngoingActivityChipsWithNotifsViewModelTest
Change-Id: Ibafc7055f8bdda9766d8ab9e831af56fbe8ab243
parent 32d0aba7

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt

+12 −13
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.chips.casttootherdevice.ui.viewmodel



import android.content.DialogInterface

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.view.View

import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -48,10 +47,10 @@ import com.android.systemui.statusbar.chips.ui.model.ColorsModel 
import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.getStopActionFromDialog

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.mockSystemUIDialogFactory

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.DisableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import com.android.systemui.statusbar.policy.CastDevice

import com.android.systemui.util.time.fakeSystemClock

import com.google.common.truth.Truth.assertThat
@@ -438,7 +437,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_projectionStateEntireScreen_clickListenerShowsScreenCastDialog() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -454,7 +453,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_projectionStateSingleTask_clickListenerShowsScreenCastDialog() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -475,7 +474,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_routerStateCasting_clickListenerShowsGenericCastDialog() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -505,7 +504,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_projectionStateCasting_clickListenerHasCuj() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -525,7 +524,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    fun chip_routerStateCasting_clickListenerHasCuj() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -554,7 +553,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_routerStateCasting_hasClickBehavior() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -575,7 +574,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_projectionStateCasting_hasClickBehavior() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -588,7 +587,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_projectionStateEntireScreen_clickBehaviorShowsScreenCastDialog() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -605,7 +604,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_projectionStateSingleTask_clickBehaviorShowsScreenCastDialog() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)
@@ -627,7 +626,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chip_routerStateCasting_clickBehaviorShowsGenericCastDialog() =

        testScope.runTest {

            val latest by collectLastValue(underTest.chip)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt

+5 −8
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifCh 
import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.notification.data.model.activeNotificationModel

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore

import com.android.systemui.statusbar.notification.data.repository.UnconfinedFakeHeadsUpRowRepository
@@ -47,7 +46,8 @@ import com.android.systemui.statusbar.notification.headsup.PinnedStatus 
import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel

import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel

import com.android.systemui.statusbar.notification.stack.data.repository.headsUpNotificationRepository

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.DisableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import com.android.systemui.testKosmos

import com.android.systemui.util.time.fakeSystemClock

import com.google.common.truth.Truth.assertThat
@@ -802,11 +802,8 @@ class NotifChipsViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(

        FLAG_PROMOTE_NOTIFICATIONS_AUTOMATICALLY,

        StatusBarRootModernization.FLAG_NAME,

        StatusBarChipsModernization.FLAG_NAME,

    )

    @DisableFlags(FLAG_PROMOTE_NOTIFICATIONS_AUTOMATICALLY)

    @DisableChipsModernization

    fun chips_chipsModernizationDisabled_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chips)
@@ -834,7 +831,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { 


    @Test

    @DisableFlags(FLAG_PROMOTE_NOTIFICATIONS_AUTOMATICALLY)

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    fun chips_chipsModernizationEnabled_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chips)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt

+40 −41
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.res.Configuration 
import android.content.res.mainResources

import android.graphics.Bitmap

import android.graphics.drawable.BitmapDrawable

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.view.View

import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -57,7 +56,6 @@ import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsVie 
import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.assertIsScreenRecordChip

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.assertIsShareToAppChip

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipsViewModelTest.Companion.getStopActionFromDialog

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.notification.data.model.activeNotificationModel

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore

import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository
@@ -66,7 +64,8 @@ import com.android.systemui.statusbar.notification.data.repository.addNotifs 
import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel

import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.DisableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.EnableChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallTestHelper.addOngoingCallState

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallTestHelper.removeOngoingCallState

import com.android.systemui.testKosmos
@@ -138,7 +137,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_allHidden_bothPrimaryAndSecondaryHidden() =

        kosmos.runTest {
@@ -155,7 +154,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_allInactive() =

        kosmos.runTest {
@@ -184,7 +183,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertIsScreenRecordChip(latest)

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_screenRecordShow_restHidden_primaryIsScreenRecordSecondaryIsHidden() =

        kosmos.runTest {
@@ -201,7 +200,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_screenRecordActive_restInactive() =

        kosmos.runTest {
@@ -230,7 +229,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertIsScreenRecordChip(latest)

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_screenRecordShowAndCallShow_primaryIsScreenRecordSecondaryIsCall() =

        kosmos.runTest {
@@ -246,7 +245,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_screenRecordAndCallActive_inThatOrder() =

        kosmos.runTest {
@@ -265,7 +264,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModelLegacy())

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_oneChip_notSquished() =

        kosmos.runTest {
@@ -278,7 +277,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_oneChip_notSquished() =

        kosmos.runTest {
@@ -291,7 +290,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

        }



    @DisableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_twoTimerChips_isSmallPortrait_bothSquished() =

        kosmos.runTest {
@@ -307,7 +306,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

        }



    @EnableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_twoTimerChips_isSmallPortrait_bothSquished() =

        kosmos.runTest {
@@ -323,7 +322,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

        }



    @DisableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_countdownChipAndTimerChip_countdownNotSquished_butTimerSquished() =

        kosmos.runTest {
@@ -340,7 +339,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

        }



    @EnableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_countdownChipAndTimerChip_countdownNotSquished_butTimerSquished() =

        kosmos.runTest {
@@ -357,7 +356,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

        }



    @DisableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_numberOfChipsChanges_chipsGetSquishedAndUnsquished() =

        kosmos.runTest {
@@ -393,7 +392,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Inactive::class.java)

        }



    @EnableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_numberOfChipsChanges_chipsGetSquishedAndUnsquished() =

        kosmos.runTest {
@@ -425,7 +424,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

        }



    @DisableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_twoChips_isLandscape_notSquished() =

        kosmos.runTest {
@@ -448,7 +447,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

        }



    @EnableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_twoChips_isLandscape_notSquished() =

        kosmos.runTest {
@@ -471,7 +470,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

        }



    @DisableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_twoChips_isLargeScreen_notSquished() =

        kosmos.runTest {
@@ -490,7 +489,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
                .isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

        }



    @EnableFlags(StatusBarChipsModernization.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_twoChips_isLargeScreen_notSquished() =

        kosmos.runTest {
@@ -522,7 +521,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertIsScreenRecordChip(latest)

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_screenRecordShowAndShareToAppShow_primaryIsScreenRecordSecondaryIsHidden() =

        kosmos.runTest {
@@ -542,7 +541,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_screenRecordAndShareToApp_screenRecordIsActiveShareToAppIsInOverflow() =

        kosmos.runTest {
@@ -577,7 +576,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertIsShareToAppChip(latest)

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_shareToAppShowAndCallShow_primaryIsShareToAppSecondaryIsCall() =

        kosmos.runTest {
@@ -595,7 +594,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_shareToAppAndCallActive() =

        kosmos.runTest {
@@ -631,7 +630,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertIsCallChip(latest, callNotificationKey)

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_onlyCallShown_primaryIsCallSecondaryIsHidden() =

        kosmos.runTest {
@@ -651,7 +650,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_callActive_restInactive() =

        kosmos.runTest {
@@ -671,7 +670,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModelLegacy())

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_singlePromotedNotif_primaryIsNotifSecondaryIsHidden() =

        kosmos.runTest {
@@ -695,7 +694,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_singlePromotedNotif() =

        kosmos.runTest {
@@ -720,7 +719,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModelLegacy())

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_twoPromotedNotifs_primaryAndSecondaryAreNotifsInOrder() =

        kosmos.runTest {
@@ -751,7 +750,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_twoPromotedNotifs_bothActiveInOrder() =

        kosmos.runTest {
@@ -785,7 +784,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModelLegacy())

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_threePromotedNotifs_topTwoShown() =

        kosmos.runTest {
@@ -823,7 +822,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_threePromotedNotifs_topTwoActiveThirdInOverflow() =

        kosmos.runTest {
@@ -865,7 +864,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModelLegacy())

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_callAndPromotedNotifs_primaryIsCallSecondaryIsNotif() =

        kosmos.runTest {
@@ -898,7 +897,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_callAndPromotedNotifs_callAndFirstNotifActiveSecondNotifInOverflow() =

        kosmos.runTest {
@@ -935,7 +934,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModelLegacy())

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_screenRecordAndCallAndPromotedNotifs_notifsNotShown() =

        kosmos.runTest {
@@ -958,7 +957,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_screenRecordAndCallAndPromotedNotif_notifInOverflow() =

        kosmos.runTest {
@@ -1076,7 +1075,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertIsNotifChip(latest, context, notifIcon, "notif")

        }



    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_movesChipsAroundAccordingToPriority() =

        kosmos.runTest {
@@ -1152,7 +1151,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
            assertThat(unused).isEqualTo(MultipleOngoingActivityChipsModel())

        }



    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_movesChipsAroundAccordingToPriority() =

        kosmos.runTest {
@@ -1291,7 +1290,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
        }



    /** Regression test for b/347726238. */

    @DisableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @DisableChipsModernization

    @Test

    fun chipsLegacy_timerDoesNotResetAfterSubscribersRestart() =

        kosmos.runTest {
@@ -1327,7 +1326,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { 
        }



    /** Regression test for b/347726238. */

    @EnableFlags(StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME)

    @EnableChipsModernization

    @Test

    fun chips_timerDoesNotResetAfterSubscribersRestart() =

        kosmos.runTest {

packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/StatusBarChipsModernization.kt

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ import com.android.systemui.flags.RefactorFlagUtils 
@Suppress("NOTHING_TO_INLINE")

object StatusBarChipsModernization {

    /** The aconfig flag name */

    @Deprecated(

        "For tests, use @EnableChipsModernization or @DisableChipsModernization " +

            "annotations instead"

    )

    const val FLAG_NAME = Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION



    /** A token used for dependency declaration */

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/ongoingcall/DisableChipsModernization.kt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.phone.ongoingcall



import android.platform.test.annotations.DisableFlags



/** Disables all the flags necessary for [StatusBarChipsModernization.isEnabled] to return false. */

@DisableFlags(StatusBarChipsModernization.FLAG_NAME)

@Retention(AnnotationRetention.RUNTIME)

@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)

annotation class DisableChipsModernization