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

Commit 97bd7bd2 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9143244 from a2b70df7 to tm-qpr2-release 

Change-Id: I53d6232f51a9b7062cebb7445aca13b9a4e91ebe
parents ab73ca79 a2b70df7

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

+20 −2
Original line number Diff line number Diff line
@@ -15,9 +15,16 @@ 
 */

package com.android.customization.module;



import static com.android.wallpaper.picker.PreviewFragment.ARG_FULL_SCREEN;

import static com.android.wallpaper.picker.PreviewFragment.ARG_PREVIEW_MODE;

import static com.android.wallpaper.picker.PreviewFragment.ARG_TESTING_MODE_ENABLED;

import static com.android.wallpaper.picker.PreviewFragment.ARG_VIEW_AS_HOME;

import static com.android.wallpaper.picker.PreviewFragment.ARG_WALLPAPER;



import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;



import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentActivity;
@@ -26,6 +33,7 @@ import com.android.customization.model.theme.OverlayManagerCompat; 
import com.android.customization.model.theme.ThemeBundleProvider;

import com.android.customization.model.theme.ThemeManager;

import com.android.wallpaper.model.CategoryProvider;

import com.android.wallpaper.model.LiveWallpaperInfo;

import com.android.wallpaper.model.WallpaperInfo;

import com.android.wallpaper.module.BaseWallpaperInjector;

import com.android.wallpaper.module.CustomizationSections;
@@ -35,6 +43,8 @@ import com.android.wallpaper.module.WallpaperPreferences; 
import com.android.wallpaper.module.WallpaperRotationRefresher;

import com.android.wallpaper.monitor.PerformanceMonitor;

import com.android.wallpaper.picker.CustomizationPickerActivity;

import com.android.wallpaper.picker.ImagePreviewFragment;

import com.android.wallpaper.picker.LivePreviewFragment;

import com.android.wallpaper.picker.PreviewFragment;



public class DefaultCustomizationInjector extends BaseWallpaperInjector
@@ -97,8 +107,16 @@ public class DefaultCustomizationInjector extends BaseWallpaperInjector 
            boolean viewAsHome,

            boolean viewFullScreen,

            boolean testingModeEnabled) {

        return PreviewFragment.newInstance(wallpaperInfo, mode, viewAsHome, viewFullScreen,

                testingModeEnabled);

        Bundle args = new Bundle();

        args.putParcelable(ARG_WALLPAPER, wallpaperInfo);

        args.putInt(ARG_PREVIEW_MODE, mode);

        args.putBoolean(ARG_VIEW_AS_HOME, viewAsHome);

        args.putBoolean(ARG_FULL_SCREEN, viewFullScreen);

        args.putBoolean(ARG_TESTING_MODE_ENABLED, testingModeEnabled);

        PreviewFragment fragment = wallpaperInfo instanceof LiveWallpaperInfo

                ? new LivePreviewFragment() : new ImagePreviewFragment();

        fragment.setArguments(args);

        return fragment;

    }



    @Override

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

+20 −2
Original line number Diff line number Diff line
@@ -15,17 +15,27 @@ 
 */

package com.android.wallpaper.module;



import static com.android.wallpaper.picker.PreviewFragment.ARG_FULL_SCREEN;

import static com.android.wallpaper.picker.PreviewFragment.ARG_PREVIEW_MODE;

import static com.android.wallpaper.picker.PreviewFragment.ARG_TESTING_MODE_ENABLED;

import static com.android.wallpaper.picker.PreviewFragment.ARG_VIEW_AS_HOME;

import static com.android.wallpaper.picker.PreviewFragment.ARG_WALLPAPER;



import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;



import androidx.fragment.app.Fragment;



import com.android.wallpaper.model.CategoryProvider;

import com.android.wallpaper.model.LiveWallpaperInfo;

import com.android.wallpaper.model.WallpaperInfo;

import com.android.wallpaper.monitor.PerformanceMonitor;

import com.android.wallpaper.picker.CustomizationPickerActivity;

import com.android.wallpaper.picker.ImagePreviewFragment;

import com.android.wallpaper.picker.LivePreviewFragment;

import com.android.wallpaper.picker.PreviewFragment;



/**

 * A concrete, real implementation of the dependency provider.
@@ -74,8 +84,16 @@ public class WallpapersInjector extends BaseWallpaperInjector { 
            boolean viewAsHome,

            boolean viewFullScreen,

            boolean testingModeEnabled) {

        return ImagePreviewFragment.newInstance(wallpaperInfo, mode, viewAsHome, viewFullScreen,

                testingModeEnabled);

        Bundle args = new Bundle();

        args.putParcelable(ARG_WALLPAPER, wallpaperInfo);

        args.putInt(ARG_PREVIEW_MODE, mode);

        args.putBoolean(ARG_VIEW_AS_HOME, viewAsHome);

        args.putBoolean(ARG_FULL_SCREEN, viewFullScreen);

        args.putBoolean(ARG_TESTING_MODE_ENABLED, testingModeEnabled);

        PreviewFragment fragment = wallpaperInfo instanceof LiveWallpaperInfo

                ? new LivePreviewFragment() : new ImagePreviewFragment();

        fragment.setArguments(args);

        return fragment;

    }



    @Override