Clean up flag notification_async_hybrid_view_inflation 4 (c7da5b37) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustmentProviderTest.kt

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,6 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.NotifS
	import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider		import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider
	import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager		import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager
	import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation		import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation
	import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation
	import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController		import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController
	import com.android.systemui.util.mockito.any		import com.android.systemui.util.mockito.any
	import com.android.systemui.util.mockito.eq		import com.android.systemui.util.mockito.eq
	@@ -161,10 +160,8 @@ class NotifUiAdjustmentProviderTest : SysuiTestCase() {
	}		}

	@Test		@Test
	@EnableFlags(AsyncHybridViewInflation.FLAG_NAME)
	fun becomeChildInGroup_asyncHybirdFlagEnabled_needReInflation() {		fun becomeChildInGroup_asyncHybirdFlagEnabled_needReInflation() {
	// Given: an Entry that is not child in group		// Given: an Entry that is not child in group
	// AsyncHybridViewInflation flag is enabled
	val oldAdjustment = adjustmentProvider.calculateAdjustment(entry)		val oldAdjustment = adjustmentProvider.calculateAdjustment(entry)
	assertThat(oldAdjustment.isChildInGroup).isFalse()		assertThat(oldAdjustment.isChildInGroup).isFalse()

	@@ -178,24 +175,6 @@ class NotifUiAdjustmentProviderTest : SysuiTestCase() {
	assertTrue(NotifUiAdjustment.needReinflate(oldAdjustment, newAdjustment))		assertTrue(NotifUiAdjustment.needReinflate(oldAdjustment, newAdjustment))
	}		}

	@Test
	@DisableFlags(AsyncHybridViewInflation.FLAG_NAME)
	fun becomeChildInGroup_asyncHybirdFlagDisabled_noNeedForReInflation() {
	// Given: an Entry that is not child in group
	// AsyncHybridViewInflation flag is disabled
	val oldAdjustment = adjustmentProvider.calculateAdjustment(entry)
	assertThat(oldAdjustment.isChildInGroup).isFalse()

	// When: the Entry becomes a group child
	entry.markAsGroupChild()
	val newAdjustment = adjustmentProvider.calculateAdjustment(entry)
	assertThat(newAdjustment.isChildInGroup).isTrue()
	assertThat(newAdjustment).isNotEqualTo(oldAdjustment)

	// Then: need no re-inflation
	assertFalse(NotifUiAdjustment.needReinflate(oldAdjustment, newAdjustment))
	}

	@Test		@Test
	@EnableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME)		@EnableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME)
	fun changeIsGroupSummary_needReInflation() {		fun changeIsGroupSummary_needReInflation() {

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflaterTest.kt

+0 −3

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/SingleLineViewBinderTest.kt

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import com.android.systemui.statusbar.notification.row.NotificationRowContentBin
	import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_SINGLE_LINE		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_SINGLE_LINE
	import com.android.systemui.statusbar.notification.row.SingleLineViewInflater.inflatePrivateSingleLineView		import com.android.systemui.statusbar.notification.row.SingleLineViewInflater.inflatePrivateSingleLineView
	import com.android.systemui.statusbar.notification.row.SingleLineViewInflater.inflatePublicSingleLineView		import com.android.systemui.statusbar.notification.row.SingleLineViewInflater.inflatePublicSingleLineView
	import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation
	import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineViewBinder		import com.android.systemui.statusbar.notification.row.ui.viewbinder.SingleLineViewBinder
	import com.android.systemui.testKosmos		import com.android.systemui.testKosmos
	import kotlin.test.assertEquals		import kotlin.test.assertEquals
	@@ -58,7 +57,6 @@ class SingleLineViewBinderTest : SysuiTestCase() {
	}		}

	@Test		@Test
	@EnableFlags(AsyncHybridViewInflation.FLAG_NAME)
	fun bindNonConversationSingleLineView() {		fun bindNonConversationSingleLineView() {
	// GIVEN: a row with bigText style notification		// GIVEN: a row with bigText style notification
	val style = Notification.BigTextStyle().bigText(CONTENT_TEXT)		val style = Notification.BigTextStyle().bigText(CONTENT_TEXT)
	@@ -104,7 +102,6 @@ class SingleLineViewBinderTest : SysuiTestCase() {
	}		}

	@Test		@Test
	@EnableFlags(AsyncHybridViewInflation.FLAG_NAME)
	fun bindGroupConversationSingleLineView() {		fun bindGroupConversationSingleLineView() {
	// GIVEN a row with a group conversation notification		// GIVEN a row with a group conversation notification
	val user =		val user =
	@@ -170,7 +167,6 @@ class SingleLineViewBinderTest : SysuiTestCase() {
	}		}

	@Test		@Test
	@EnableFlags(AsyncHybridViewInflation.FLAG_NAME)
	fun bindConversationSingleLineView_nonConversationViewModel() {		fun bindConversationSingleLineView_nonConversationViewModel() {
	// GIVEN: a ConversationSingleLineView, and a nonConversationViewModel		// GIVEN: a ConversationSingleLineView, and a nonConversationViewModel
	val style = Notification.BigTextStyle().bigText(CONTENT_TEXT)		val style = Notification.BigTextStyle().bigText(CONTENT_TEXT)
	@@ -218,7 +214,6 @@ class SingleLineViewBinderTest : SysuiTestCase() {

	@Test		@Test
	@EnableFlags(		@EnableFlags(
	AsyncHybridViewInflation.FLAG_NAME,
	android.app.Flags.FLAG_NM_SUMMARIZATION_UI,		android.app.Flags.FLAG_NM_SUMMARIZATION_UI,
	android.app.Flags.FLAG_NM_SUMMARIZATION,		android.app.Flags.FLAG_NM_SUMMARIZATION,
	)		)

Original line number	Original line	Diff line number	Diff line
	@@ -26,14 +26,12 @@ import android.graphics.PorterDuff
	import android.graphics.PorterDuffXfermode		import android.graphics.PorterDuffXfermode
	import android.graphics.drawable.Drawable		import android.graphics.drawable.Drawable
	import android.graphics.drawable.Icon		import android.graphics.drawable.Icon
	import android.platform.test.annotations.EnableFlags
	import android.testing.TestableLooper		import android.testing.TestableLooper
	import androidx.core.graphics.drawable.toBitmap		import androidx.core.graphics.drawable.toBitmap
	import androidx.test.ext.junit.runners.AndroidJUnit4		import androidx.test.ext.junit.runners.AndroidJUnit4
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.res.R		import com.android.systemui.res.R
	import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation
	import com.android.systemui.statusbar.notification.row.ui.viewmodel.ConversationAvatar		import com.android.systemui.statusbar.notification.row.ui.viewmodel.ConversationAvatar
	import com.android.systemui.statusbar.notification.row.ui.viewmodel.FacePile		import com.android.systemui.statusbar.notification.row.ui.viewmodel.FacePile
	import com.android.systemui.statusbar.notification.row.ui.viewmodel.SingleIcon		import com.android.systemui.statusbar.notification.row.ui.viewmodel.SingleIcon
	@@ -51,7 +49,6 @@ import org.junit.runner.RunWith
	@SmallTest		@SmallTest
	@RunWith(AndroidJUnit4::class)		@RunWith(AndroidJUnit4::class)
	@TestableLooper.RunWithLooper		@TestableLooper.RunWithLooper
	@EnableFlags(AsyncHybridViewInflation.FLAG_NAME)
	class SingleLineViewInflaterTest : SysuiTestCase() {		class SingleLineViewInflaterTest : SysuiTestCase() {
	// Non-group MessagingStyles only have firstSender		// Non-group MessagingStyles only have firstSender
	private lateinit var firstSender: Person		private lateinit var firstSender: Person