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

Commit b650eb36 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Migrate EmptyShadeView to recommended architecture 

This is a step towards making the empty shade text react to changes in
Modes instead of just mentioning DND.

Bug: 366003631
Bug: 308591475
Flag: android.app.modes_ui_empty_shade
Test: EmptyShadeViewModelTest & tested manually with flag on and off

Change-Id: I45ab6ad5d6c85f13891a9fdcdfdff8e69068d783
parent 2ecace1d

core/java/android/app/notification.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ flag { 
  }

}



flag {

  name: "modes_ui_empty_shade"

  namespace: "systemui"

  description: "Shows mode that is currently blocking notifications in the empty shade; dependent on flags modes_api and modes_ui"

  bug: "366003631"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "modes_ui_test"

  namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/emptyshade/ui/viewmodel/EmptyShadeViewModelTest.kt

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

 * Copyright (C) 2024 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.notification.emptyshade.ui.viewmodel



import android.app.NotificationManager.Policy

import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.FlagsParameterization

import android.provider.Settings

import androidx.test.filters.SmallTest

import com.android.settingslib.notification.data.repository.updateNotificationPolicy

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.kosmos.testScope

import com.android.systemui.res.R

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

import com.android.systemui.statusbar.notification.emptyshade.shared.ModesEmptyShadeFix

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor

import com.android.systemui.statusbar.policy.data.repository.zenModeRepository

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@OptIn(ExperimentalCoroutinesApi::class)

@RunWith(ParameterizedAndroidJunit4::class)

@SmallTest

@EnableFlags(FooterViewRefactor.FLAG_NAME)

class EmptyShadeViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val zenModeRepository = kosmos.zenModeRepository

    private val activeNotificationListRepository = kosmos.activeNotificationListRepository



    private val underTest = kosmos.emptyShadeViewModel



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Test

    fun areNotificationsHiddenInShade_true() =

        testScope.runTest {

            val hidden by collectLastValue(underTest.areNotificationsHiddenInShade)



            zenModeRepository.updateNotificationPolicy(

                suppressedVisualEffects = Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST

            )

            zenModeRepository.updateZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS)

            runCurrent()



            assertThat(hidden).isTrue()

        }



    @Test

    fun areNotificationsHiddenInShade_false() =

        testScope.runTest {

            val hidden by collectLastValue(underTest.areNotificationsHiddenInShade)



            zenModeRepository.updateNotificationPolicy(

                suppressedVisualEffects = Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST

            )

            zenModeRepository.updateZenMode(Settings.Global.ZEN_MODE_OFF)

            runCurrent()



            assertThat(hidden).isFalse()

        }



    @Test

    fun hasFilteredOutSeenNotifications_true() =

        testScope.runTest {

            val hasFilteredNotifs by collectLastValue(underTest.hasFilteredOutSeenNotifications)



            activeNotificationListRepository.hasFilteredOutSeenNotifications.value = true

            runCurrent()



            assertThat(hasFilteredNotifs).isTrue()

        }



    @Test

    fun hasFilteredOutSeenNotifications_false() =

        testScope.runTest {

            val hasFilteredNotifs by collectLastValue(underTest.hasFilteredOutSeenNotifications)



            activeNotificationListRepository.hasFilteredOutSeenNotifications.value = false

            runCurrent()



            assertThat(hasFilteredNotifs).isFalse()

        }



    @Test

    @EnableFlags(ModesEmptyShadeFix.FLAG_NAME)

    fun text_changesWhenNotifsHiddenInShade() =

        testScope.runTest {

            val text by collectLastValue(underTest.text)



            zenModeRepository.updateNotificationPolicy(

                suppressedVisualEffects = Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST

            )

            zenModeRepository.updateZenMode(Settings.Global.ZEN_MODE_OFF)

            runCurrent()



            assertThat(text).isEqualTo(R.string.empty_shade_text)



            zenModeRepository.updateNotificationPolicy(

                suppressedVisualEffects = Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST

            )

            zenModeRepository.updateZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS)

            runCurrent()



            assertThat(text).isEqualTo(R.string.dnd_suppressing_shade_text)

        }



    @Test

    @EnableFlags(ModesEmptyShadeFix.FLAG_NAME)

    fun footer_isVisibleWhenSeenNotifsAreFilteredOut() =

        testScope.runTest {

            val footerVisible by collectLastValue(underTest.footer.isVisible)



            activeNotificationListRepository.hasFilteredOutSeenNotifications.value = false

            runCurrent()



            assertThat(footerVisible).isFalse()



            activeNotificationListRepository.hasFilteredOutSeenNotifications.value = true

            runCurrent()



            assertThat(footerVisible).isTrue()

        }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt

+0 −55
Original line number Diff line number Diff line
@@ -18,12 +18,9 @@ 


package com.android.systemui.statusbar.notification.stack.ui.viewmodel



import android.app.NotificationManager.Policy

import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.FlagsParameterization

import android.provider.Settings

import androidx.test.filters.SmallTest

import com.android.settingslib.notification.data.repository.updateNotificationPolicy

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.DisableSceneContainer
@@ -46,7 +43,6 @@ import com.android.systemui.statusbar.notification.data.repository.setActiveNoti 
import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor

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

import com.android.systemui.statusbar.policy.data.repository.fakeUserSetupRepository

import com.android.systemui.statusbar.policy.data.repository.zenModeRepository

import com.android.systemui.statusbar.policy.fakeConfigurationController

import com.android.systemui.testKosmos

import com.android.systemui.util.ui.isAnimating
@@ -79,7 +75,6 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
    private val fakeRemoteInputRepository = kosmos.fakeRemoteInputRepository

    private val fakeUserSetupRepository = kosmos.fakeUserSetupRepository

    private val headsUpRepository = kosmos.headsUpNotificationRepository

    private val zenModeRepository = kosmos.zenModeRepository



    private val shadeTestUtil by lazy { kosmos.shadeTestUtil }
@@ -265,56 +260,6 @@ class NotificationListViewModelTest(flags: FlagsParameterization) : SysuiTestCas 
            assertThat(shouldShow).isFalse()

        }



    @Test

    fun areNotificationsHiddenInShade_true() =

        testScope.runTest {

            val hidden by collectLastValue(underTest.areNotificationsHiddenInShade)



            zenModeRepository.updateNotificationPolicy(

                suppressedVisualEffects = Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST

            )

            zenModeRepository.updateZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS)

            runCurrent()



            assertThat(hidden).isTrue()

        }



    @Test

    fun areNotificationsHiddenInShade_false() =

        testScope.runTest {

            val hidden by collectLastValue(underTest.areNotificationsHiddenInShade)



            zenModeRepository.updateNotificationPolicy(

                suppressedVisualEffects = Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST

            )

            zenModeRepository.updateZenMode(Settings.Global.ZEN_MODE_OFF)

            runCurrent()



            assertThat(hidden).isFalse()

        }



    @Test

    fun hasFilteredOutSeenNotifications_true() =

        testScope.runTest {

            val hasFilteredNotifs by collectLastValue(underTest.hasFilteredOutSeenNotifications)



            activeNotificationListRepository.hasFilteredOutSeenNotifications.value = true

            runCurrent()



            assertThat(hasFilteredNotifs).isTrue()

        }



    @Test

    fun hasFilteredOutSeenNotifications_false() =

        testScope.runTest {

            val hasFilteredNotifs by collectLastValue(underTest.hasFilteredOutSeenNotifications)



            activeNotificationListRepository.hasFilteredOutSeenNotifications.value = false

            runCurrent()



            assertThat(hasFilteredNotifs).isFalse()

        }



    @Test

    fun shouldIncludeFooterView_trueWhenShade() =

        testScope.runTest {

packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ import com.android.systemui.keyguard.MigrateClocksToBlueprint 
import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.shade.shared.flag.DualShade

import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag

import com.android.systemui.statusbar.notification.emptyshade.shared.ModesEmptyShadeFix

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor

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

import com.android.systemui.statusbar.notification.shared.NotificationMinimalismPrototype
@@ -56,6 +58,8 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        NotificationAvalancheSuppression.token dependsOn VisualInterruptionRefactor.token

        PriorityPeopleSection.token dependsOn SortBySectionTimeFlag.token

        NotificationMinimalismPrototype.token dependsOn NotificationThrottleHun.token

        ModesEmptyShadeFix.token dependsOn FooterViewRefactor.token

        ModesEmptyShadeFix.token dependsOn modesUi



        // SceneContainer dependencies

        SceneContainerFlag.getFlagDependencies().forEach { (alpha, beta) -> alpha dependsOn beta }

packages/SystemUI/src/com/android/systemui/statusbar/notification/emptyshade/shared/ModesEmptyShadeFix.kt

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

 * Copyright (C) 2024 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.notification.emptyshade.shared



import android.app.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for reading or using the modes_ui_empty_shade flag state. */

@Suppress("NOTHING_TO_INLINE")

object ModesEmptyShadeFix {

    /** The aconfig flag name */

    const val FLAG_NAME = Flags.FLAG_MODES_UI_EMPTY_SHADE



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.modesUiEmptyShade()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the

     * unintended behaviors caused by accidentally running new logic, while also crashing on an eng

     * build to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun isUnexpectedlyInLegacyMode() =

        RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is not enabled to ensure that the refactor author catches issues in testing.

     * Caution!! Using this check incorrectly will cause crashes in nextfood builds!

     */

    @JvmStatic

    inline fun assertInNewMode() = RefactorFlagUtils.assertInNewMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is enabled to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)

}