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 "Enable unpausing apps from the workspace." into sc-dev am: a07c2efdf6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14704506

Change-Id: I81fa5c0d7b9ab73d267e2e1083882854492fbaf1
This commit is contained in:
TreeHugger Robot 2021-05-26 22:30:09 +00:00 committed by Automerger Merge Worker
parent 5bb331df92 a07c2efdf6
commit 3bc3f99052
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
View File

@ -275,9 +275,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
});
} else if (tag instanceof WorkspaceItemInfo) {
WorkspaceItemInfo info = (WorkspaceItemInfo) tag;
if (info.isDisabled()) {
ItemClickHandler.handleDisabledItemClicked(info, this);
} else {
if (!(info.isDisabled() && ItemClickHandler.handleDisabledItemClicked(info, this))) {
Intent intent = new Intent(info.getIntent())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {

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

@ -196,8 +196,10 @@ public class ItemClickHandler {
/**
* Handles clicking on a disabled shortcut
*
* @return true iff the disabled item click has been handled.
*/
public static void handleDisabledItemClicked(WorkspaceItemInfo shortcut, Context context) {
public static boolean handleDisabledItemClicked(WorkspaceItemInfo shortcut, Context context) {
final int disabledFlags = shortcut.runtimeStatusFlags
& WorkspaceItemInfo.FLAG_DISABLED_MASK;
if ((disabledFlags
@ -205,11 +207,12 @@ public class ItemClickHandler {
& ~FLAG_DISABLED_QUIET_USER) == 0) {
// If the app is only disabled because of the above flags, launch activity anyway.
// Framework will tell the user why the app is suspended.
return false;
} else {
if (!TextUtils.isEmpty(shortcut.disabledMessage)) {
// Use a message specific to this shortcut, if it has one.
Toast.makeText(context, shortcut.disabledMessage, Toast.LENGTH_SHORT).show();
return;
return true;
}
// Otherwise just use a generic error message.
int error = R.string.activity_not_available;
@ -220,6 +223,7 @@ public class ItemClickHandler {
error = R.string.shortcut_not_available;
}
Toast.makeText(context, error, Toast.LENGTH_SHORT).show();
return true;
}
}
@ -229,8 +233,7 @@ public class ItemClickHandler {
* @param v The view that was clicked. Must be a tagged with a {@link WorkspaceItemInfo}.
*/
public static void onClickAppShortcut(View v, WorkspaceItemInfo shortcut, Launcher launcher) {
if (shortcut.isDisabled()) {
handleDisabledItemClicked(shortcut, launcher);
if (shortcut.isDisabled() && handleDisabledItemClicked(shortcut, launcher)) {
return;
}