Files
lawnchair/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
Jeremy Sim e35d112693 Fix bug with Taskbar not differentiating between user profiles
This patch fixes a bug where Taskbar would not differentiate between user profiles when selecting an app to launch from Overview.

The bug occurred because findLastActiveTaskAndRunCallback(), which checks for already-running tasks when launching an app from the Taskbar, only checks for a ComponentName match and not a userId match.

Fixed by making the findLastActiveTaskAndRunCallback() also check for a userId match.

Fixes: 270456926
Test: Manual
Change-Id: I43ff06083a5dce775fdbd0b0ed951beaae34c0ab
2023-03-01 10:57:41 -08:00

281 lines
10 KiB
Java

/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.launcher3.taskbar;
import static android.app.ActivityTaskManager.INVALID_TASK_ID;
import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_APP;
import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
import android.view.MotionEvent;
import android.view.View;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.model.data.ItemInfoWithIcon;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.quickstep.util.GroupTask;
import com.android.quickstep.views.RecentsView;
import com.android.quickstep.views.TaskView;
import com.android.quickstep.views.TaskView.TaskIdAttributeContainer;
import java.io.PrintWriter;
/**
* Base class for providing different taskbar UI
*/
public class TaskbarUIController {
public static final TaskbarUIController DEFAULT = new TaskbarUIController();
// Initialized in init.
protected TaskbarControllers mControllers;
@CallSuper
protected void init(TaskbarControllers taskbarControllers) {
mControllers = taskbarControllers;
}
@CallSuper
protected void onDestroy() {
mControllers = null;
}
protected boolean isTaskbarTouchable() {
return true;
}
/**
* This should only be called by TaskbarStashController so that a TaskbarUIController can
* disable stashing. All other controllers should use
* {@link TaskbarStashController#supportsVisualStashing()} as the source of truth.
*/
public boolean supportsVisualStashing() {
return true;
}
protected void onStashedInAppChanged() { }
/**
* Called when taskbar icon layout bounds change.
*/
protected void onIconLayoutBoundsChanged() { }
/** Called when an icon is launched. */
@CallSuper
public void onTaskbarIconLaunched(ItemInfo item) {
// When launching from Taskbar, e.g. from Overview, set FLAG_IN_APP immediately instead of
// waiting for onPause, to reduce potential visual noise during the app open transition.
mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_APP, true);
mControllers.taskbarStashController.applyState();
}
public View getRootView() {
return mControllers.taskbarActivityContext.getDragLayer();
}
/**
* Called when swiping from the bottom nav region in fully gestural mode.
* @param inProgress True if the animation started, false if we just settled on an end target.
*/
public void setSystemGestureInProgress(boolean inProgress) {
mControllers.taskbarStashController.setSystemGestureInProgress(inProgress);
}
/**
* Manually closes the overlay window.
*/
public void hideOverlayWindow() {
if (!DisplayController.isTransientTaskbar(mControllers.taskbarActivityContext)
|| mControllers.taskbarAllAppsController.isOpen()) {
mControllers.taskbarOverlayController.hideWindow();
}
}
/**
* User expands PiP to full-screen (or split-screen) mode, try to hide the Taskbar.
*/
public void onExpandPip() {
if (mControllers != null) {
final TaskbarStashController stashController = mControllers.taskbarStashController;
stashController.updateStateForFlag(FLAG_IN_APP, true);
stashController.applyState();
}
}
/**
* Returns {@code true} iff taskbar is stashed.
*/
public boolean isTaskbarStashed() {
return mControllers.taskbarStashController.isStashed();
}
/**
* Returns {@code true} iff taskbar All Apps is open.
*/
public boolean isTaskbarAllAppsOpen() {
return mControllers.taskbarAllAppsController.isOpen();
}
/**
* Called at the end of the swipe gesture on Transient taskbar.
*/
public void startTranslationSpring() {
mControllers.taskbarActivityContext.startTranslationSpring();
}
/*
* @param ev MotionEvent in screen coordinates.
* @return Whether any Taskbar item could handle the given MotionEvent if given the chance.
*/
public boolean isEventOverAnyTaskbarItem(MotionEvent ev) {
return mControllers.taskbarViewController.isEventOverAnyItem(ev)
|| mControllers.navbarButtonsViewController.isEventOverAnyItem(ev);
}
/**
* Returns true if icons should be aligned to hotseat in the current transition.
*/
public boolean isIconAlignedWithHotseat() {
return false;
}
/**
* Returns true if hotseat icons are on top of view hierarchy when aligned in the current state.
*/
public boolean isHotseatIconOnTopWhenAligned() {
return true;
}
@CallSuper
protected void dumpLogs(String prefix, PrintWriter pw) {
pw.println(String.format(
"%sTaskbarUIController: using an instance of %s",
prefix,
getClass().getSimpleName()));
}
/**
* Returns RecentsView. Overwritten in LauncherTaskbarUIController and
* FallbackTaskbarUIController with Launcher-specific implementations. Returns null for other
* UI controllers (like DesktopTaskbarUIController) that don't have a RecentsView.
*/
public @Nullable RecentsView getRecentsView() {
return null;
}
public void startSplitSelection(SplitConfigurationOptions.SplitSelectSource splitSelectSource) {
RecentsView recentsView = getRecentsView();
if (recentsView == null) {
return;
}
ComponentKey componentToBeStaged = new ComponentKey(
splitSelectSource.itemInfo.getTargetComponent(),
splitSelectSource.itemInfo.user);
recentsView.getSplitSelectController().findLastActiveTaskAndRunCallback(
componentToBeStaged,
foundTask -> {
splitSelectSource.alreadyRunningTaskId = foundTask == null
? INVALID_TASK_ID
: foundTask.key.id;
splitSelectSource.animateCurrentTaskDismissal = foundTask != null;
recentsView.initiateSplitSelect(splitSelectSource);
}
);
}
/**
* Uses the clicked Taskbar icon to launch a second app for splitscreen.
*/
public void triggerSecondAppForSplit(ItemInfoWithIcon info, Intent intent, View startingView) {
RecentsView recents = getRecentsView();
ComponentKey secondAppComponent = new ComponentKey(info.getTargetComponent(), info.user);
recents.getSplitSelectController().findLastActiveTaskAndRunCallback(
secondAppComponent,
foundTask -> {
if (foundTask != null) {
TaskView foundTaskView = recents.getTaskViewByTaskId(foundTask.key.id);
// TODO (b/266482558): This additional null check is needed because there
// are times when our Tasks list doesn't match our TaskViews list (like when
// a tile is removed during {@link RecentsView#applyLoadPlan()}. A clearer
// state management system is in the works so that we don't need to rely on
// null checks as much. See comments at ag/21152798.
if (foundTaskView != null) {
// There is already a running app of this type, use that as second app.
// Get index of task (0 or 1), in case it's a GroupedTaskView
TaskIdAttributeContainer taskAttributes =
foundTaskView.getTaskAttributesById(foundTask.key.id);
recents.confirmSplitSelect(
foundTaskView,
foundTask,
taskAttributes.getIconView().getDrawable(),
taskAttributes.getThumbnailView(),
taskAttributes.getThumbnailView().getThumbnail(),
null /* intent */);
return;
}
}
// No running app of that type, create a new instance as second app.
recents.confirmSplitSelect(
null /* containerTaskView */,
null /* task */,
new BitmapDrawable(info.bitmap.icon),
startingView,
null /* thumbnail */,
intent);
}
);
}
/**
* Opens the Keyboard Quick Switch View.
*
* This will set the focus to the first task from the right (from the left in RTL)
*/
public void openQuickSwitchView() {
mControllers.keyboardQuickSwitchController.openQuickSwitchView();
}
/**
* Launches the focused task and closes the Keyboard Quick Switch View.
*
* If the overlay or view are closed, or the overview task is focused, then Overview is
* launched. If the overview task is launched, then the first hidden task is focused.
*
* @return the index of what task should be focused in ; -1 iff Overview shouldn't be launched
*/
public int launchFocusedTask() {
int focusedTaskIndex = mControllers.keyboardQuickSwitchController.launchFocusedTask();
mControllers.keyboardQuickSwitchController.closeQuickSwitchView();
return focusedTaskIndex;
}
/**
* Launches the focused task in splitscreen.
*
* No-op if the view is not yet open.
*/
public void launchSplitTasks(@NonNull View taskview, @NonNull GroupTask groupTask) { }
}