From b5857a7af91b282fac560cba3a2e333406293076 Mon Sep 17 00:00:00 2001 From: Jason Chang Date: Thu, 20 Feb 2025 04:25:02 +0000 Subject: [PATCH] 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 --- .../settings/biometrics/BiometricEnrollIntroduction.java | 3 ++- src/com/android/settings/biometrics/BiometricUtils.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java index 226876e8533..127ad6231a7 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java @@ -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 diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java index a4fb7358011..db6abc3c979 100644 --- a/src/com/android/settings/biometrics/BiometricUtils.java +++ b/src/com/android/settings/biometrics/BiometricUtils.java @@ -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) {