Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20fb9b61 authored by chihhangchuang's avatar chihhangchuang
Browse files

Make ThemeOptionPreviewer accept PreviewInfo only 

Test: Manually
Bug: 146475648
Change-Id: Id35170cf12a62db113a05ee0d754464d5db61b2b
parent 0aa379ac

src/com/android/customization/picker/theme/ThemeFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ public class ThemeFragment extends AppbarFragment { 
                        mSelectedTheme.setOverrideThemeWallpaper(mCurrentHomeWallpaper);

                        mEventLogger.logThemeSelected(mSelectedTheme,

                                selected instanceof CustomTheme);

                        mThemeOptionPreviewer.setThemeBundle(mSelectedTheme);

                        mThemeOptionPreviewer.setPreviewInfo(mSelectedTheme.getPreviewInfo());

                        if (mThemeInfoView != null && mSelectedTheme != null) {

                            mThemeInfoView.populateThemeInfo(mSelectedTheme);

                        }

src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class ThemeFullPreviewFragment extends AppbarFragment { 
                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,

src/com/android/customization/picker/theme/ThemeOptionPreviewer.java

+2 −3
Original line number Diff line number Diff line
@@ -145,9 +145,8 @@ class ThemeOptionPreviewer implements LifecycleObserver { 
        });

    }



    /** 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);