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

Commit 562ca940 authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Remove LauncherState.TASKBAR visible element" into sc-v2-dev am: 779879ce 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16405551

Change-Id: I876064e6ca079acf04ffdf17ee38060e270852a7
parents a51230f6 779879ce

quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+1 −2
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ public class BackgroundAppState extends OverviewState { 
        return super.getVisibleElements(launcher)

                & ~OVERVIEW_ACTIONS

                & ~CLEAR_ALL_BUTTON

                & ~VERTICAL_SWIPE_INDICATOR

                | TASKBAR;

                & ~VERTICAL_SWIPE_INDICATOR;

    }



    @Override

quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java

+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,6 @@ public class QuickSwitchState extends BackgroundAppState { 


    @Override

    public int getVisibleElements(Launcher launcher) {

        return TASKBAR;

        return NONE;

    }

}

src/com/android/launcher3/LauncherState.java

+4 −5
Original line number Diff line number Diff line
@@ -57,10 +57,9 @@ public abstract class LauncherState implements BaseState<LauncherState> { 
    public static final int ALL_APPS_CONTENT = 1 << 1;

    public static final int VERTICAL_SWIPE_INDICATOR = 1 << 2;

    public static final int OVERVIEW_ACTIONS = 1 << 3;

    public static final int TASKBAR = 1 << 4;

    public static final int CLEAR_ALL_BUTTON = 1 << 5;

    public static final int WORKSPACE_PAGE_INDICATOR = 1 << 6;

    public static final int SPLIT_PLACHOLDER_VIEW = 1 << 7;

    public static final int CLEAR_ALL_BUTTON = 1 << 4;

    public static final int WORKSPACE_PAGE_INDICATOR = 1 << 5;

    public static final int SPLIT_PLACHOLDER_VIEW = 1 << 6;



    // Flag indicating workspace has multiple pages visible.

    public static final int FLAG_MULTI_PAGE = BaseState.getFlag(0);
@@ -186,7 +185,7 @@ public abstract class LauncherState implements BaseState<LauncherState> { 
    }



    public int getVisibleElements(Launcher launcher) {

        return HOTSEAT_ICONS | WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR | TASKBAR;

        return HOTSEAT_ICONS | WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR;

    }



    /**

src/com/android/launcher3/states/SpringLoadedState.java

+0 −5
Original line number Diff line number Diff line
@@ -90,9 +90,4 @@ public class SpringLoadedState extends LauncherState { 
    public float getWorkspaceBackgroundAlpha(Launcher launcher) {

        return 0.2f;

    }



    @Override

    public int getVisibleElements(Launcher launcher) {

        return (super.getVisibleElements(launcher) | HOTSEAT_ICONS) & ~TASKBAR;

    }

}