openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove LauncherState.TASKBAR visible element" into sc-v2-dev

This commit is contained in:
Tony Wickham 2021-12-07 20:42:55 +00:00 committed by Android (Google) Code Review
parent 992db75dae 7af54403a3
commit 779879ce3d
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java
View File

@ -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

2
quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java
View File

@ -53,6 +53,6 @@ public class QuickSwitchState extends BackgroundAppState {
@Override
public int getVisibleElements(Launcher launcher) {
return TASKBAR;
return NONE;
}
}

9
src/com/android/launcher3/LauncherState.java
View File

@ -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;
}
/**

5
src/com/android/launcher3/states/SpringLoadedState.java
View File

@ -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;
}
}