Snap for 6864616 from 4035b79b1dccdcfe483be79073d18937b49223a2 to rvc-qpr1-release
Change-Id: I9e9f93699590d8c1c53f663be5449454be6ee21a
diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index ddadc7d..404130f 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -188,18 +188,16 @@
builder.setTitle(mContext.getString(R.string.default_theme_title));
}
- String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME);
-
try {
+ String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME);
mOverlayProvider.addColorOverlay(builder, colorOverlayPackage);
} catch (NameNotFoundException | NotFoundException e) {
Log.d(TAG, "Didn't find color overlay for default theme, will use system default");
mOverlayProvider.addSystemDefaultColor(builder);
}
- String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME);
-
try {
+ String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME);
mOverlayProvider.addFontOverlay(builder, fontOverlayPackage);
} catch (NameNotFoundException | NotFoundException e) {
Log.d(TAG, "Didn't find font overlay for default theme, will use system default");
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index 86845fc..786bebd 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -124,6 +124,8 @@
return;
}
+ mDelegate.getCategoryProvider().resetIfNeeded();
+
setContentView(R.layout.activity_customization_picker_main);
setUpBottomNavView();
mBottomActionBar = findViewById(R.id.bottom_actionbar);