Merge "Add type TYPE_ADD_TO_HOME_CONFIRMATION to AbstractFloatingView" into tm-dev am: d18c5085c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18457403 Change-Id: I6149ddffbc494b162155b5043447e4a06a6d934b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -93,6 +93,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
|
||||
public static final int TYPE_WIDGETS_EDUCATION_DIALOG = 1 << 15;
|
||||
public static final int TYPE_TASKBAR_EDUCATION_DIALOG = 1 << 16;
|
||||
public static final int TYPE_TASKBAR_ALL_APPS = 1 << 17;
|
||||
public static final int TYPE_ADD_TO_HOME_CONFIRMATION = 1 << 18;
|
||||
|
||||
public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
|
||||
| TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET
|
||||
@@ -100,7 +101,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
|
||||
| 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_OPTIONS_POPUP_DIALOG;
|
||||
| TYPE_OPTIONS_POPUP_DIALOG | TYPE_ADD_TO_HOME_CONFIRMATION;
|
||||
|
||||
// Type of popups which should be kept open during launcher rebind
|
||||
public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
|
||||
|
||||
Reference in New Issue
Block a user