Make ThemeOptionPreviewer accept PreviewInfo only
Test: Manually
Bug: 146475648
Change-Id: Id35170cf12a62db113a05ee0d754464d5db61b2b
diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java
index 09fc9c2..3da41c6 100644
--- a/src/com/android/customization/picker/theme/ThemeFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFragment.java
@@ -274,7 +274,7 @@
mSelectedTheme.setOverrideThemeWallpaper(mCurrentHomeWallpaper);
mEventLogger.logThemeSelected(mSelectedTheme,
selected instanceof CustomTheme);
- mThemeOptionPreviewer.setThemeBundle(mSelectedTheme);
+ mThemeOptionPreviewer.setPreviewInfo(mSelectedTheme.getPreviewInfo());
if (mThemeInfoView != null && mSelectedTheme != null) {
mThemeInfoView.populateThemeInfo(mSelectedTheme);
}
diff --git a/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java b/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java
index dabd9aa..3b6923c 100644
--- a/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java
@@ -116,7 +116,7 @@
getLifecycle(),
getContext(),
view.findViewById(R.id.theme_preview_container));
- themeOptionPreviewer.setThemeBundle(mThemeBundle);
+ themeOptionPreviewer.setPreviewInfo(mThemeBundle.getPreviewInfo());
view.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
@Override
public void onLayoutChange(View v, int left, int top, int right, int bottom,
diff --git a/src/com/android/customization/picker/theme/ThemeOptionPreviewer.java b/src/com/android/customization/picker/theme/ThemeOptionPreviewer.java
index efaa38c..6096762 100644
--- a/src/com/android/customization/picker/theme/ThemeOptionPreviewer.java
+++ b/src/com/android/customization/picker/theme/ThemeOptionPreviewer.java
@@ -145,9 +145,8 @@
});
}
- /** Loads the Theme option into the container view. */
- public void setThemeBundle(ThemeBundle themeBundle) {
- PreviewInfo previewInfo = themeBundle.getPreviewInfo();
+ /** Loads the Theme option preview into the container view. */
+ public void setPreviewInfo(PreviewInfo previewInfo) {
setHeadlineFont(previewInfo.headlineFontFamily);
setTopBarIcons(previewInfo.icons);
setAppIconShape(previewInfo.shapeAppIcons);