PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure Taskbar stashes when launching an app from folder" into main

Browse Source
This commit is contained in:
Saumya Prakash
2023-12-08 22:59:45 +00:00
committed by Android (Google) Code Review
parent fe22e7fa4d 86285d477d
commit 55fdc45ecc
2 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+28 -9
View File
@@ -987,15 +987,20 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
FolderIcon folderIcon = (FolderIcon) view;
Folder folder = folderIcon.getFolder();
folder.setOnFolderStateChangedListener(newState -> {
if (newState == Folder.STATE_OPEN) {
setTaskbarWindowFocusableForIme(true);
} else if (newState == Folder.STATE_CLOSED) {
// Defer by a frame to ensure we're no longer fullscreen and thus won't jump.
getDragLayer().post(() -> setTaskbarWindowFocusableForIme(false));
folder.setOnFolderStateChangedListener(null);
}
});
folder.setPriorityOnFolderStateChangedListener(
new Folder.OnFolderStateChangedListener() {
@Override
public void onFolderStateChanged(int newState) {
if (newState == Folder.STATE_OPEN) {
setTaskbarWindowFocusableForIme(true);
} else if (newState == Folder.STATE_CLOSED) {
// Defer by a frame to ensure we're no longer fullscreen and thus
// won't jump.
getDragLayer().post(() -> setTaskbarWindowFocusableForIme(false));
folder.setPriorityOnFolderStateChangedListener(null);
}
}
});
setTaskbarWindowFullscreen(true);
@@ -1055,7 +1060,21 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
Log.e(TAG, "Unable to launch. tag=" + info + " intent=" + intent, e);
return;
}
}
// If the app was launched from a folder, stash the taskbar after it closes
Folder f = Folder.getOpen(this);
if (f != null && f.getInfo().id == info.container) {
f.addOnFolderStateChangedListener(new Folder.OnFolderStateChangedListener() {
@Override
public void onFolderStateChanged(int newState) {
if (newState == Folder.STATE_CLOSED) {
f.removeOnFolderStateChangedListener(this);
mControllers.taskbarStashController
.updateAndAnimateTransientTaskbar(true);
}
}
});
}
mControllers.uiController.onTaskbarIconLaunched(info);
mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);