diff options
3 files changed, 1 insertions, 13 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 31af67f8e110..e526415be1fa 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -70,11 +70,6 @@ object Flags { @JvmField val USE_ROUNDNESS_SOURCETYPES = releasedFlag(116, "use_roundness_sourcetype") - // TODO(b/259217907) - @JvmField - val NOTIFICATION_GROUP_DISMISSAL_ANIMATION = - releasedFlag(259217907, "notification_group_dismissal_animation") - @JvmField val SIMPLIFIED_APPEAR_FRACTION = unreleasedFlag(259395680, "simplified_appear_fraction", teamfood = true) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java index 5ca0866209a5..9bf05cb47f04 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java @@ -376,8 +376,7 @@ public class ExpandableNotificationRowController implements NotifViewController public boolean offerToKeepInParentForAnimation() { //If the User dismissed the notification's parent, we want to keep it attached until the //dismiss animation is ongoing. Therefore we don't want to remove it in the ShadeViewDiffer. - if (mFeatureFlags.isEnabled(Flags.NOTIFICATION_GROUP_DISMISSAL_ANIMATION) - && mView.isParentDismissed()) { + if (mView.isParentDismissed()) { mView.setKeepInParentForDismissAnimation(true); return true; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt index 60bc3a45c0dd..c2f1f61e8a5f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt @@ -25,7 +25,6 @@ import com.android.internal.statusbar.IStatusBarService import com.android.systemui.SysuiTestCase import com.android.systemui.classifier.FalsingCollector import com.android.systemui.flags.FeatureFlags -import com.android.systemui.flags.Flags import com.android.systemui.plugins.FalsingManager import com.android.systemui.plugins.PluginManager import com.android.systemui.plugins.statusbar.StatusBarStateController @@ -145,8 +144,6 @@ class ExpandableNotificationRowControllerTest : SysuiTestCase() { @Test fun offerKeepInParent_parentDismissed() { - whenever(featureFlags.isEnabled(Flags.NOTIFICATION_GROUP_DISMISSAL_ANIMATION)) - .thenReturn(true) whenever(view.isParentDismissed).thenReturn(true) Assert.assertTrue(controller.offerToKeepInParentForAnimation()) @@ -155,9 +152,6 @@ class ExpandableNotificationRowControllerTest : SysuiTestCase() { @Test fun offerKeepInParent_parentNotDismissed() { - whenever(featureFlags.isEnabled(Flags.NOTIFICATION_GROUP_DISMISSAL_ANIMATION)) - .thenReturn(true) - Assert.assertFalse(controller.offerToKeepInParentForAnimation()) Mockito.verify(view, never()).setKeepInParentForDismissAnimation(anyBoolean()) } |