Loading packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/BundleBarn.kt +3 −2 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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) Loading packages/SystemUI/src/com/android/systemui/statusbar/notification/row/domain/interactor/BundleInteractor.kt +9 −7 Original line number Diff line number Diff line Loading @@ -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 Loading @@ -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 Loading Loading @@ -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() } Loading Loading
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/BundleBarn.kt +3 −2 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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) Loading
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/domain/interactor/BundleInteractor.kt +9 −7 Original line number Diff line number Diff line Loading @@ -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 Loading @@ -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 Loading Loading @@ -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() } Loading