Merge "Use the same cropping for outer screen and unfolded vertical hinge" into tm-qpr-dev (76225450) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ class ClockSettingsFragment : AppbarFragment() {
		},
		),
		lifecycleOwner = this,
		offsetToStart = displayUtils.isOnWallpaperDisplay(activity),
		offsetToStart = displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(activity),
		)
		.show()

+4 −2

Original line number	Diff line number	Diff line
		@@ -105,7 +105,8 @@ class ColorPickerFragment : AppbarFragment() {
		},
		),
		lifecycleOwner = this,
		offsetToStart = displayUtils.isOnWallpaperDisplay(requireActivity()),
		offsetToStart =
		displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),
		)
		ScreenPreviewBinder.bind(
		activity = requireActivity(),
		@@ -136,7 +137,8 @@ class ColorPickerFragment : AppbarFragment() {
		},
		),
		lifecycleOwner = this,
		offsetToStart = displayUtils.isOnWallpaperDisplay(requireActivity()),
		offsetToStart =
		displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),
		)
		val darkModeToggleContainerView: FrameLayout =
		view.requireViewById(R.id.dark_mode_toggle_container)

+3 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,9 @@ class KeyguardQuickAffordancePickerFragment : AppbarFragment() {
		viewModel = viewModel,
		lifecycleOwner = this,
		offsetToStart =
		injector.getDisplayUtils(requireActivity()).isOnWallpaperDisplay(requireActivity())
		requireActivity().let {
		injector.getDisplayUtils(it).isSingleDisplayOrUnfoldedHorizontalHinge(it)
		}
		)
		KeyguardQuickAffordancePickerBinder.bind(
		view = view,