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

Commit 998c21eb authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by Automerger Merge Worker
Browse files

Make reloading color options thread safe am: 4c74f6f9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/18030545



Change-Id: I4a497ce9fbee13bbb94071eea9f85a316c63c7ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b78692db 4c74f6f9

src/com/android/customization/model/color/ColorSectionController.java

+8 −7
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ public class ColorSectionController implements CustomizationSectionController<Co 
    private final WallpaperColorsViewModel mWallpaperColorsViewModel;

    private final LifecycleOwner mLifecycleOwner;

    private final ColorSectionAdapter mColorSectionAdapter = new ColorSectionAdapter();

    private final List<ColorOption> mWallpaperColorOptions = new ArrayList<>();

    private final List<ColorOption> mPresetColorOptions = new ArrayList<>();



    private List<ColorOption> mWallpaperColorOptions = new ArrayList<>();

    private List<ColorOption> mPresetColorOptions = new ArrayList<>();

    private ViewPager2 mColorSectionViewPager;

    private ColorOption mSelectedColor;

    private SeparatedTabLayout mTabLayout;
@@ -207,16 +207,17 @@ public class ColorSectionController implements CustomizationSectionController<Co 
        mColorManager.fetchOptions(new CustomizationManager.OptionsFetchedListener<ColorOption>() {

            @Override

            public void onOptionsLoaded(List<ColorOption> options) {

                mWallpaperColorOptions.clear();

                mPresetColorOptions.clear();



                List<ColorOption> wallpaperColorOptions = new ArrayList<>();

                List<ColorOption> presetColorOptions = new ArrayList<>();

                for (ColorOption option : options) {

                    if (option instanceof ColorSeedOption) {

                        mWallpaperColorOptions.add(option);

                        wallpaperColorOptions.add(option);

                    } else if (option instanceof ColorBundle) {

                        mPresetColorOptions.add(option);

                        presetColorOptions.add(option);

                    }

                }

                mWallpaperColorOptions = wallpaperColorOptions;

                mPresetColorOptions = presetColorOptions;

                mSelectedColor = findActiveColorOption(mWallpaperColorOptions,

                        mPresetColorOptions);

                mTabLayout.post(()-> setUpColorViewPager());