Merge "Use BannerMessagePrefs on SC homepage when expressive design enabled." into main

4 files changed, 108 insertions, 31 deletions

diff --git a/tests/functional/safetycenter/safetycenteractivity/Android.bp b/tests/functional/safetycenter/safetycenteractivity/Android.bp
index ea5f9f286..2346a0d5f 100644
--- a/tests/functional/safetycenter/safetycenteractivity/Android.bp
+++ b/tests/functional/safetycenter/safetycenteractivity/Android.bp
@@ -29,6 +29,7 @@ android_test {
         "src/**/*.kt",
     ],
     static_libs: [
+        "aconfig_settingstheme_exported_flags_java_lib",
         "androidx.test.rules",
         "androidx.test.ext.junit",
         "compatibility-device-preconditions",
diff --git a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
index 09a32f058..fb577e8f6 100644
--- a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
+++ b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt
@@ -21,6 +21,9 @@ import android.os.Build
 import android.os.Build.VERSION_CODES.TIRAMISU
 import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE
 import android.os.Bundle
+import android.platform.test.annotations.RequiresFlagsDisabled
+import android.platform.test.flag.junit.CheckFlagsRule
+import android.platform.test.flag.junit.DeviceFlagsValueProvider
 import android.safetycenter.SafetyCenterManager.EXTRA_SAFETY_SOURCE_ID
 import android.safetycenter.SafetyCenterManager.EXTRA_SAFETY_SOURCE_ISSUE_ID
 import android.safetycenter.SafetySourceData.SEVERITY_LEVEL_CRITICAL_WARNING
@@ -74,6 +77,7 @@ import com.android.safetycenter.testing.UiTestHelper.waitPageTitleDisplayed
 import com.android.safetycenter.testing.UiTestHelper.waitSourceDataDisplayed
 import com.android.safetycenter.testing.UiTestHelper.waitSourceIssueDisplayed
 import com.android.safetycenter.testing.UiTestHelper.waitSourceIssueNotDisplayed
+import com.android.settingslib.widget.theme.flags.Flags as SettingsThemeFlags
 import java.util.regex.Pattern
 import org.junit.After
 import org.junit.Assume.assumeFalse
@@ -95,6 +99,8 @@ class SafetyCenterActivityTest {
     @get:Rule(order = 2) val safetyCenterTestRule = SafetyCenterTestRule(safetyCenterTestHelper)
     @get:Rule(order = 3) val disableAnimationRule = DisableAnimationRule()
     @get:Rule(order = 4) val freezeRotationRule = FreezeRotationRule()
+    @get:Rule(order = 5)
+    val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()
 
     @After
     fun clearDataAfterTest() {
@@ -567,6 +573,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/398188361 - Update this for expressive theme
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun issueCard_noAttribution_hasProperContentDescriptions() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.issueOnlySourceNoGroupTitleConfig)
 
@@ -581,6 +589,8 @@ class SafetyCenterActivityTest {
 
     @Test
     @SdkSuppress(minSdkVersion = UPSIDE_DOWN_CAKE)
+    // TODO: b/398188361 - Update this for expressive theme
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun issueCard_withAttribution_hasProperContentDescriptions() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig)
 
@@ -693,7 +703,7 @@ class SafetyCenterActivityTest {
 
     @Test
     fun issueCard_resolveIssue_successConfirmationShown() {
-        SafetyCenterFlags.hideResolvedIssueUiTransitionDelay = TIMEOUT_LONG
+        SafetyCenterFlags.setHideResolvedIssueUiTransitionDelay(context, TIMEOUT_LONG)
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig)
 
         // Set the initial data for the source
@@ -829,7 +839,7 @@ class SafetyCenterActivityTest {
 
     @Test
     fun issueCard_resolveIssue_noSuccessMessage_noResolutionUiShown_issueDismisses() {
-        SafetyCenterFlags.hideResolvedIssueUiTransitionDelay = TIMEOUT_LONG
+        SafetyCenterFlags.setHideResolvedIssueUiTransitionDelay(context, TIMEOUT_LONG)
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig)
 
         // Set the initial data for the source
@@ -954,6 +964,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun launchActivity_fromQuickSettings_issuesExpanded() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -978,6 +990,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun launchActivity_fromNotification_targetIssueAlreadyFirstIssue() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1003,6 +1017,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun launchActivity_fromNotification_targetIssueSamePriorityAsFirstIssue_reorderedFirstIssue() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1028,6 +1044,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun launchActivity_fromNotification_targetLowerPriorityAsFirstIssue_reorderedSecondIssue() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1052,6 +1070,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun launchActivity_fromNotification_targetIssueNotFound() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1091,6 +1111,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun moreIssuesCard_moreIssuesCardShown_additionalIssueCardsCollapsed() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1113,6 +1135,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun moreIssuesCard_expandAdditionalIssueCards() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1139,6 +1163,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun moreIssuesCard_rotation_cardsStillExpanded() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1173,6 +1199,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun moreIssuesCard_withThreeIssues_showsTopIssuesAndMoreIssuesCard() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
@@ -1197,6 +1225,8 @@ class SafetyCenterActivityTest {
     }
 
     @Test
+    // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag
+    @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED)
     fun moreIssuesCard_twoIssuesAlreadyShown_expandAdditionalIssueCards() {
         safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig)
         safetyCenterTestHelper.setData(
diff --git a/tests/utils/safetycenter/Android.bp b/tests/utils/safetycenter/Android.bp
index fab8c8dde..11fd3951d 100644
--- a/tests/utils/safetycenter/Android.bp
+++ b/tests/utils/safetycenter/Android.bp
@@ -36,6 +36,7 @@ android_library {
         "kotlinx-coroutines-android",
         "safety-center-internal-data",
         "safety-center-resources-lib",
+        "SettingsLibSettingsTheme",
         // TODO(b/326414126): aconfig: support multi-container library
         "com.android.permission.flags-aconfig-java",
     ],
diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt
index 7efbba7a0..66c5f46c4 100644
--- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt
+++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt
@@ -21,6 +21,7 @@ import android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG
 import android.Manifest.permission.WRITE_DEVICE_CONFIG
 import android.annotation.TargetApi
 import android.app.job.JobInfo
+import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE
 import android.provider.DeviceConfig
@@ -38,12 +39,16 @@ import com.android.modules.utils.build.SdkLevel
 import com.android.safetycenter.testing.Coroutines.TEST_TIMEOUT
 import com.android.safetycenter.testing.Coroutines.TIMEOUT_LONG
 import com.android.safetycenter.testing.ShellPermissions.callWithShellPermissionIdentity
+import com.android.settingslib.widget.SettingsThemeHelper
 import java.time.Duration
 import kotlin.reflect.KProperty
 
 /** A class that facilitates working with Safety Center flags. */
 object SafetyCenterFlags {
 
+    /** This is a hidden API constant within [DeviceConfig]. */
+    private const val NAMESPACE_SETTINGS_UI = "settings_ui"
+
     /** Flag that determines whether Safety Center is enabled. */
     private val isEnabledFlag =
         Flag("safety_center_is_enabled", defaultValue = SdkLevel.isAtLeastU(), BooleanParser())
@@ -143,8 +148,7 @@ object SafetyCenterFlags {
         )
 
     /**
-     * Flag that determines the time for which Safety Center will wait before starting dismissal of
-     * resolved issue UI
+     * Flag that determines how long Safety Center will wait before hiding the resolved issue UI.
      */
     private val hideResolveUiTransitionDelayFlag =
         Flag(
@@ -154,6 +158,18 @@ object SafetyCenterFlags {
         )
 
     /**
+     * Flag that determines how long an expressive BannerMessagePreference will wait before hiding
+     * the resolved UI.
+     */
+    private val bannerMessagePrefHideResolvedContentTransitionDelayFlag =
+        Flag(
+            "banner_message_pref_hide_resolved_content_delay_millis",
+            defaultValue = Duration.ofMillis(400),
+            DurationParser(),
+            namespace = NAMESPACE_SETTINGS_UI,
+        )
+
+    /**
      * Flag containing a comma delimited lists of source IDs that we won't track when deciding if a
      * broadcast is completed. We still send broadcasts to (and handle API calls from) these sources
      * as normal.
@@ -312,6 +328,7 @@ object SafetyCenterFlags {
             resolveActionTimeoutFlag,
             tempHiddenIssueResurfaceDelayFlag,
             hideResolveUiTransitionDelayFlag,
+            bannerMessagePrefHideResolvedContentTransitionDelayFlag,
             untrackedSourcesFlag,
             resurfaceIssueMaxCountsFlag,
             resurfaceIssueDelaysFlag,
@@ -357,9 +374,28 @@ object SafetyCenterFlags {
     /** A property that allows getting and setting the [tempHiddenIssueResurfaceDelayFlag]. */
     var tempHiddenIssueResurfaceDelay: Duration by tempHiddenIssueResurfaceDelayFlag
 
+    // TODO: b/379849464 - replace remaining usages and make this private
     /** A property that allows getting and setting the [hideResolveUiTransitionDelayFlag]. */
     var hideResolvedIssueUiTransitionDelay: Duration by hideResolveUiTransitionDelayFlag
 
+    /**
+     * A property that allows getting and setting the
+     * [bannerMessagePrefHideResolvedContentTransitionDelayFlag]
+     */
+    private var bannerMessagePrefHideResolvedContentTransitionDelay: Duration by
+        bannerMessagePrefHideResolvedContentTransitionDelayFlag
+
+    /**
+     * Sets the proper hide_resolved_issue_ui_transition_delay flag based on expressive design
+     * state.
+     */
+    fun setHideResolvedIssueUiTransitionDelay(context: Context, value: Duration) =
+        if (SettingsThemeHelper.isExpressiveTheme(context)) {
+            bannerMessagePrefHideResolvedContentTransitionDelay = value
+        } else {
+            hideResolvedIssueUiTransitionDelay = value
+        }
+
     /** A property that allows getting and setting the [untrackedSourcesFlag]. */
     var untrackedSources: Set<String> by untrackedSourcesFlag
 
@@ -396,14 +432,23 @@ object SafetyCenterFlags {
      * This snapshot is only taken once and cached afterwards. [setup] must be called at least once
      * prior to modifying any flag for the snapshot to be taken with the right values.
      */
-    @Volatile lateinit var snapshot: Properties
+    @Volatile lateinit var snapshot: Map<String, Properties>
 
-    private val lazySnapshot: Properties by lazy {
+    private val lazySnapshot: Map<String, Properties> by lazy {
         callWithShellPermissionIdentity(READ_DEVICE_CONFIG) {
-            DeviceConfig.getProperties(NAMESPACE_PRIVACY, *FLAGS.map { it.name }.toTypedArray())
+            mapOf(
+                NAMESPACE_PRIVACY to fetchPropertiesForNamespace(NAMESPACE_PRIVACY),
+                NAMESPACE_SETTINGS_UI to fetchPropertiesForNamespace(NAMESPACE_SETTINGS_UI),
+            )
         }
     }
 
+    private fun fetchPropertiesForNamespace(namespace: String) =
+        DeviceConfig.getProperties(
+            namespace,
+            *FLAGS.filter { it.namespace == namespace }.map { it.name }.toTypedArray(),
+        )
+
     /**
      * Takes a snapshot of all Safety Center flags and sets them up to their default values.
      *
@@ -414,7 +459,7 @@ object SafetyCenterFlags {
     fun setup() {
         snapshot = lazySnapshot
         FLAGS.filter { it.name != isEnabledFlag.name }
-            .forEach { writeDeviceConfigProperty(it.name, it.defaultStringValue) }
+            .forEach { it.writeToDeviceConfig(it.defaultStringValue) }
     }
 
     /**
@@ -431,8 +476,8 @@ object SafetyCenterFlags {
         FLAGS.filter { it.name != isEnabledFlag.name }
             .forEach {
                 val key = it.name
-                val value = snapshot.getString(key, /* defaultValue */ null)
-                writeDeviceConfigProperty(key, value)
+                val value = snapshot[it.namespace]?.getString(key, /* defaultValue */ null)
+                it.writeToDeviceConfig(value)
             }
     }
 
@@ -442,8 +487,8 @@ object SafetyCenterFlags {
     }
 
     /** Returns the [isEnabledFlag] value of the Safety Center flags snapshot. */
-    fun Properties.isSafetyCenterEnabled() =
-        getBoolean(isEnabledFlag.name, isEnabledFlag.defaultValue)
+    fun Map<String, Properties>.isSafetyCenterEnabled(): Boolean =
+        this[NAMESPACE_PRIVACY]!!.getBoolean(isEnabledFlag.name, isEnabledFlag.defaultValue)
 
     @TargetApi(UPSIDE_DOWN_CAKE)
     private fun getAllRefreshTimeoutsMap(refreshTimeout: Duration): Map<Int, Duration> =
@@ -516,32 +561,32 @@ object SafetyCenterFlags {
                 .joinToString(entriesDelimiter)
     }
 
-    private class Flag<T>(val name: String, val defaultValue: T, private val parser: Parser<T>) {
+    private class Flag<T>(
+        val name: String,
+        val defaultValue: T,
+        private val parser: Parser<T>,
+        val namespace: String = NAMESPACE_PRIVACY,
+    ) {
         val defaultStringValue = parser.toString(defaultValue)
 
         operator fun getValue(thisRef: Any?, property: KProperty<*>): T =
-            readDeviceConfigProperty(name)?.let(parser::parseFromString) ?: defaultValue
+            readFromDeviceConfig(name)?.let(parser::parseFromString) ?: defaultValue
 
-        operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
-            writeDeviceConfigProperty(name, parser.toString(value))
-        }
-    }
+        private fun readFromDeviceConfig(name: String): String? =
+            callWithShellPermissionIdentity(READ_DEVICE_CONFIG) {
+                DeviceConfig.getProperty(namespace, name)
+            }
 
-    private fun readDeviceConfigProperty(name: String): String? =
-        callWithShellPermissionIdentity(READ_DEVICE_CONFIG) {
-            DeviceConfig.getProperty(NAMESPACE_PRIVACY, name)
+        operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
+            writeToDeviceConfig(parser.toString(value))
         }
 
-    private fun writeDeviceConfigProperty(name: String, stringValue: String?) {
-        callWithShellPermissionIdentity(WRITE_DEVICE_CONFIG, WRITE_ALLOWLISTED_DEVICE_CONFIG) {
-            val valueWasSet =
-                DeviceConfig.setProperty(
-                    NAMESPACE_PRIVACY,
-                    name,
-                    stringValue, /* makeDefault */
-                    false,
-                )
-            require(valueWasSet) { "Could not set $name to: $stringValue" }
+        fun writeToDeviceConfig(stringValue: String?) {
+            callWithShellPermissionIdentity(WRITE_DEVICE_CONFIG, WRITE_ALLOWLISTED_DEVICE_CONFIG) {
+                val valueWasSet =
+                    DeviceConfig.setProperty(namespace, name, stringValue, /* makeDefault */ false)
+                require(valueWasSet) { "Could not set $name to: $stringValue" }
+            }
         }
     }
 }