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

Commit 5cf92e60 authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix for checking SUW/Setting Expressive style API" into main

parents acd83388 b5857a7a

src/com/android/settings/biometrics/BiometricEnrollIntroduction.java

+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

src/com/android/settings/biometrics/BiometricUtils.java

+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) {