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

Commit ed49dc9d authored by Edgar Wang's avatar Edgar Wang
Browse files

[Expressive design] Adjust override flag logic 

Bug: 406450833
Test: manual
Flag: EXEMPT bug fix
Change-Id: I2f3151c0b825cb130b5674d1427c45685c6fe531
parent e2e8ecbf

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

+2 −6
Original line number Diff line number Diff line
@@ -41,18 +41,14 @@ object SettingsThemeHelper { 
        }

        // Enable if overridden by system property

        if (getPropBoolean(context, IS_EXPRESSIVE_DESIGN_ENABLED, false)) {

            return true;

        }

        // Disable if feature flag is disabled.

        if (!Flags.isExpressiveDesignEnabled()) {

            return false;

            return true

        }

        // Allow the activity to override.

        val activity = getActivityFromContext(context)

        if (activity is ExpressiveDesignEnabledProvider) {

            return activity.isExpressiveDesignEnabled()

        }

        return true

        return Flags.isExpressiveDesignEnabled()

    }



    private fun getActivityFromContext(context: Context): Activity? {