Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove NOTIFICATION_GROUP_DISMISSAL_ANIMATION flag

Browse Source 
Test: atest SystemUITests
Fixes: 259217907
Change-Id: I92e041ed09a3fa665a6f1722a6e7c3565bdaf538
This commit is contained in:
Jeff DeCew
2023-04-05 13:52:33 -04:00
parent 47934f7c4c
commit f236dd1104
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -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)

3
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java
View File

@@ -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;
}

6
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt
View File

@@ -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())
}