Merge "[SB][Chips] Add TimeSource to ShortTimeDelta for chip model." into main (9e3e8ada) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/compose/ChipContent.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,11 @@ fun ChipContent(viewModel: OngoingActivityChipModel.Active, modifier: Modifier =
		}

		is OngoingActivityChipModel.Active.ShortTimeDelta -> {
		val timeRemainingState = rememberTimeRemainingState(futureTimeMillis = viewModel.time)
		val timeRemainingState =
		rememberTimeRemainingState(
		futureTimeMillis = viewModel.time,
		timeSource = viewModel.timeSource,
		)

		timeRemainingState.timeRemainingData?.let {
		val text = formatTimeRemainingData(it)

+8 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,8 @@ sealed class OngoingActivityChipModel {

		/**
		* The [TimeSource] that should be used to track the current time for this timer. Should
		* be compatible with [startTimeMs].
		* be compatible units with [startTimeMs]. Only used in the Compose version of the
		* chips.
		*/
		val timeSource: TimeSource = TimeSource { SystemClock.elapsedRealtime() },

		@@ -187,6 +188,12 @@ sealed class OngoingActivityChipModel {
		* this model and the [Timer] model use the same units.
		*/
		@CurrentTimeMillisLong val time: Long,

		/**
		* The [TimeSource] that should be used to track the current time for this timer. Should
		* be compatible units with [time]. Only used in the Compose version of the chips.
		*/
		val timeSource: TimeSource = TimeSource { System.currentTimeMillis() },
		override val onClickListenerLegacy: View.OnClickListener?,
		override val clickBehavior: ClickBehavior,
		override val transitionManager: TransitionManager? = null,

+1 −4

Original line number	Diff line number	Diff line
		@@ -100,10 +100,7 @@ class TimeRemainingState(private val timeSource: TimeSource, private val futureT

		/** Remember and manage the TimeRemainingState */
		@Composable
		fun rememberTimeRemainingState(
		futureTimeMillis: Long,
		timeSource: TimeSource = remember { TimeSource { System.currentTimeMillis() } },
		): TimeRemainingState {
		fun rememberTimeRemainingState(futureTimeMillis: Long, timeSource: TimeSource): TimeRemainingState {

		val state =
		remember(timeSource, futureTimeMillis) { TimeRemainingState(timeSource, futureTimeMillis) }