diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-10-02 16:13:34 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2019-10-02 16:20:22 -0700 |
commit | e7b00128c7da366345180647a070a1547e4f9ef9 (patch) | |
tree | e4810d6ba9f8daa15ef0675fd5ba58f4b0d654eb /src_shortcuts_overrides | |
parent | a0db584e0831f1df8375de7cc902d10a2749115a (diff) | |
download | Launcher3-e7b00128c7da366345180647a070a1547e4f9ef9.tar.gz |
Removing static instance of LauncherAppsCompat and unnecessary wrapper classes
Bug: 141376165
Change-Id: I8c1f1ab7d83ec50fe9c7bf39960ef9c360025ec7
Diffstat (limited to 'src_shortcuts_overrides')
-rw-r--r-- | src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java index 0f6ad27130..b8af8ed85b 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java @@ -3,6 +3,8 @@ package com.android.launcher3.model; import static android.appwidget.AppWidgetProviderInfo.WIDGET_FEATURE_HIDE_FROM_PICKER; +import static com.android.launcher3.pm.ShortcutConfigActivityInfo.queryList; + import android.appwidget.AppWidgetProviderInfo; import android.content.Context; import android.content.pm.PackageManager; @@ -10,6 +12,8 @@ import android.os.Process; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.Nullable; + import com.android.launcher3.AppFilter; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; @@ -17,11 +21,10 @@ import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.AlphabeticIndexCompat; import com.android.launcher3.compat.AppWidgetManagerCompat; -import com.android.launcher3.compat.LauncherAppsCompat; -import com.android.launcher3.compat.ShortcutConfigActivityInfo; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.ComponentWithLabel; import com.android.launcher3.icons.IconCache; +import com.android.launcher3.pm.ShortcutConfigActivityInfo; import com.android.launcher3.util.MultiHashMap; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; @@ -37,8 +40,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import androidx.annotation.Nullable; - /** * Widgets data model that is used by the adapters of the widget views and controllers. * @@ -106,8 +107,8 @@ public class WidgetsModel { } // Shortcuts - for (ShortcutConfigActivityInfo info : LauncherAppsCompat.getInstance(context) - .getCustomShortcutActivityList(packageUser)) { + for (ShortcutConfigActivityInfo info : + queryList(context, packageUser)) { widgetsAndShortcuts.add(new WidgetItem(info, app.getIconCache(), pm)); updatedItems.add(info); } |