Merge "SysUI: Clean up NotificationViewFlipperPausing flag." into main (824b69fc) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -83,16 +83,6 @@ flag {
		bug: "343942780"
		}

		flag {
		name: "notification_view_flipper_pausing_v2"
		namespace: "systemui"
		description: "Pause ViewFlippers inside Notification custom layouts when the shade is closed."
		bug: "309146176"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "notification_ambient_suppression_after_inflation"
		namespace: "systemui"

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import com.android.systemui.keyguard.shared.model.StatusBarState
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.power.data.repository.fakePowerRepository
		import com.android.systemui.power.shared.model.WakefulnessState
		import com.android.systemui.statusbar.notification.shared.NotificationViewFlipperPausing
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.test.runCurrent
		@@ -36,7 +35,6 @@ import org.junit.runner.RunWith

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@EnableFlags(NotificationViewFlipperPausing.FLAG_NAME)
		class NotificationViewFlipperViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos()
		val underTest

+1 −4

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import android.widget.flags.Flags.notifLinearlayoutOptimized
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.statusbar.notification.row.icon.NotificationRowIconViewInflaterFactory
		import com.android.systemui.statusbar.notification.shared.NotificationViewFlipperPausing
		import javax.inject.Inject
		import javax.inject.Provider

		@@ -46,9 +45,7 @@ constructor(
		if (notifLinearlayoutOptimized()) {
		add(optimizedLinearLayoutFactory)
		}
		if (NotificationViewFlipperPausing.isEnabled) {
		add(notificationViewFlipperFactory.get())
		}
		if (android.app.Flags.notificationsRedesignAppIcons()) {
		add(notificationRowIconViewInflaterFactory)
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.widget.ViewFlipper
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag
		import com.android.systemui.statusbar.notification.row.ui.viewbinder.NotificationViewFlipperBinder
		import com.android.systemui.statusbar.notification.row.ui.viewmodel.NotificationViewFlipperViewModel
		import com.android.systemui.statusbar.notification.shared.NotificationViewFlipperPausing
		import javax.inject.Inject

		/**
		@@ -35,10 +34,6 @@ class NotificationViewFlipperFactory
		constructor(
		private val viewModel: NotificationViewFlipperViewModel,
		) : NotifRemoteViewsFactory {
		init {
		/* check if */ NotificationViewFlipperPausing.isUnexpectedlyInLegacyMode()
		}

		override fun instantiate(
		row: ExpandableNotificationRow,
		@InflationFlag layoutType: Int,

+0 −5

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.row.ui.viewmodel

		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.statusbar.notification.shared.NotificationViewFlipperPausing
		import com.android.systemui.statusbar.notification.stack.domain.interactor.NotificationStackInteractor
		import com.android.systemui.util.kotlin.FlowDumperImpl
		import javax.inject.Inject
		@@ -31,9 +30,5 @@ constructor(
		dumpManager: DumpManager,
		stackInteractor: NotificationStackInteractor,
		) : FlowDumperImpl(dumpManager) {
		init {
		/* check if */ NotificationViewFlipperPausing.isUnexpectedlyInLegacyMode()
		}

		val isPaused = stackInteractor.isShowingOnLockscreen.dumpWhileCollecting("isPaused")
		}