Merge changes from topic "clean-up-notification_async_hybrid_view_inflation" into main (b6348e91) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -111,13 +111,6 @@ flag {
	bug: "217799515"		bug: "217799515"
	}		}

	flag {
	name: "notification_async_hybrid_view_inflation"
	namespace: "systemui"
	description: "Inflates hybrid (single-line) notification views from the background thread."
	bug: "217799515"
	}

	flag {		flag {
	name: "notification_color_update_logger"		name: "notification_color_update_logger"
	namespace: "systemui"		namespace: "systemui"

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/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java

+1 −2

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

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@ import android.graphics.drawable.Icon
	import android.text.TextUtils		import android.text.TextUtils
	import com.android.systemui.statusbar.NotificationLockscreenUserManager.RedactionType		import com.android.systemui.statusbar.NotificationLockscreenUserManager.RedactionType
	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

	/**		/**
	* An immutable object which contains minimal state extracted from an entry that represents state		* An immutable object which contains minimal state extracted from an entry that represents state
	@@ -57,9 +56,7 @@ internal constructor(
	oldAdjustment.redactionType != newAdjustment.redactionType -> true		oldAdjustment.redactionType != newAdjustment.redactionType -> true
	areDifferent(oldAdjustment.smartActions, newAdjustment.smartActions) -> true		areDifferent(oldAdjustment.smartActions, newAdjustment.smartActions) -> true
	newAdjustment.smartReplies != oldAdjustment.smartReplies -> true		newAdjustment.smartReplies != oldAdjustment.smartReplies -> true
	AsyncHybridViewInflation.isEnabled &&		!oldAdjustment.isChildInGroup && newAdjustment.isChildInGroup -> true
	!oldAdjustment.isChildInGroup &&
	newAdjustment.isChildInGroup -> true
	AsyncGroupHeaderViewInflation.isEnabled &&		AsyncGroupHeaderViewInflation.isEnabled &&
	!oldAdjustment.isGroupSummary &&		!oldAdjustment.isGroupSummary &&
	newAdjustment.isGroupSummary -> true		newAdjustment.isGroupSummary -> true

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

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,6 @@ import com.android.systemui.statusbar.notification.row.NotifInflationErrorManage
	import com.android.systemui.statusbar.notification.row.icon.AppIconProvider;		import com.android.systemui.statusbar.notification.row.icon.AppIconProvider;
	import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider;		import com.android.systemui.statusbar.notification.row.icon.NotificationIconStyleProvider;
	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.notification.shared.NotificationBundleUi;		import com.android.systemui.statusbar.notification.shared.NotificationBundleUi;

	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	@@ -379,7 +378,7 @@ public class PreparationCoordinator implements Coordinator {
	inflateRequiredNotifViews(summary);		inflateRequiredNotifViews(summary);
	for (int j = 0; j < children.size(); j++) {		for (int j = 0; j < children.size(); j++) {
	NotificationEntry child = children.get(j);		NotificationEntry child = children.get(j);
	if (AsyncHybridViewInflation.isEnabled()) child.markAsGroupChild();		child.markAsGroupChild();
	boolean childShouldBeBound = j < mChildBindCutoff;		boolean childShouldBeBound = j < mChildBindCutoff;
	if (childShouldBeBound) {		if (childShouldBeBound) {
	inflateRequiredNotifViews(child);		inflateRequiredNotifViews(child);