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

Commit d60297b9 authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge "ktfmt changes on BundleInteractor & BundleBarn" into main

parents e1fe3107 b7ad2093
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ import com.android.systemui.statusbar.notification.row.ui.viewmodel.BundleHeader
import com.android.systemui.statusbar.notification.stack.NotificationListContainer
import com.android.systemui.util.time.SystemClock
import dagger.Lazy
import javax.inject.Inject
import javax.inject.Provider
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import javax.inject.Inject
import javax.inject.Provider

/** Class that handles inflating BundleEntry view and controller, for use by NodeSpecBuilder. */
@SysUISingleton
@@ -125,6 +125,7 @@ constructor(
        row.addOnAttachStateChangeListener(
            object : View.OnAttachStateChangeListener {
                override fun onViewAttachedToWindow(v: View) {}

                override fun onViewDetachedFromWindow(v: View) {
                    scope.cancel()
                    row.removeOnAttachStateChangeListener(this)
+9 −7
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.statusbar.notification.row.icon.AppIconProvider
import com.android.systemui.util.icuMessageFormat
import com.android.systemui.util.time.SystemClock
import com.android.systemui.utils.coroutines.flow.mapLatestConflated
import javax.inject.Inject
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
@@ -44,7 +45,6 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject

/** Provides functionality for UI to interact with a Notification Bundle. */
@BundleRowScope
@@ -146,10 +146,12 @@ constructor(
    fun setTargetScene(scene: SceneKey) {
        sceneTargetJob?.cancel()

        sceneTargetJob = scope.launch {
        sceneTargetJob =
            scope.launch {
                state?.setTargetScene(scene, composeScope!!)

            // [setTargetScene] does not immediately update [currentScene] so we must check [scene]
                // [setTargetScene] does not immediately update [currentScene] so we must check
                // [scene]
                if (scene == BundleHeader.Scenes.Collapsed) {
                    repository.lastCollapseTime = systemClock.uptimeMillis()
                }