Merge "Keep wallpaper quick switch order stable (2/3)." into tm-qpr-dev (a2822dea) · Commits · e / os / android_packages_apps_ThemePicker

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

+4 −8

Original line number	Diff line number	Diff line
		@@ -25,16 +25,14 @@ import com.android.wallpaper.model.WallpaperSectionController;
		import com.android.wallpaper.model.WorkspaceViewModel;
		import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
		import com.android.wallpaper.module.CustomizationSections;
		import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInteractor;
		import com.android.wallpaper.picker.customization.ui.section.ScreenPreviewSectionController;
		import com.android.wallpaper.picker.customization.ui.section.WallpaperQuickSwitchSectionController;
		import com.android.wallpaper.picker.customization.ui.viewmodel.WallpaperQuickSwitchViewModel;
		import com.android.wallpaper.util.DisplayUtils;

		import java.util.ArrayList;
		import java.util.List;

		import kotlinx.coroutines.GlobalScope;

		/** {@link CustomizationSections} for the customization picker. */
		public final class DefaultCustomizationSections implements CustomizationSections {

		@@ -64,7 +62,7 @@ public final class DefaultCustomizationSections implements CustomizationSections
		@Nullable Bundle savedInstanceState,
		CurrentWallpaperInfoFactory wallpaperInfoFactory,
		DisplayUtils displayUtils,
		WallpaperInteractor wallpaperInteractor) {
		WallpaperQuickSwitchViewModel wallpaperQuickSwitchViewModel) {
		List<CustomizationSectionController<?>> sectionControllers = new ArrayList<>();

		// Wallpaper section.
		@@ -84,10 +82,8 @@ public final class DefaultCustomizationSections implements CustomizationSections
		// Wallpaper quick switch section.
		sectionControllers.add(
		new WallpaperQuickSwitchSectionController(
		wallpaperInteractor,
		lifecycleOwner,
		GlobalScope.INSTANCE,
		sectionNavigationController));
		wallpaperQuickSwitchViewModel,
		lifecycleOwner));

		switch (screen) {
		case LOCK_SCREEN: