commit c7cbf254f3b8e163488138305bd53f5fa075cceb
author Tony Wickham <twickham@google.com> Mon May 24 15:46:48 2021 -0700
committer Tony Wickham <twickham@google.com> Tue May 25 15:35:55 2021 -0700
tree b28b59e487f4d752e3d842b9757290d1788336cd
parent 6ba7479cf5d17511203c09da83daf965e6f39a0a

Let DragView use ActivityContext instead of Launcher

- Make DragView abstract and extended by LauncherDragView for the explicitly Launcher-specific parts.
- Some other methods like Utilities.getFullDrawable() now accept (Activity)Context rather than Launcher.

Test: Compiles and runs, manual drag and drop
Bug: 182981908
Change-Id: I77b7a2e48ce864dd711c3232217fdba4d60c546f

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4a7937b..892fb6d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1289,7 +1289,8 @@
         }
     }
 
-    public FolderIcon findFolderIcon(final int folderIconId) {
+    @Override
+    public @Nullable FolderIcon findFolderIcon(final int folderIconId) {
         return (FolderIcon) mWorkspace.getHomescreenIconByItemId(folderIconId);
     }