From 7af54403a3d74051472d3e17f9055cd9bc7d824b Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 6 Dec 2021 15:54:43 -0800 Subject: [PATCH] Remove LauncherState.TASKBAR visible element It's no longer used, so removing to cleanup code and reduce confusion Test: no functional change Fixes: 209512651 Change-Id: Ibd671bde7190df976b5365331731a55a9abdbb35 --- .../launcher3/uioverrides/states/BackgroundAppState.java | 3 +-- .../launcher3/uioverrides/states/QuickSwitchState.java | 2 +- src/com/android/launcher3/LauncherState.java | 9 ++++----- src/com/android/launcher3/states/SpringLoadedState.java | 5 ----- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index 4984b95720..b7330072d4 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -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 diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java index d36e76b89b..edfb9217a6 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java @@ -53,6 +53,6 @@ public class QuickSwitchState extends BackgroundAppState { @Override public int getVisibleElements(Launcher launcher) { - return TASKBAR; + return NONE; } } diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 15378e0ab9..9324ea5626 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -57,10 +57,9 @@ public abstract class LauncherState implements BaseState { 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 { } public int getVisibleElements(Launcher launcher) { - return HOTSEAT_ICONS | WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR | TASKBAR; + return HOTSEAT_ICONS | WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR; } /** diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java index 5fe5450a12..d52594e409 100644 --- a/src/com/android/launcher3/states/SpringLoadedState.java +++ b/src/com/android/launcher3/states/SpringLoadedState.java @@ -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; - } }