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

Commit 59b59160 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update expressive flag check" into main

parents f1fd1d71 35764db1

packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsThemeHelper.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ object SettingsThemeHelper { 
    private fun tryInit(context: Context) {

    private fun tryInit(context: Context) {

        expressiveThemeState =

        expressiveThemeState =

            if (

            if (

                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) &&

                (Build.VERSION.SDK_INT > Build.VERSION_CODES.VANILLA_ICE_CREAM) &&

                        (getPropBoolean(context, IS_EXPRESSIVE_DESIGN_ENABLED, false) ||

                        (getPropBoolean(context, IS_EXPRESSIVE_DESIGN_ENABLED, false) ||

                                Flags.isExpressiveDesignEnabled())

                                Flags.isExpressiveDesignEnabled())

            ) {

            ) {