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

Commit 1e63367b authored by Tobias Dubois's avatar Tobias Dubois Committed by Edward Savage-Jones
Browse files

Fix overlapping FloatingViewType IntDef 

TYPE_DISCOVERY_BOUNCE and TYPE_QUICKSTEP_PREVIEW have the same value.
Make sure each flag has a unique value.

Test: manual
Change-Id: I0fec3f27ffc31bad80d3af7b3baa3631b61b2567
parent 90a54e73

src/com/android/launcher3/AbstractFloatingView.java

+3 −3
Original line number Original line 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;

    public static final int TYPE_DISCOVERY_BOUNCE = 1 << 6;





    // Popups related to quickstep UI

    // Popups related to quickstep UI

    public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 6;

    public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 7;

    public static final int TYPE_TASK_MENU = 1 << 7;

    public static final int TYPE_TASK_MENU = 1 << 8;

    public static final int TYPE_OPTIONS_POPUP = 1 << 8;

    public static final int TYPE_OPTIONS_POPUP = 1 << 9;





    public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP

    public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP

            | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET

            | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET