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

Commit 866ad50a authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes Ide7d63a7,I9e075f29 into tm-qpr-dev 

* changes:
  Format files with the upcoming version of ktfmt
  Regenerate include file for ktfmt upgrade
parents 8bbf5c10 f73f58d7

ktfmt_includes.txt

+1 −0
Original line number Diff line number Diff line 
+src/

+src_override/

+tests/

-src/com/android/customization/module/SysUiStatsLogger.kt

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(),

                )

            }