Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad61ce07 authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Fix overlapping FloatingViewType IntDef" 

am: c73828fd

Change-Id: I2b5f60a83ed1f07050f95f4c4240682f7ec480f6
parents acaffe60 c73828fd

src/com/android/launcher3/AbstractFloatingView.java

+3 −3
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch 
    public static final int TYPE_DISCOVERY_BOUNCE = 1 << 6;



    // Popups related to quickstep UI

    public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 6;

    public static final int TYPE_TASK_MENU = 1 << 7;

    public static final int TYPE_OPTIONS_POPUP = 1 << 8;

    public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 7;

    public static final int TYPE_TASK_MENU = 1 << 8;

    public static final int TYPE_OPTIONS_POPUP = 1 << 9;



    public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP

            | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET