Merge "Override isSpaExpressiveEnabled in Settings" into main
diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
index 7702db6..754b30b 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.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<TogglePermissionAppListProvider> {
@@ -132,4 +133,8 @@
)
) SpaLogMetricsProvider // ToDo: Implement 'SpaLogProvider' for SPA settings.
else object : SpaLogger {}
+
+ override val isSpaExpressiveEnabled by lazy {
+ super.isSpaExpressiveEnabled || Flags.isExpressiveDesignEnabled()
+ }
}