Merge "Move Date and Weather in wallpaper picker" into main (7fa8fc91) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardPreviewSmartspaceViewBinder.kt

+32 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,37 @@ import com.android.systemui.plugins.clocks.ClockPreviewConfig
	/** Binder for the small clock view, large clock view and smartspace. */		/** Binder for the small clock view, large clock view and smartspace. */
	object KeyguardPreviewSmartspaceViewBinder {		object KeyguardPreviewSmartspaceViewBinder {

			@JvmStatic
			fun bind(parentView: View, viewModel: KeyguardPreviewSmartspaceViewModel) {
			if (com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {
			val largeDateView =
			parentView.findViewById<View>(
			com.android.systemui.shared.R.id.date_smartspace_view_large
			)
			val smallDateView =
			parentView.findViewById<View>(com.android.systemui.shared.R.id.date_smartspace_view)
			parentView.repeatWhenAttached {
			repeatOnLifecycle(Lifecycle.State.STARTED) {
			launch("$TAG#viewModel.selectedClockSize") {
			viewModel.previewingClockSize.collect {
			when (it) {
			ClockSizeSetting.DYNAMIC -> {
			smallDateView?.visibility = View.GONE
			largeDateView?.visibility = View.VISIBLE
			}

			ClockSizeSetting.SMALL -> {
			smallDateView?.visibility = View.VISIBLE
			largeDateView?.visibility = View.GONE
			}
			}
			}
			}
			}
			}
			}
			}

	@JvmStatic		@JvmStatic
	fun bind(		fun bind(
	smartspace: View,		smartspace: View,
	@@ -44,6 +75,7 @@ object KeyguardPreviewSmartspaceViewBinder {
	when (it) {		when (it) {
	ClockSizeSetting.DYNAMIC ->		ClockSizeSetting.DYNAMIC ->
	viewModel.getLargeClockSmartspaceTopPadding(clockPreviewConfig)		viewModel.getLargeClockSmartspaceTopPadding(clockPreviewConfig)

	ClockSizeSetting.SMALL ->		ClockSizeSetting.SMALL ->
	viewModel.getSmallClockSmartspaceTopPadding(clockPreviewConfig)		viewModel.getSmallClockSmartspaceTopPadding(clockPreviewConfig)
	}		}

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt

+126 −44

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,7 @@ import com.android.systemui.monet.ColorScheme
	import com.android.systemui.monet.Style		import com.android.systemui.monet.Style
	import com.android.systemui.plugins.clocks.ClockController		import com.android.systemui.plugins.clocks.ClockController
	import com.android.systemui.plugins.clocks.ClockPreviewConfig		import com.android.systemui.plugins.clocks.ClockPreviewConfig
			import com.android.systemui.plugins.clocks.ContextExt.getId
	import com.android.systemui.plugins.clocks.ThemeConfig		import com.android.systemui.plugins.clocks.ThemeConfig
	import com.android.systemui.plugins.clocks.WeatherData		import com.android.systemui.plugins.clocks.WeatherData
	import com.android.systemui.res.R		import com.android.systemui.res.R
	@@ -126,6 +127,7 @@ constructor(

	private val displayId = bundle.getInt(KEY_DISPLAY_ID, DEFAULT_DISPLAY)		private val displayId = bundle.getInt(KEY_DISPLAY_ID, DEFAULT_DISPLAY)
	private val display: Display? = displayManager.getDisplay(displayId)		private val display: Display? = displayManager.getDisplay(displayId)

	/**		/**
	* Returns a key that should make the KeyguardPreviewRenderer unique and if two of them have the		* Returns a key that should make the KeyguardPreviewRenderer unique and if two of them have the
	* same key they will be treated as the same KeyguardPreviewRenderer. Primary this is used to		* same key they will be treated as the same KeyguardPreviewRenderer. Primary this is used to
	@@ -144,6 +146,8 @@ constructor(
	get() = checkNotNull(host.surfacePackage)		get() = checkNotNull(host.surfacePackage)

	private var smartSpaceView: View? = null		private var smartSpaceView: View? = null
			private var largeDateView: View? = null
			private var smallDateView: View? = null

	private val disposables = DisposableHandles()		private val disposables = DisposableHandles()
	private var isDestroyed = false		private var isDestroyed = false
	@@ -181,7 +185,7 @@ constructor(
	ContextThemeWrapper(context.createDisplayContext(it), context.getTheme())		ContextThemeWrapper(context.createDisplayContext(it), context.getTheme())
	} ?: context		} ?: context

	val rootView = FrameLayout(previewContext)		val rootView = ConstraintLayout(previewContext)

	setupKeyguardRootView(previewContext, rootView)		setupKeyguardRootView(previewContext, rootView)

	@@ -252,6 +256,24 @@ constructor(

	fun onClockSizeSelected(clockSize: ClockSizeSetting) {		fun onClockSizeSelected(clockSize: ClockSizeSetting) {
	smartspaceViewModel.setOverrideClockSize(clockSize)		smartspaceViewModel.setOverrideClockSize(clockSize)
			if (com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {
			when (clockSize) {
			ClockSizeSetting.DYNAMIC -> {
			largeDateView?.post {
			smallDateView?.visibility = View.GONE
			largeDateView?.visibility = View.VISIBLE
			}
			}

			ClockSizeSetting.SMALL -> {
			largeDateView?.post {
			smallDateView?.visibility = View.VISIBLE
			largeDateView?.visibility = View.GONE
			}
			}
			}
			smartSpaceView?.post { smartSpaceView?.visibility = View.GONE }
			}
	}		}

	fun destroy() {		fun destroy() {
	@@ -280,7 +302,7 @@ constructor(
	*		*
	* The end padding is as follows: Below clock padding end		* The end padding is as follows: Below clock padding end
	*/		*/
	private fun setUpSmartspace(previewContext: Context, parentView: ViewGroup) {		private fun setUpSmartspace(previewContext: Context, parentView: ConstraintLayout) {
	if (		if (
	!lockscreenSmartspaceController.isEnabled \|\|		!lockscreenSmartspaceController.isEnabled \|\|
	!lockscreenSmartspaceController.isDateWeatherDecoupled		!lockscreenSmartspaceController.isDateWeatherDecoupled
	@@ -292,6 +314,56 @@ constructor(
	parentView.removeView(smartSpaceView)		parentView.removeView(smartSpaceView)
	}		}

			if (com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {
			val cs = ConstraintSet()
			cs.clone(parentView)
			cs.apply {
			val largeClockViewId = previewContext.getId("lockscreen_clock_view_large")
			val smallClockViewId = previewContext.getId("lockscreen_clock_view")
			largeDateView =
			lockscreenSmartspaceController
			.buildAndConnectDateView(parentView, true)
			?.also { view ->
			constrainWidth(view.id, ConstraintSet.WRAP_CONTENT)
			constrainHeight(view.id, ConstraintSet.WRAP_CONTENT)
			connect(view.id, START, largeClockViewId, START)
			connect(view.id, ConstraintSet.END, largeClockViewId, ConstraintSet.END)
			connect(
			view.id,
			TOP,
			largeClockViewId,
			ConstraintSet.BOTTOM,
			smartspaceViewModel.getDateWeatherEndPadding(previewContext),
			)
			}
			smallDateView =
			lockscreenSmartspaceController
			.buildAndConnectDateView(parentView, false)
			?.also { view ->
			constrainWidth(view.id, ConstraintSet.WRAP_CONTENT)
			constrainHeight(view.id, ConstraintSet.WRAP_CONTENT)
			connect(
			view.id,
			START,
			smallClockViewId,
			ConstraintSet.END,
			context.resources.getDimensionPixelSize(
			R.dimen.smartspace_padding_horizontal
			),
			)
			connect(view.id, TOP, smallClockViewId, TOP)
			connect(
			view.id,
			ConstraintSet.BOTTOM,
			smallClockViewId,
			ConstraintSet.BOTTOM,
			)
			}
			parentView.addView(largeDateView)
			parentView.addView(smallDateView)
			}
			cs.applyTo(parentView)
			} else {
	smartSpaceView =		smartSpaceView =
	lockscreenSmartspaceController.buildAndConnectDateView(		lockscreenSmartspaceController.buildAndConnectDateView(
	parent = parentView,		parent = parentView,
	@@ -321,11 +393,11 @@ constructor(
	),		),
	)		)
	}		}

	smartSpaceView?.alpha = if (shouldHighlightSelectedAffordance) DIM_ALPHA else 1.0f		smartSpaceView?.alpha = if (shouldHighlightSelectedAffordance) DIM_ALPHA else 1.0f
	}		}
			}

	private fun setupKeyguardRootView(previewContext: Context, rootView: FrameLayout) {		private fun setupKeyguardRootView(previewContext: Context, rootView: ConstraintLayout) {
	val keyguardRootView = KeyguardRootView(previewContext, null)		val keyguardRootView = KeyguardRootView(previewContext, null)
	rootView.addView(		rootView.addView(
	keyguardRootView,		keyguardRootView,
	@@ -341,6 +413,13 @@ constructor(

	if (!shouldHideClock) {		if (!shouldHideClock) {
	setUpClock(previewContext, rootView)		setUpClock(previewContext, rootView)
			if (com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {
			setUpSmartspace(previewContext, keyguardRootView)
			KeyguardPreviewSmartspaceViewBinder.bind(
			keyguardRootView,
			smartspaceViewModel,
			)
			}
	KeyguardPreviewClockViewBinder.bind(		KeyguardPreviewClockViewBinder.bind(
	keyguardRootView,		keyguardRootView,
	clockViewModel,		clockViewModel,
	@@ -354,8 +433,8 @@ constructor(
	)		)
	}		}

	setUpSmartspace(previewContext, rootView)		if (!com.android.systemui.shared.Flags.clockReactiveSmartspaceLayout()) {
			setUpSmartspace(previewContext, keyguardRootView)
	smartSpaceView?.let {		smartSpaceView?.let {
	KeyguardPreviewSmartspaceViewBinder.bind(		KeyguardPreviewSmartspaceViewBinder.bind(
	it,		it,
	@@ -365,10 +444,13 @@ constructor(
	previewContext,		previewContext,
	getPreviewShadeLayoutWide(display!!),		getPreviewShadeLayoutWide(display!!),
	SceneContainerFlag.isEnabled,		SceneContainerFlag.isEnabled,
			lockId = null,
			udfpsTop = null,
	),		),
	)		)
	}		}
	}		}
			}

	private fun setupShortcuts(keyguardRootView: ConstraintLayout) {		private fun setupShortcuts(keyguardRootView: ConstraintLayout) {
	// Add shortcuts		// Add shortcuts