Merge "Removes "reset" button from shortcuts screen." into tm-qpr-dev (88cd1a61) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/module/ThemePickerInjector.kt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -172,7 +172,6 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject
	?: KeyguardQuickAffordancePickerViewModel.Factory(		?: KeyguardQuickAffordancePickerViewModel.Factory(
	context,		context,
	getKeyguardQuickAffordancePickerInteractor(context),		getKeyguardQuickAffordancePickerInteractor(context),
	getUndoInteractor(context),
	getCurrentWallpaperInfoFactory(context),		getCurrentWallpaperInfoFactory(context),
	) { intent ->		) { intent ->
	context.startActivity(intent)		context.startActivity(intent)

src/com/android/customization/picker/quickaffordance/ui/fragment/KeyguardQuickAffordancePickerFragment.kt

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQui
	import com.android.wallpaper.R		import com.android.wallpaper.R
	import com.android.wallpaper.module.InjectorProvider		import com.android.wallpaper.module.InjectorProvider
	import com.android.wallpaper.picker.AppbarFragment		import com.android.wallpaper.picker.AppbarFragment
	import com.android.wallpaper.picker.undo.ui.binder.RevertToolbarButtonBinder
	import kotlinx.coroutines.ExperimentalCoroutinesApi		import kotlinx.coroutines.ExperimentalCoroutinesApi

	@OptIn(ExperimentalCoroutinesApi::class)		@OptIn(ExperimentalCoroutinesApi::class)
	@@ -62,12 +61,6 @@ class KeyguardQuickAffordancePickerFragment : AppbarFragment() {
	injector.getKeyguardQuickAffordancePickerViewModelFactory(requireContext()),		injector.getKeyguardQuickAffordancePickerViewModelFactory(requireContext()),
	)		)
	.get()		.get()
	setUpToolbarMenu(R.menu.undoable_customization_menu)
	RevertToolbarButtonBinder.bind(
	view = view.requireViewById(toolbarId),
	viewModel = viewModel.undo,
	lifecycleOwner = this,
	)

	KeyguardQuickAffordancePreviewBinder.bind(		KeyguardQuickAffordancePreviewBinder.bind(
	activity = requireActivity(),		activity = requireActivity(),

src/com/android/customization/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModel.kt

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -38,8 +38,6 @@ import com.android.wallpaper.picker.common.dialog.ui.viewmodel.DialogViewModel
	import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon		import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon
	import com.android.wallpaper.picker.common.text.ui.viewmodel.Text		import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
	import com.android.wallpaper.picker.customization.ui.viewmodel.ScreenPreviewViewModel		import com.android.wallpaper.picker.customization.ui.viewmodel.ScreenPreviewViewModel
	import com.android.wallpaper.picker.undo.domain.interactor.UndoInteractor
	import com.android.wallpaper.picker.undo.ui.viewmodel.UndoViewModel
	import com.android.wallpaper.util.PreviewUtils		import com.android.wallpaper.util.PreviewUtils
	import kotlinx.coroutines.ExperimentalCoroutinesApi		import kotlinx.coroutines.ExperimentalCoroutinesApi
	import kotlinx.coroutines.flow.Flow		import kotlinx.coroutines.flow.Flow
	@@ -57,7 +55,6 @@ class KeyguardQuickAffordancePickerViewModel
	private constructor(		private constructor(
	context: Context,		context: Context,
	private val quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor,		private val quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor,
	undoInteractor: UndoInteractor,
	private val wallpaperInfoFactory: CurrentWallpaperInfoFactory,		private val wallpaperInfoFactory: CurrentWallpaperInfoFactory,
	activityStarter: (Intent) -> Unit,		activityStarter: (Intent) -> Unit,
	) : ViewModel() {		) : ViewModel() {
	@@ -94,11 +91,6 @@ private constructor(
	},		},
	)		)

	val undo: UndoViewModel =
	UndoViewModel(
	interactor = undoInteractor,
	)

	private val _selectedSlotId = MutableStateFlow<String?>(null)		private val _selectedSlotId = MutableStateFlow<String?>(null)
	val selectedSlotId: StateFlow<String?> = _selectedSlotId.asStateFlow()		val selectedSlotId: StateFlow<String?> = _selectedSlotId.asStateFlow()

	@@ -390,7 +382,6 @@ private constructor(
	class Factory(		class Factory(
	private val context: Context,		private val context: Context,
	private val quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor,		private val quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor,
	private val undoInteractor: UndoInteractor,
	private val wallpaperInfoFactory: CurrentWallpaperInfoFactory,		private val wallpaperInfoFactory: CurrentWallpaperInfoFactory,
	private val activityStarter: (Intent) -> Unit,		private val activityStarter: (Intent) -> Unit,
	) : ViewModelProvider.Factory {		) : ViewModelProvider.Factory {
	@@ -399,7 +390,6 @@ private constructor(
	return KeyguardQuickAffordancePickerViewModel(		return KeyguardQuickAffordancePickerViewModel(
	context = context,		context = context,
	quickAffordanceInteractor = quickAffordanceInteractor,		quickAffordanceInteractor = quickAffordanceInteractor,
	undoInteractor = undoInteractor,
	wallpaperInfoFactory = wallpaperInfoFactory,		wallpaperInfoFactory = wallpaperInfoFactory,
	activityStarter = activityStarter,		activityStarter = activityStarter,
	)		)

tests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -34,9 +34,6 @@ import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordance
	import com.android.wallpaper.module.InjectorProvider		import com.android.wallpaper.module.InjectorProvider
	import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon		import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon
	import com.android.wallpaper.picker.common.text.ui.viewmodel.Text		import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
	import com.android.wallpaper.picker.undo.data.repository.UndoRepository
	import com.android.wallpaper.picker.undo.domain.interactor.UndoInteractor
	import com.android.wallpaper.testing.FAKE_RESTORERS
	import com.android.wallpaper.testing.FakeSnapshotStore		import com.android.wallpaper.testing.FakeSnapshotStore
	import com.android.wallpaper.testing.TestCurrentWallpaperInfoFactory		import com.android.wallpaper.testing.TestCurrentWallpaperInfoFactory
	import com.android.wallpaper.testing.TestInjector		import com.android.wallpaper.testing.TestInjector
	@@ -96,17 +93,10 @@ class KeyguardQuickAffordancePickerViewModelTest {
	.apply { runBlocking { setUpSnapshotRestorer(FakeSnapshotStore()) } }		.apply { runBlocking { setUpSnapshotRestorer(FakeSnapshotStore()) } }
	},		},
	)		)
	val undoInteractor =
	UndoInteractor(
	scope = testScope.backgroundScope,
	repository = UndoRepository(),
	restorerByOwnerId = FAKE_RESTORERS,
	)
	underTest =		underTest =
	KeyguardQuickAffordancePickerViewModel.Factory(		KeyguardQuickAffordancePickerViewModel.Factory(
	context = context,		context = context,
	quickAffordanceInteractor = quickAffordanceInteractor,		quickAffordanceInteractor = quickAffordanceInteractor,
	undoInteractor = undoInteractor,
	wallpaperInfoFactory = TestCurrentWallpaperInfoFactory(context),		wallpaperInfoFactory = TestCurrentWallpaperInfoFactory(context),
	activityStarter = { intent -> latestStartedActivityIntent = intent },		activityStarter = { intent -> latestStartedActivityIntent = intent },
	)		)