From f9fd430d6896b15a67cdfc45e277d4e82bb2e502 Mon Sep 17 00:00:00 2001 From: Kshitij Gupta Date: Fri, 5 Feb 2021 22:23:08 +0530 Subject: [PATCH] Lawnchair: Fix serveral imports, fix QuickstepCompat* compilation - Note: Currently, there is no real Q compat. Current Q Compat is the new R Compat. Yikes. --- .../compat/ActivityManagerCompat.java | 5 +- .../compat/RecentsAnimationRunner.java | 11 ++-- .../compat/pie/ActivityManagerCompatVP.java | 34 +++++++----- .../compat/ten/ActivityManagerCompatVQ.java | 40 +++++++++----- .../shared/system/StatsLogCompat.java | 54 ------------------- .../dragndrop/CustomWidgetDragListener.java | 2 +- .../lawnchair/folder/FirstItemProvider.kt | 2 +- .../iconpack/LawnchairIconProvider.kt | 2 +- .../lawnchair/iconpack/UriIconPack.kt | 2 +- .../lawnchair/override/FolderInfoProvider.kt | 2 +- .../override/ShortcutInfoProvider.kt | 2 +- .../lawnchair/popup/LawnchairShortcut.kt | 2 +- src/com/android/launcher3/Utilities.java | 2 +- .../apps/nexuslauncher/CustomBottomSheet.java | 6 +-- .../nexuslauncher/CustomEditShortcut.java | 2 +- .../allapps/NexusSecondaryDropTarget.java | 2 +- .../apps/nexuslauncher/qsb/ConfigBuilder.java | 2 +- .../nexuslauncher/qsb/ItemDragListener.java | 4 +- .../search/AppItemInfoWithIcon.java | 2 +- .../search/AppLaunchActivity.java | 2 +- .../search/ItemInfoUpdateReceiver.java | 2 +- .../search/LogContainerProvider.java | 2 +- .../nexuslauncher/superg/QsbBlockerView.java | 2 +- 23 files changed, 79 insertions(+), 107 deletions(-) delete mode 100644 SystemUISharedLib/src/main/java/com/android/systemui/shared/system/StatsLogCompat.java diff --git a/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/ActivityManagerCompat.java b/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/ActivityManagerCompat.java index 2262c260ff..9004a30f52 100644 --- a/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/ActivityManagerCompat.java +++ b/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/ActivityManagerCompat.java @@ -15,7 +15,7 @@ import java.util.List; public abstract class ActivityManagerCompat { public abstract List getFilteredTasks( - int maxNum, int ignoreActivityType, int ignoreWindowingMode) throws RemoteException; + int maxNum, boolean filterOnlyVisibleRecents) throws RemoteException; public abstract List getRecentTasks( int maxNum, int flags, int userId) throws RemoteException; @@ -31,8 +31,7 @@ public abstract class ActivityManagerCompat { public abstract int startActivityFromRecents(int taskId, Bundle bOptions) throws RemoteException; public abstract boolean setTaskWindowingModeSplitScreenPrimary( - int taskId, int createMode, boolean toTop, boolean animate, - Rect initialBounds, boolean showRecents) throws RemoteException; + int taskId, boolean onTop) throws RemoteException; public abstract boolean removeTask(int taskId) throws RemoteException; diff --git a/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/RecentsAnimationRunner.java b/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/RecentsAnimationRunner.java index f5eaa3818b..b617b1d555 100644 --- a/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/RecentsAnimationRunner.java +++ b/QuickstepCompat/src/main/java/xyz/paphonb/quickstep/compat/RecentsAnimationRunner.java @@ -3,12 +3,17 @@ package xyz.paphonb.quickstep.compat; import android.graphics.Rect; import android.view.IRecentsAnimationController; import android.view.RemoteAnimationTarget; +import android.app.ActivityManager.TaskSnapshot; public interface RecentsAnimationRunner { void onAnimationStart(IRecentsAnimationController controller, - RemoteAnimationTarget[] apps, Rect homeContentInsets, - Rect minimizedHomeBounds); + RemoteAnimationTarget[] apps, + RemoteAnimationTarget[] wallpaperTargets, + Rect homeContentInsets, + Rect minimizedHomeBounds); - void onAnimationCanceled(boolean deferredWithScreenshot); + void onAnimationCanceled(TaskSnapshot taskSnapshot); + + void onTaskAppeared(RemoteAnimationTarget app); } diff --git a/QuickstepCompatVP/src/main/java/xyz/paphonb/quickstep/compat/pie/ActivityManagerCompatVP.java b/QuickstepCompatVP/src/main/java/xyz/paphonb/quickstep/compat/pie/ActivityManagerCompatVP.java index 4be70f56ec..1575b1663f 100644 --- a/QuickstepCompatVP/src/main/java/xyz/paphonb/quickstep/compat/pie/ActivityManagerCompatVP.java +++ b/QuickstepCompatVP/src/main/java/xyz/paphonb/quickstep/compat/pie/ActivityManagerCompatVP.java @@ -1,6 +1,9 @@ package xyz.paphonb.quickstep.compat.pie; +import static android.app.ActivityManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; +import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import android.app.ActivityManager; import android.app.ActivityManager.TaskSnapshot; @@ -15,6 +18,8 @@ import android.view.IRecentsAnimationController; import android.view.IRecentsAnimationRunner; import android.view.RemoteAnimationTarget; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.ListIterator; @@ -24,35 +29,41 @@ import xyz.paphonb.quickstep.compat.RecentsAnimationRunner; public class ActivityManagerCompatVP extends ActivityManagerCompat { @Override - public List getFilteredTasks(int maxNum, int ignoreActivityType, int ignoreWindowingMode) throws RemoteException { - return ActivityManager.getService().getFilteredTasks(maxNum, ignoreActivityType, ignoreWindowingMode); + public List getFilteredTasks(int maxNum, + boolean filterOnlyVisibleRecents) throws RemoteException { + return ActivityManager.getService() + .getFilteredTasks(maxNum, ACTIVITY_TYPE_UNDEFINED, WINDOWING_MODE_UNDEFINED); } @Override - public List getRecentTasks(int maxNum, int flags, int userId) throws RemoteException { + public List getRecentTasks(int maxNum, int flags, int userId) + throws RemoteException { return ActivityManager.getService().getRecentTasks(maxNum, flags, userId).getList(); } @Override - public ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean reducedResolution) throws RemoteException { + public ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean reducedResolution) + throws RemoteException { return ActivityManager.getService().getTaskSnapshot(taskId, reducedResolution); } @Override - public void startRecentsActivity(Intent intent, IAssistDataReceiver assistDataReceiver, final RecentsAnimationRunner recentsAnimationRunner) throws RemoteException { + public void startRecentsActivity(Intent intent, IAssistDataReceiver assistDataReceiver, + final RecentsAnimationRunner recentsAnimationRunner) throws RemoteException { IRecentsAnimationRunner runner = null; if (recentsAnimationRunner != null) { runner = new IRecentsAnimationRunner.Stub() { @Override public void onAnimationStart(IRecentsAnimationController controller, - RemoteAnimationTarget[] apps, Rect homeContentInsets, - Rect minimizedHomeBounds) { - recentsAnimationRunner.onAnimationStart(controller, apps, homeContentInsets, minimizedHomeBounds); + RemoteAnimationTarget[] apps, Rect homeContentInsets, + Rect minimizedHomeBounds) { + recentsAnimationRunner.onAnimationStart(controller, apps, + new RemoteAnimationTarget[0], homeContentInsets, minimizedHomeBounds); } @Override public void onAnimationCanceled() { - recentsAnimationRunner.onAnimationCanceled(false); + recentsAnimationRunner.onAnimationCanceled(null); } }; } @@ -71,10 +82,9 @@ public class ActivityManagerCompatVP extends ActivityManagerCompat { @Override public boolean setTaskWindowingModeSplitScreenPrimary( - int taskId, int createMode, boolean toTop, boolean animate, - Rect initialBounds, boolean showRecents) throws RemoteException { + int taskId, boolean toTop) throws RemoteException { return ActivityManager.getService().setTaskWindowingModeSplitScreenPrimary(taskId, - createMode, toTop, animate, initialBounds, showRecents); + SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT, toTop, true, null, true); } @Override diff --git a/QuickstepCompatVQ/src/main/java/xyz/paphonb/quickstep/compat/ten/ActivityManagerCompatVQ.java b/QuickstepCompatVQ/src/main/java/xyz/paphonb/quickstep/compat/ten/ActivityManagerCompatVQ.java index 3457d76ed3..41dea57349 100644 --- a/QuickstepCompatVQ/src/main/java/xyz/paphonb/quickstep/compat/ten/ActivityManagerCompatVQ.java +++ b/QuickstepCompatVQ/src/main/java/xyz/paphonb/quickstep/compat/ten/ActivityManagerCompatVQ.java @@ -24,35 +24,48 @@ import xyz.paphonb.quickstep.compat.RecentsAnimationRunner; public class ActivityManagerCompatVQ extends ActivityManagerCompat { @Override - public List getFilteredTasks(int maxNum, int ignoreActivityType, int ignoreWindowingMode) throws RemoteException { - return ActivityTaskManager.getService().getFilteredTasks(maxNum, ignoreActivityType, ignoreWindowingMode); + public List getFilteredTasks(int maxNum, + boolean filterOnlyVisibleRecents) throws RemoteException { + return ActivityTaskManager.getService().getFilteredTasks(maxNum, filterOnlyVisibleRecents); } @Override - public List getRecentTasks(int maxNum, int flags, int userId) throws RemoteException { + public List getRecentTasks(int maxNum, int flags, int userId) + throws RemoteException { return ActivityTaskManager.getService().getRecentTasks(maxNum, flags, userId).getList(); } @Override - public ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean reducedResolution) throws RemoteException { + public ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean reducedResolution) + throws RemoteException { return ActivityTaskManager.getService().getTaskSnapshot(taskId, reducedResolution); } @Override - public void startRecentsActivity(Intent intent, IAssistDataReceiver assistDataReceiver, final RecentsAnimationRunner recentsAnimationRunner) throws RemoteException { + public void startRecentsActivity(Intent intent, IAssistDataReceiver assistDataReceiver, + final RecentsAnimationRunner recentsAnimationRunner) throws RemoteException { IRecentsAnimationRunner runner = null; if (recentsAnimationRunner != null) { runner = new IRecentsAnimationRunner.Stub() { @Override public void onAnimationStart(IRecentsAnimationController controller, - RemoteAnimationTarget[] apps, Rect homeContentInsets, - Rect minimizedHomeBounds) { - recentsAnimationRunner.onAnimationStart(controller, apps, homeContentInsets, minimizedHomeBounds); + RemoteAnimationTarget[] apps, + RemoteAnimationTarget[] wallpaperTargets, + Rect homeContentInsets, + Rect minimizedHomeBounds) { + recentsAnimationRunner + .onAnimationStart(controller, apps, wallpaperTargets, homeContentInsets, + minimizedHomeBounds); } @Override - public void onAnimationCanceled(boolean deferredWithScreenshot) { - recentsAnimationRunner.onAnimationCanceled(deferredWithScreenshot); + public void onAnimationCanceled(TaskSnapshot taskSnapshot) { + recentsAnimationRunner.onAnimationCanceled(taskSnapshot); + } + + @Override + public void onTaskAppeared(RemoteAnimationTarget app) { + recentsAnimationRunner.onTaskAppeared(app); } }; } @@ -71,10 +84,9 @@ public class ActivityManagerCompatVQ extends ActivityManagerCompat { @Override public boolean setTaskWindowingModeSplitScreenPrimary( - int taskId, int createMode, boolean toTop, boolean animate, - Rect initialBounds, boolean showRecents) throws RemoteException { - return ActivityTaskManager.getService().setTaskWindowingModeSplitScreenPrimary(taskId, - createMode, toTop, animate, initialBounds, showRecents); + int taskId, boolean toTop) throws RemoteException { + return ActivityTaskManager.getService() + .setTaskWindowingModeSplitScreenPrimary(taskId, toTop); } @Override diff --git a/SystemUISharedLib/src/main/java/com/android/systemui/shared/system/StatsLogCompat.java b/SystemUISharedLib/src/main/java/com/android/systemui/shared/system/StatsLogCompat.java deleted file mode 100644 index 93c106cc7e..0000000000 --- a/SystemUISharedLib/src/main/java/com/android/systemui/shared/system/StatsLogCompat.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.shared.system; - -import android.os.Build; -import android.util.StatsLog; - -/** - * Wrapper class to make StatsLog hidden API accessible. - */ -public class StatsLogCompat { - - /** - * StatsLog.write(StatsLog.LAUNCHER_EVENT, int action, int src_state, int dst_state, - * byte[] extension, boolean is_swipe_up_enabled); - */ - public static void write(int action, int srcState, int dstState, byte [] extension, - boolean swipeUpEnabled) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return; - StatsLog.write(19, action, srcState, dstState, extension, - swipeUpEnabled); - } - - /** - * StatsLog.write(StatsLog.STYLE_EVENT, action, colorPackageHash, - * fontPackageHash, shapePackageHash, clockPackageHash, - * launcherGrid, wallpaperCategoryHash, wallpaperIdHash, - * colorPreference, locationPreference); - */ - public static void write(int action, int colorPackageHash, - int fontPackageHash, int shapePackageHash, int clockPackageHash, - int launcherGrid, int wallpaperCategoryHash, int wallpaperIdHash, - int colorPreference, int locationPreference) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return; - StatsLog.write(179, action, colorPackageHash, - fontPackageHash, shapePackageHash, clockPackageHash, - launcherGrid, wallpaperCategoryHash, wallpaperIdHash, - colorPreference, locationPreference); - } -} diff --git a/lawnchair/src/ch/deletescape/lawnchair/dragndrop/CustomWidgetDragListener.java b/lawnchair/src/ch/deletescape/lawnchair/dragndrop/CustomWidgetDragListener.java index fea7be7979..80fd1d3efd 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/dragndrop/CustomWidgetDragListener.java +++ b/lawnchair/src/ch/deletescape/lawnchair/dragndrop/CustomWidgetDragListener.java @@ -21,7 +21,7 @@ import android.graphics.Rect; import android.os.CancellationSignal; import android.view.View; import com.android.launcher3.DragSource; -import com.android.launcher3.ItemInfo; +import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.PendingAddItemInfo; diff --git a/lawnchair/src/ch/deletescape/lawnchair/folder/FirstItemProvider.kt b/lawnchair/src/ch/deletescape/lawnchair/folder/FirstItemProvider.kt index 81049678d0..cb2629b3f0 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/folder/FirstItemProvider.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/folder/FirstItemProvider.kt @@ -18,7 +18,7 @@ package ch.deletescape.lawnchair.folder import com.android.launcher3.FolderInfo -import com.android.launcher3.WorkspaceItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo class FirstItemProvider(private val info: FolderInfo) : FolderInfo.FolderListener { diff --git a/lawnchair/src/ch/deletescape/lawnchair/iconpack/LawnchairIconProvider.kt b/lawnchair/src/ch/deletescape/lawnchair/iconpack/LawnchairIconProvider.kt index 57411b0093..5655a14c3f 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/iconpack/LawnchairIconProvider.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/iconpack/LawnchairIconProvider.kt @@ -22,7 +22,7 @@ import android.content.pm.LauncherActivityInfo import android.content.pm.ShortcutInfo import android.graphics.drawable.AdaptiveIconDrawable import android.graphics.drawable.Drawable -import com.android.launcher3.ItemInfo +import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.R import com.android.launcher3.Utilities import com.google.android.apps.nexuslauncher.DynamicIconProvider diff --git a/lawnchair/src/ch/deletescape/lawnchair/iconpack/UriIconPack.kt b/lawnchair/src/ch/deletescape/lawnchair/iconpack/UriIconPack.kt index a731a5e47e..12e04e65cc 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/iconpack/UriIconPack.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/iconpack/UriIconPack.kt @@ -29,7 +29,7 @@ import android.os.ParcelFileDescriptor import android.text.TextUtils import ch.deletescape.lawnchair.adaptive.AdaptiveIconGenerator import com.android.launcher3.FastBitmapDrawable -import com.android.launcher3.ItemInfo +import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.Utilities import com.android.launcher3.util.ComponentKey import java.io.FileDescriptor diff --git a/lawnchair/src/ch/deletescape/lawnchair/override/FolderInfoProvider.kt b/lawnchair/src/ch/deletescape/lawnchair/override/FolderInfoProvider.kt index 7b1adfe05f..a67bf10589 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/override/FolderInfoProvider.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/override/FolderInfoProvider.kt @@ -24,7 +24,7 @@ import ch.deletescape.lawnchair.lawnchairPrefs import ch.deletescape.lawnchair.useApplicationContext import ch.deletescape.lawnchair.util.SingletonHolder import com.android.launcher3.FolderInfo -import com.android.launcher3.ItemInfo +import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.R class FolderInfoProvider(context: Context) : CustomInfoProvider(context) { diff --git a/lawnchair/src/ch/deletescape/lawnchair/override/ShortcutInfoProvider.kt b/lawnchair/src/ch/deletescape/lawnchair/override/ShortcutInfoProvider.kt index 709901ce3e..3b9799f864 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/override/ShortcutInfoProvider.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/override/ShortcutInfoProvider.kt @@ -25,7 +25,7 @@ import ch.deletescape.lawnchair.iconpack.IconPackManager import ch.deletescape.lawnchair.useApplicationContext import ch.deletescape.lawnchair.util.SingletonHolder import com.android.launcher3.LauncherAppState -import com.android.launcher3.WorkspaceItemInfo +import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.compat.LauncherAppsCompat import com.android.launcher3.icons.LauncherIcons diff --git a/lawnchair/src/ch/deletescape/lawnchair/popup/LawnchairShortcut.kt b/lawnchair/src/ch/deletescape/lawnchair/popup/LawnchairShortcut.kt index bb46eb1e68..e2bb613b3d 100644 --- a/lawnchair/src/ch/deletescape/lawnchair/popup/LawnchairShortcut.kt +++ b/lawnchair/src/ch/deletescape/lawnchair/popup/LawnchairShortcut.kt @@ -29,7 +29,7 @@ import ch.deletescape.lawnchair.sesame.Sesame import ch.deletescape.lawnchair.util.LawnchairSingletonHolder import ch.deletescape.lawnchair.util.hasFlag import com.android.launcher3.* -import com.android.launcher3.ItemInfoWithIcon.FLAG_SYSTEM_YES +import com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_SYSTEM_YES import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION import com.android.launcher3.compat.LauncherAppsCompat import com.android.launcher3.popup.SystemShortcut diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 1468dfe0a8..f02fa401f8 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -18,7 +18,7 @@ package com.android.launcher3; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ICON_BADGED; import android.Manifest.permission; -import static com.android.launcher3.ItemInfoWithIcon.FLAG_ICON_BADGED; +import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ICON_BADGED; import android.animation.ValueAnimator; import android.annotation.TargetApi; diff --git a/src/com/google/android/apps/nexuslauncher/CustomBottomSheet.java b/src/com/google/android/apps/nexuslauncher/CustomBottomSheet.java index fcb605c752..158a605345 100644 --- a/src/com/google/android/apps/nexuslauncher/CustomBottomSheet.java +++ b/src/com/google/android/apps/nexuslauncher/CustomBottomSheet.java @@ -45,13 +45,13 @@ import ch.deletescape.lawnchair.predictions.LawnchairAppPredictor; import ch.deletescape.lawnchair.preferences.MultiSelectTabPreference; import com.android.launcher3.AppInfo; import com.android.launcher3.FolderInfo; -import com.android.launcher3.ItemInfo; -import com.android.launcher3.ItemInfoWithIcon; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.WorkspaceItemInfo; +import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.widget.WidgetsBottomSheet; diff --git a/src/com/google/android/apps/nexuslauncher/CustomEditShortcut.java b/src/com/google/android/apps/nexuslauncher/CustomEditShortcut.java index 932f75c9a8..e7c8bcc6ab 100644 --- a/src/com/google/android/apps/nexuslauncher/CustomEditShortcut.java +++ b/src/com/google/android/apps/nexuslauncher/CustomEditShortcut.java @@ -5,7 +5,7 @@ import android.view.View; import androidx.annotation.Keep; import ch.deletescape.lawnchair.override.CustomInfoProvider; import com.android.launcher3.AbstractFloatingView; -import com.android.launcher3.ItemInfo; +import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.popup.SystemShortcut; diff --git a/src/com/google/android/apps/nexuslauncher/allapps/NexusSecondaryDropTarget.java b/src/com/google/android/apps/nexuslauncher/allapps/NexusSecondaryDropTarget.java index 461cce291d..d0426ceee0 100644 --- a/src/com/google/android/apps/nexuslauncher/allapps/NexusSecondaryDropTarget.java +++ b/src/com/google/android/apps/nexuslauncher/allapps/NexusSecondaryDropTarget.java @@ -4,7 +4,7 @@ import android.content.ComponentName; import android.content.Context; import android.util.AttributeSet; import android.view.View; -import com.android.launcher3.ItemInfo; +import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.R; import com.android.launcher3.SecondaryDropTarget; import com.android.launcher3.logging.LoggerUtils; diff --git a/src/com/google/android/apps/nexuslauncher/qsb/ConfigBuilder.java b/src/com/google/android/apps/nexuslauncher/qsb/ConfigBuilder.java index f78c63d778..02e61d2545 100644 --- a/src/com/google/android/apps/nexuslauncher/qsb/ConfigBuilder.java +++ b/src/com/google/android/apps/nexuslauncher/qsb/ConfigBuilder.java @@ -19,7 +19,7 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.android.launcher3.AppInfo; import com.android.launcher3.BubbleTextView; -import com.android.launcher3.ItemInfoWithIcon; +import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.allapps.AllAppsRecyclerView; diff --git a/src/com/google/android/apps/nexuslauncher/qsb/ItemDragListener.java b/src/com/google/android/apps/nexuslauncher/qsb/ItemDragListener.java index 187c5e046c..7883a90700 100644 --- a/src/com/google/android/apps/nexuslauncher/qsb/ItemDragListener.java +++ b/src/com/google/android/apps/nexuslauncher/qsb/ItemDragListener.java @@ -5,8 +5,8 @@ import android.graphics.Rect; import android.view.View; import com.android.launcher3.InstallShortcutReceiver; -import com.android.launcher3.ItemInfo; -import com.android.launcher3.WorkspaceItemInfo; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.compat.ShortcutConfigActivityInfo; import com.android.launcher3.dragndrop.BaseItemDragListener; import com.android.launcher3.userevent.nano.LauncherLogProto; diff --git a/src/com/google/android/apps/nexuslauncher/search/AppItemInfoWithIcon.java b/src/com/google/android/apps/nexuslauncher/search/AppItemInfoWithIcon.java index f284afb31c..619e94f809 100644 --- a/src/com/google/android/apps/nexuslauncher/search/AppItemInfoWithIcon.java +++ b/src/com/google/android/apps/nexuslauncher/search/AppItemInfoWithIcon.java @@ -2,7 +2,7 @@ package com.google.android.apps.nexuslauncher.search; import android.content.Intent; -import com.android.launcher3.ItemInfoWithIcon; +import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.util.ComponentKey; public class AppItemInfoWithIcon extends ItemInfoWithIcon { diff --git a/src/com/google/android/apps/nexuslauncher/search/AppLaunchActivity.java b/src/com/google/android/apps/nexuslauncher/search/AppLaunchActivity.java index d7174ed123..8d1583f681 100644 --- a/src/com/google/android/apps/nexuslauncher/search/AppLaunchActivity.java +++ b/src/com/google/android/apps/nexuslauncher/search/AppLaunchActivity.java @@ -7,7 +7,7 @@ import android.view.View; import android.widget.Toast; import com.android.launcher3.BaseActivity; -import com.android.launcher3.ItemInfo; +import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; diff --git a/src/com/google/android/apps/nexuslauncher/search/ItemInfoUpdateReceiver.java b/src/com/google/android/apps/nexuslauncher/search/ItemInfoUpdateReceiver.java index b402c6f003..09566a9679 100644 --- a/src/com/google/android/apps/nexuslauncher/search/ItemInfoUpdateReceiver.java +++ b/src/com/google/android/apps/nexuslauncher/search/ItemInfoUpdateReceiver.java @@ -2,7 +2,7 @@ package com.google.android.apps.nexuslauncher.search; import android.content.SharedPreferences; -import com.android.launcher3.ItemInfoWithIcon; +import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherCallbacks; import com.android.launcher3.icons.IconCache; diff --git a/src/com/google/android/apps/nexuslauncher/search/LogContainerProvider.java b/src/com/google/android/apps/nexuslauncher/search/LogContainerProvider.java index 450549a3c3..9ef2fc90f6 100644 --- a/src/com/google/android/apps/nexuslauncher/search/LogContainerProvider.java +++ b/src/com/google/android/apps/nexuslauncher/search/LogContainerProvider.java @@ -4,7 +4,7 @@ import android.content.Context; import android.view.View; import android.widget.FrameLayout; -import com.android.launcher3.ItemInfo; +import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.logging.StatsLogUtils; import com.android.launcher3.userevent.nano.LauncherLogProto; diff --git a/src/com/google/android/apps/nexuslauncher/superg/QsbBlockerView.java b/src/com/google/android/apps/nexuslauncher/superg/QsbBlockerView.java index 7d337a0423..739b265e08 100644 --- a/src/com/google/android/apps/nexuslauncher/superg/QsbBlockerView.java +++ b/src/com/google/android/apps/nexuslauncher/superg/QsbBlockerView.java @@ -19,7 +19,7 @@ import ch.deletescape.lawnchair.smartspace.LawnchairSmartspaceController.CardDat import ch.deletescape.lawnchair.smartspace.LawnchairSmartspaceController.WeatherData; import com.android.launcher3.BubbleTextView; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.ItemInfo; +import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities;