diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java index 32873d96e76c..81e7d1fc4d87 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java @@ -602,7 +602,7 @@ public class BubbleData { List<Bubble> removedBubbles = filterAllBubbles(bubble -> userId == bubble.getUser().getIdentifier()); for (Bubble b : removedBubbles) { - doRemove(b.getKey(), Bubbles.DISMISS_USER_REMOVED); + doRemove(b.getKey(), Bubbles.DISMISS_USER_ACCOUNT_REMOVED); } if (!removedBubbles.isEmpty()) { dispatchPendingChanges(); @@ -678,7 +678,7 @@ public class BubbleData { || reason == Bubbles.DISMISS_SHORTCUT_REMOVED || reason == Bubbles.DISMISS_PACKAGE_REMOVED || reason == Bubbles.DISMISS_USER_CHANGED - || reason == Bubbles.DISMISS_USER_REMOVED; + || reason == Bubbles.DISMISS_USER_ACCOUNT_REMOVED; int indexToRemove = indexForKey(key); if (indexToRemove == -1) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java index 1d053f9aab35..82af88d03b19 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java @@ -61,7 +61,7 @@ public interface Bubbles { DISMISS_NOTIF_CANCEL, DISMISS_ACCESSIBILITY_ACTION, DISMISS_NO_LONGER_BUBBLE, DISMISS_USER_CHANGED, DISMISS_GROUP_CANCELLED, DISMISS_INVALID_INTENT, DISMISS_OVERFLOW_MAX_REACHED, DISMISS_SHORTCUT_REMOVED, DISMISS_PACKAGE_REMOVED, - DISMISS_NO_BUBBLE_UP, DISMISS_RELOAD_FROM_DISK, DISMISS_USER_REMOVED, + DISMISS_NO_BUBBLE_UP, DISMISS_RELOAD_FROM_DISK, DISMISS_USER_ACCOUNT_REMOVED, DISMISS_SWITCH_TO_STACK}) @Target({FIELD, LOCAL_VARIABLE, PARAMETER}) @interface DismissReason { @@ -82,7 +82,7 @@ public interface Bubbles { int DISMISS_PACKAGE_REMOVED = 13; int DISMISS_NO_BUBBLE_UP = 14; int DISMISS_RELOAD_FROM_DISK = 15; - int DISMISS_USER_REMOVED = 16; + int DISMISS_USER_ACCOUNT_REMOVED = 16; int DISMISS_SWITCH_TO_STACK = 17; /** Returns a binder that can be passed to an external process to manipulate Bubbles. */ diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java index f55c96cb1769..93e405131a58 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java @@ -1170,9 +1170,9 @@ public class BubbleDataTest extends ShellTestCase { // Verify the update has the removals. BubbleData.Update update = mUpdateCaptor.getValue(); assertThat(update.removedBubbles.get(0)).isEqualTo( - Pair.create(mBubbleA2, Bubbles.DISMISS_USER_REMOVED)); + Pair.create(mBubbleA2, Bubbles.DISMISS_USER_ACCOUNT_REMOVED)); assertThat(update.removedBubbles.get(1)).isEqualTo( - Pair.create(mBubbleA1, Bubbles.DISMISS_USER_REMOVED)); + Pair.create(mBubbleA1, Bubbles.DISMISS_USER_ACCOUNT_REMOVED)); // Verify no A bubbles in active or overflow. assertBubbleListContains(mBubbleC1, mBubbleB3); |