Merge "Override isSpaExpressiveEnabled in Settings" into main

This commit is contained in:
Chaohui Wang
2025-02-23 22:17:05 -08:00
committed by Android (Google) Code Review

View File

@@ -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<TogglePermissionAppListProvider> {
@@ -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()
}
}