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
This commit is contained in:
Jason Chang
2025-02-20 04:25:02 +00:00
parent d171e3e12d
commit b5857a7af9
2 changed files with 7 additions and 4 deletions

View File

@@ -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

View File

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