Merge tag 'android-11.0.0_r38' of https://android.googlesource.com/platform//packages/apps/ThemePicker into r
Android 11.0.0 Release 38 (RQ3A.210605.005)
Change-Id: If964d283cf218c890880e9a2a4c9c74f352764ac
diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java
index de8aa69..7b58274 100644
--- a/src/com/android/customization/picker/theme/ThemeFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFragment.java
@@ -287,9 +287,10 @@
mSelectedTheme = previouslySelectedTheme != null
? previouslySelectedTheme
: activeTheme;
- // 3. Select the default theme if there is no matching custom enabled theme.
+ // 3. Select the first system theme(default theme currently)
+ // if there is no matching custom enabled theme.
if (mSelectedTheme == null) {
- mSelectedTheme = findDefaultThemeBundle(options);
+ mSelectedTheme = findFirstSystemThemeBundle(options);
}
mOptionsController.setSelectedOption(mSelectedTheme);
@@ -324,8 +325,7 @@
}
}
if (mSelectedTheme == null) {
- // Select the default theme if there is no matching custom enabled theme
- mSelectedTheme = findDefaultThemeBundle(options);
+ mSelectedTheme = findFirstSystemThemeBundle(options);
}
mOptionsController.setSelectedOption(mSelectedTheme);
// Set selected option above will show BottomActionBar,
@@ -334,11 +334,9 @@
}, true);
}
- private ThemeBundle findDefaultThemeBundle(List<ThemeBundle> options) {
- String defaultThemeTitle =
- getActivity().getResources().getString(R.string.default_theme_title);
+ private ThemeBundle findFirstSystemThemeBundle(List<ThemeBundle> options) {
for (ThemeBundle bundle : options) {
- if (bundle.getTitle().equals(defaultThemeTitle)) {
+ if (!(bundle instanceof CustomTheme)) {
return bundle;
}
}