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

Commit b0d5d750 authored by Chris Poultney's avatar Chris Poultney Committed by Android (Google) Code Review
Browse files

Merge "Fixes lock screen live preview in color picker" into udc-qpr-dev

parents 7ed2b3b7 626f64da

src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt

+52 −46
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ class ColorPickerFragment : AppbarFragment() { 


        savedInstanceState?.let { binding?.restoreInstanceState(it) }



        val lockScreenPreviewBinder =

            ScreenPreviewBinder.bind(

                activity = requireActivity(),

                previewView = lockScreenView,
@@ -143,6 +144,10 @@ class ColorPickerFragment : AppbarFragment() { 
                    displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),

                onWallpaperPreviewDirty = { activity?.recreate() },

            )

        val shouldMirrorHomePreview =

            wallpaperManager.getWallpaperInfo(WallpaperManager.FLAG_SYSTEM) != null &&

                wallpaperManager.getWallpaperId(WallpaperManager.FLAG_LOCK) < 0

        val mirrorSurface = if (shouldMirrorHomePreview) lockScreenPreviewBinder.surface() else null

        ScreenPreviewBinder.bind(

            activity = requireActivity(),

            previewView = homeScreenView,
@@ -189,6 +194,7 @@ class ColorPickerFragment : AppbarFragment() { 
            offsetToStart =

                displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),

            onWallpaperPreviewDirty = { activity?.recreate() },

            mirrorSurface = mirrorSurface,

        )

        val darkModeToggleContainerView: FrameLayout =

            view.requireViewById(R.id.dark_mode_toggle_container)