From 04c7e27a7345ad0714fe9ba27b38179df47f4965 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 20 Feb 2025 13:21:49 +0800 Subject: [PATCH] Override isSpaExpressiveEnabled in Settings Into SettingsSpaEnvironment. Bug: 386013400 Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled Test: visual - expressive can enabled for spa in Settings Change-Id: I5225948c733a57855168a3e633fc4fbd4dd6f89a --- src/com/android/settings/spa/SettingsSpaEnvironment.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt index 7702db6bcde..754b30b5ab7 100644 --- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt +++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt @@ -64,6 +64,7 @@ import com.android.settingslib.spa.framework.common.SpaLogger import com.android.settingslib.spa.framework.common.createSettingsPage import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListProvider import com.android.settingslib.spaprivileged.template.app.TogglePermissionAppListTemplate +import com.android.settingslib.widget.theme.flags.Flags open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) { open fun getTogglePermissionAppListProviders(): List { @@ -132,4 +133,8 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) { ) ) SpaLogMetricsProvider // ToDo: Implement 'SpaLogProvider' for SPA settings. else object : SpaLogger {} + + override val isSpaExpressiveEnabled by lazy { + super.isSpaExpressiveEnabled || Flags.isExpressiveDesignEnabled() + } }