diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-01-19 10:27:54 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-01-19 13:54:31 -0800 |
commit | 782f0c9a896db58aeaa60d15f291831b8d7b4c93 (patch) | |
tree | b8d8b2da1ae765811dedd9a9ec55d3c27898d727 /src/com/android/launcher3/model | |
parent | 278359539c02ca160caf1df54ce96053a2a2ef59 (diff) | |
download | android_packages_apps_Trebuchet-782f0c9a896db58aeaa60d15f291831b8d7b4c93.tar.gz android_packages_apps_Trebuchet-782f0c9a896db58aeaa60d15f291831b8d7b4c93.tar.bz2 android_packages_apps_Trebuchet-782f0c9a896db58aeaa60d15f291831b8d7b4c93.zip |
Adding support for new APIs in O related to configurable shortcuts
> Config activities can now return PinItemRequest which can be used to pin
deep shortcuts
Bug: 33584624
Change-Id: Ic0df436bd79e069615b9d60d24eb7594b824b2da
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r-- | src/com/android/launcher3/model/WidgetItem.java | 15 | ||||
-rw-r--r-- | src/com/android/launcher3/model/WidgetsModel.java | 9 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/com/android/launcher3/model/WidgetItem.java b/src/com/android/launcher3/model/WidgetItem.java index c256176d2..1e96dec20 100644 --- a/src/com/android/launcher3/model/WidgetItem.java +++ b/src/com/android/launcher3/model/WidgetItem.java @@ -1,16 +1,14 @@ package com.android.launcher3.model; -import android.content.ComponentName; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.os.Process; import android.os.UserHandle; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; +import com.android.launcher3.compat.ShortcutConfigActivityInfo; import com.android.launcher3.util.ComponentKey; import java.text.Collator; @@ -26,7 +24,7 @@ public class WidgetItem extends ComponentKey implements Comparable<WidgetItem> { private static Collator sCollator; public final LauncherAppWidgetProviderInfo widgetInfo; - public final ActivityInfo activityInfo; + public final ShortcutConfigActivityInfo activityInfo; public final String label; public final int spanX, spanY; @@ -43,12 +41,11 @@ public class WidgetItem extends ComponentKey implements Comparable<WidgetItem> { spanY = Math.min(info.spanY, idp.numRows); } - public WidgetItem(ResolveInfo info, PackageManager pm) { - super(new ComponentName(info.activityInfo.packageName, info.activityInfo.name), - Process.myUserHandle()); - label = Utilities.trim(info.loadLabel(pm)); + public WidgetItem(ShortcutConfigActivityInfo info) { + super(info.getComponent(), info.getUser()); + label = Utilities.trim(info.getLabel()); widgetInfo = null; - activityInfo = info.activityInfo; + activityInfo = info; spanX = spanY = 1; } diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index 2c62f896b..95c54f767 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -17,6 +17,9 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.AppWidgetManagerCompat; +import com.android.launcher3.compat.LauncherAppsCompat; +import com.android.launcher3.compat.ShortcutConfigActivityInfo; +import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.util.MultiHashMap; import com.android.launcher3.util.Preconditions; @@ -70,9 +73,9 @@ public class WidgetsModel { } // Shortcuts - for (ResolveInfo info : - pm.queryIntentActivities(new Intent(Intent.ACTION_CREATE_SHORTCUT), 0)) { - widgetsAndShortcuts.add(new WidgetItem(info, pm)); + for (ShortcutConfigActivityInfo info : LauncherAppsCompat.getInstance(context) + .getCustomShortcutActivityList()) { + widgetsAndShortcuts.add(new WidgetItem(info)); } setWidgetsAndShortcuts(widgetsAndShortcuts, context); } catch (Exception e) { |