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

Commit f73f58d7 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Format files with the upcoming version of ktfmt 

This CL was generated automatically from the following command:

$ external/ktfmt/prepare_upgrade.py --repo=packages/apps/ThemePicker/ --build_id=9645412 --bug_id=266197805

This CL formats all files already correctly formatted with the upcoming
version of ktfmt.

Bug: 266197805
Test: Presubmits
Change-Id: Ide7d63a75fed98aabe348821355356c77f00a9ec
Merged-In: Ide7d63a75fed98aabe348821355356c77f00a9ec
parent e07d8035

src/com/android/customization/model/grid/domain/interactor/GridSnapshotRestorer.kt

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ class GridSnapshotRestorer( 
                    TAG,

                    """Original snapshot name was ${optionToRestore.name} but we're being told to

                        | restore to $optionNameFromSnapshot. The current implementation doesn't

                        | support undo, only a reset back to the original grid option.""".trimMargin(),

                        | support undo, only a reset back to the original grid option."""

                        .trimMargin(),

                )

            }

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

+3 −1
Original line number Diff line number Diff line
@@ -249,7 +249,9 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject 
        return KeyguardQuickAffordancePickerInteractor(

            KeyguardQuickAffordancePickerRepository(client, Dispatchers.IO),

            client

        ) { getKeyguardQuickAffordanceSnapshotRestorer(context) }

        ) {

            getKeyguardQuickAffordanceSnapshotRestorer(context)

        }

    }



    protected fun getKeyguardQuickAffordancePickerProviderClient(

src/com/android/customization/picker/clock/ui/section/ClockSectionController.kt

+3 −1
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ class ClockSectionController( 
                view = view,

                viewModel = viewModel,

                lifecycleOwner = lifecycleOwner

            ) { navigationController.navigateTo(ClockSettingsFragment()) }

            ) {

                navigationController.navigateTo(ClockSettingsFragment())

            }

        }

        return view

    }

src/com/android/customization/picker/color/domain/interactor/ColorPickerSnapshotRestorer.kt

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ class ColorPickerSnapshotRestorer( 
                    TAG,

                    """ Original packages does not match snapshot packages to restore to. The 

                        | current implementation doesn't support undo, only a reset back to the 

                        | original color option.""".trimMargin(),

                        | original color option."""

                        .trimMargin(),

                )

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -462,7 +462,8 @@ class KeyguardQuickAffordancePickerViewModelTest { 
     *

     * @param slots The observed slot view-models, keyed by slot ID

     * @param expectedAffordanceNameBySlotId The expected name of the selected affordance for each

     * slot ID or `null` if it's expected for there to be no affordance for that slot in the preview

     *   slot ID or `null` if it's expected for there to be no affordance for that slot in the

     *   preview

     */

    private fun assertPreviewUiState(

        slots: Map<String, KeyguardQuickAffordanceSlotViewModel>?,