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

Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev

Browse Source
This commit is contained in:
Sunny Goyal
2022-05-12 17:00:49 +00:00
committed by Android (Google) Code Review
parent 508fbbff56 f0ff70a2a5
commit d7281d097d
18 changed files with 133 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java
+3 -2
View File
@@ -19,6 +19,7 @@ package com.android.launcher3.appprediction;
import static com.android.quickstep.InstantAppResolverImpl.COMPONENT_CLASS_MARKER;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import com.android.launcher3.LauncherSettings;
@@ -38,8 +39,8 @@ public class InstantAppItemInfo extends AppInfo {
}
@Override
public WorkspaceItemInfo makeWorkspaceItem() {
WorkspaceItemInfo workspaceItemInfo = super.makeWorkspaceItem();
public WorkspaceItemInfo makeWorkspaceItem(Context context) {
WorkspaceItemInfo workspaceItemInfo = super.makeWorkspaceItem(context);
workspaceItemInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
workspaceItemInfo.status = WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON
| WorkspaceItemInfo.FLAG_RESTORE_STARTED
quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java
+2 -2
View File
@@ -85,7 +85,7 @@ public class PredictionUpdateTask extends BaseModelUpdateTask {
.filter(info -> user.equals(info.user) && cn.equals(info.componentName))
.map(ai -> {
app.getIconCache().getTitleAndIcon(ai, false);
return ai.makeWorkspaceItem();
return ai.makeWorkspaceItem(context);
})
.findAny()
.orElseGet(() -> {
@@ -96,7 +96,7 @@ public class PredictionUpdateTask extends BaseModelUpdateTask {
}
AppInfo ai = new AppInfo(context, lai, user);
app.getIconCache().getTitleAndIcon(ai, lai, false);
return ai.makeWorkspaceItem();
return ai.makeWorkspaceItem(context);
});
if (itemInfo == null) {
quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+1 -1
View File
@@ -460,7 +460,7 @@ public class QuickstepModelDelegate extends ModelDelegate {
AppInfo info = new AppInfo(lai, user, mUMS.isUserQuiet(user));
mAppState.getIconCache().getTitleAndIcon(info, lai, false);
mReadCount++;
return info.makeWorkspaceItem();
return info.makeWorkspaceItem(mAppState.getContext());
}
case ITEM_TYPE_DEEP_SHORTCUT: {
ShortcutKey key = ShortcutKey.fromIntent(intent, user);
quickstep/src/com/android/launcher3/taskbar/TaskbarPopupController.java
+2 -1
View File
@@ -43,6 +43,7 @@ import com.android.launcher3.shortcuts.DeepShortcutView;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.LauncherBindableItemsContainer;
import com.android.launcher3.util.PackageUserKey;
import com.android.launcher3.util.ShortcutUtil;
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
import com.android.launcher3.views.ActivityContext;
import com.android.quickstep.SystemUiProxy;
@@ -136,7 +137,7 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba
return null;
}
ItemInfo item = (ItemInfo) icon.getTag();
if (!PopupContainerWithArrow.canShow(icon, item)) {
if (!ShortcutUtil.supportsShortcuts(item)) {
return null;
}