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

Commit b5857a7a authored by Jason Chang's avatar Jason Chang
Browse files

Fix for checking SUW/Setting Expressive style API

Flag: EXEMPT use SUW/Settings Expressive style API to check

Bug: 394223273

Test: build and manually check the UI and its behaviors
Change-Id: Iecbe443a20c4a228a6bd14fd061b0a731fbbd95a
parent d171e3e1
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        final boolean isExpressiveStyle = BiometricUtils.isExpressiveStyle(getBaseContext());
        final boolean isExpressiveStyle = BiometricUtils.isExpressiveStyle(
                getBaseContext(), false);

        if (shouldShowSplitScreenDialog()) {
            BiometricsSplitScreenDialog
+5 −3
Original line number Diff line number Diff line
@@ -535,11 +535,13 @@ public class BiometricUtils {
    /**
     * Check if device is using Expressive Style theme.
     * @param context that for applying Expressive Style
     * @param isSettingsPreference Apply Expressive style on Settings Preference or not.
     * @return true if device using Expressive Style theme, otherwise false.
     */
    public static boolean isExpressiveStyle(@NonNull Context context) {
        return SettingsThemeHelper.isExpressiveTheme(context)
                || ThemeHelper.shouldApplyGlifExpressiveStyle(context);
    public static boolean isExpressiveStyle(@NonNull Context context,
            boolean isSettingsPreference) {
        return isSettingsPreference ? SettingsThemeHelper.isExpressiveTheme(context) :
                ThemeHelper.shouldApplyGlifExpressiveStyle(context);
    }

    private static String capitalize(final String input) {