aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix launch flow when one app in an app pair is paused

Browse Source 
This CL changes the error handling logic in ItemClickHandler to continue with app pair launch when only one app in an app pair is paused. It also changes AppPairIconGraphic so that the disabled state of the app pair is drawn modularly (if only one app is paused, only one app will appear visually paused).

Bug: 330795643
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85
(cherry picked from commit 17db14b107)
Merged-In: Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85
This commit is contained in:
Jeremy Sim
2024-04-03 18:30:52 -07:00
committed by Vinit Nayak
parent 588a4abf4a
commit d2f256f179
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/launcher3/touch/ItemClickHandler.java
View File

@@ -158,20 +158,27 @@ public class ItemClickHandler {
? R.string.app_pair_needs_unfold
: R.string.app_pair_unlaunchable_at_screen_size,
Toast.LENGTH_SHORT).show();
return;
} else if (appPairIcon.getInfo().isDisabled()) {
WorkspaceItemInfo app1 = appPairIcon.getInfo().getFirstApp();
WorkspaceItemInfo app2 = appPairIcon.getInfo().getSecondApp();
// Show the user why the app pair is disabled.
if (app1.isDisabled() && !handleDisabledItemClicked(app1, launcher)) {
// If handleDisabledItemClicked() did not handle the error message, we initiate an
// app launch so Framework can tell the user why the app is suspended.
onClickAppShortcut(v, app1, launcher);
} else if (app2.isDisabled() && !handleDisabledItemClicked(app2, launcher)) {
onClickAppShortcut(v, app2, launcher);
if (app1.isDisabled() && app2.isDisabled()) {
// Both apps are disabled, show "app pair is not available" toast.
Toast.makeText(launcher, R.string.app_pair_not_available, Toast.LENGTH_SHORT)
.show();
return;
} else if ((app1.isDisabled() && handleDisabledItemClicked(app1, launcher))
|| (app2.isDisabled() && handleDisabledItemClicked(app2, launcher))) {
// Only one is disabled, and handleDisabledItemClicked() will show a toast, so we
// are done.
return;
}
} else {
launcher.launchAppPair(appPairIcon);
}
// Either the app pair is not disabled, or it is a disabled state that can be handled by
// framework directly (e.g. one app is paused), so go ahead and launch.
launcher.launchAppPair(appPairIcon);
}
/**