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

Commit fe83976a authored by Clément Julliard's avatar Clément Julliard
Browse files

Misc changes needed for micropaper integration. 

* Update Injector to pass Context argument.
* Simplify WallpaperSetter#requestDestination listener.

Bug: 133160356
Change-Id: Ib7546a804c1e818004f6bad0e3b71019feeeed6d
parent 53794c88

src/com/android/customization/model/theme/ThemeManager.java

+7 −23
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY 
import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_SYSUI;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_ICON_THEMEPICKER;

import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;



import android.graphics.Point;

import android.provider.Settings;

import android.text.TextUtils;
@@ -37,10 +36,9 @@ import com.android.customization.model.theme.custom.CustomTheme; 
import com.android.customization.module.ThemesUserEventLogger;

import com.android.wallpaper.R;

import com.android.wallpaper.asset.Asset;

import com.android.wallpaper.module.WallpaperPersister;

import com.android.wallpaper.model.LiveWallpaperInfo;

import com.android.wallpaper.module.WallpaperPersister.SetWallpaperCallback;

import com.android.wallpaper.module.WallpaperSetter;

import com.android.wallpaper.picker.SetWallpaperDialogFragment.Listener;

import com.android.wallpaper.util.WallpaperCropUtils;



import org.json.JSONObject;
@@ -93,26 +91,12 @@ public class ThemeManager implements CustomizationManager<ThemeBundle> { 
        // Set wallpaper

        if (theme.shouldUseThemeWallpaper()) {

            mWallpaperSetter.requestDestination(mActivity, mActivity.getSupportFragmentManager(),

                    R.string.set_theme_wallpaper_dialog_message, theme.getWallpaperInfo(),

                    new Listener() {

                        @Override

                        public void onSetHomeScreen() {

                            applyWallpaper(theme, WallpaperPersister.DEST_HOME_SCREEN,

                                    createSetWallpaperCallback(theme, callback));

                        }



                        @Override

                        public void onSetLockScreen() {

                            applyWallpaper(theme, WallpaperPersister.DEST_LOCK_SCREEN,

                                    createSetWallpaperCallback(theme, callback));

                        }



                        @Override

                        public void onSetBoth() {

                            applyWallpaper(theme, WallpaperPersister.DEST_BOTH,

                                    createSetWallpaperCallback(theme, callback));

                        }

                    });

                    R.string.set_theme_wallpaper_dialog_message,

                    destination -> applyWallpaper(

                            theme,

                            destination,

                            createSetWallpaperCallback(theme, callback)),

                    theme.getWallpaperInfo() instanceof LiveWallpaperInfo);



        } else {

            applyOverlays(theme, callback);

src/com/android/customization/module/DefaultCustomizationInjector.java

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ public class DefaultCustomizationInjector extends BaseWallpaperInjector 


    @Override

    public Fragment getPreviewFragment(

            Context context,

            WallpaperInfo wallpaperInfo,

            int mode,

            boolean testingModeEnabled) {

src_override/com/android/wallpaper/module/WallpapersInjector.java

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class WallpapersInjector extends BaseWallpaperInjector { 


    @Override

    public Fragment getPreviewFragment(

        Context context,

        WallpaperInfo wallpaperInfo,

        int mode,

        boolean testingModeEnabled) {