From 7ef4fe42cbcdf9a616ee69a38ae3d9682daa34fe Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Thu, 7 Apr 2022 16:29:44 -0700 Subject: [PATCH] Add separate AFV type for options popup dialog. Now that we close all non rebind safe AFVs onResume, the options popup dialog is getting closed. This dialog is rebind safe, but currently using TYPE_OPTIONS_POPUP which isn't. Test: Dialog stays open on activity recreate. Also ran affected tests. Bug: 227142635 Change-Id: Ibbac925ce5dd2de5c7770cb8f5bd8c5e438449cf --- src/com/android/launcher3/AbstractFloatingView.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index ceb38d0e77..4386f4196c 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -66,7 +66,8 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP, TYPE_WIDGETS_EDUCATION_DIALOG, TYPE_TASKBAR_EDUCATION_DIALOG, - TYPE_TASKBAR_ALL_APPS + TYPE_TASKBAR_ALL_APPS, + TYPE_OPTIONS_POPUP_DIALOG }) @Retention(RetentionPolicy.SOURCE) public @interface FloatingViewType {} @@ -86,6 +87,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_TASK_MENU = 1 << 11; public static final int TYPE_OPTIONS_POPUP = 1 << 12; public static final int TYPE_ICON_SURFACE = 1 << 13; + public static final int TYPE_OPTIONS_POPUP_DIALOG = 1 << 18; public static final int TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP = 1 << 14; public static final int TYPE_WIDGETS_EDUCATION_DIALOG = 1 << 15; @@ -97,13 +99,14 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR | TYPE_LISTENER | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP | TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP - | TYPE_WIDGETS_EDUCATION_DIALOG | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS; + | TYPE_WIDGETS_EDUCATION_DIALOG | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS + | TYPE_OPTIONS_POPUP_DIALOG; // Type of popups which should be kept open during launcher rebind public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_WIDGETS_EDUCATION_DIALOG - | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS; + | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG; // Usually we show the back button when a floating view is open. Instead, hide for these types. public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE