diff options
3 files changed, 11 insertions, 2 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java index 2bee7b85eb98..d3febf55117b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java @@ -41,6 +41,7 @@ import com.android.systemui.plugins.PluginManager; import com.android.systemui.statusbar.NotificationListener.NotificationHandler; import com.android.systemui.statusbar.data.repository.NotificationListenerSettingsRepository; import com.android.systemui.statusbar.domain.interactor.SilentNotificationStatusIconsVisibilityInteractor; +import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; @@ -151,6 +152,7 @@ public class NotificationListenerTest extends SysuiTestCase { @Test public void testOnConnectReadStatusBarSetting() { + mSetFlagsRule.disableFlags(NotificationIconContainerRefactor.FLAG_NAME); NotificationListener.NotificationSettingsListener settingsListener = mock(NotificationListener.NotificationSettingsListener.class); mListener.addNotificationSettingsListener(settingsListener); @@ -164,6 +166,7 @@ public class NotificationListenerTest extends SysuiTestCase { @Test public void testOnStatusBarIconsBehaviorChanged() { + mSetFlagsRule.disableFlags(NotificationIconContainerRefactor.FLAG_NAME); NotificationListener.NotificationSettingsListener settingsListener = mock(NotificationListener.NotificationSettingsListener.class); mListener.addNotificationSettingsListener(settingsListener); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt index 2df6e46d630f..d4300f08fbac 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationShelfTest.kt @@ -17,6 +17,7 @@ import com.android.systemui.statusbar.NotificationShelf import com.android.systemui.statusbar.StatusBarIconView import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.row.ExpandableView +import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor import com.android.systemui.statusbar.notification.stack.StackScrollAlgorithm.StackScrollAlgorithmState import com.android.systemui.util.mockito.mock import junit.framework.Assert.assertEquals @@ -71,6 +72,7 @@ open class NotificationShelfTest : SysuiTestCase() { @Test fun testShadeWidth_BasedOnFractionToShade() { + mSetFlagsRule.disableFlags(NotificationIconContainerRefactor.FLAG_NAME) setFractionToShade(0f) setOnLockscreen(true) @@ -86,6 +88,7 @@ open class NotificationShelfTest : SysuiTestCase() { @Test fun testShelfIsLong_WhenNotOnLockscreen() { + mSetFlagsRule.disableFlags(NotificationIconContainerRefactor.FLAG_NAME) setFractionToShade(0f) setOnLockscreen(false) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconContainerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconContainerTest.kt index 62d8f7fa894d..9f4e1dd8cc4d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconContainerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconContainerTest.kt @@ -23,6 +23,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.statusbar.StatusBarIconView import com.android.systemui.statusbar.StatusBarIconView.STATE_DOT import com.android.systemui.statusbar.StatusBarIconView.STATE_HIDDEN +import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor import junit.framework.Assert.assertEquals import junit.framework.Assert.assertFalse import junit.framework.Assert.assertTrue @@ -73,6 +74,7 @@ class NotificationIconContainerTest : SysuiTestCase() { @Test fun calculateWidthFor_fiveIcons_widthForFourIcons() { + mSetFlagsRule.disableFlags(NotificationIconContainerRefactor.FLAG_NAME) iconContainer.setActualPaddingStart(10f) iconContainer.setActualPaddingEnd(10f) iconContainer.setIconSize(10) @@ -151,7 +153,7 @@ class NotificationIconContainerTest : SysuiTestCase() { iconContainer.addView(iconFive) assertEquals(5, iconContainer.childCount) - val width = iconContainer.calculateWidthFor(/* numIcons= */ 5f) + val width = iconContainer.calculateWidthFor(/* numIcons= */ 4f) iconContainer.setActualLayoutWidth(width.toInt()) iconContainer.calculateIconXTranslations() @@ -212,6 +214,7 @@ class NotificationIconContainerTest : SysuiTestCase() { @Test fun shouldForceOverflow_appearingAboveSpeedBump_true() { + mSetFlagsRule.disableFlags(NotificationIconContainerRefactor.FLAG_NAME) val forceOverflow = iconContainer.shouldForceOverflow( /* i= */ 1, @@ -228,7 +231,7 @@ class NotificationIconContainerTest : SysuiTestCase() { iconContainer.shouldForceOverflow( /* i= */ 10, /* speedBumpIndex= */ 11, - /* iconAppearAmount= */ 0f, + /* iconAppearAmount= */ 0.1f, /* maxVisibleIcons= */ 5 ) assertTrue(forceOverflow) |