diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-04 10:33:30 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-04 10:33:30 -0700 |
commit | 3c938a7e0dfa6289bba557164f629873a230bd5c (patch) | |
tree | 18979a36705a89414207fba10c489cae6a80be94 /src/com/android/launcher3/model | |
parent | 488d4bdf26fb8cefd4f2f83535fde1b07202b545 (diff) | |
parent | 3f7550c1edb2a8db85e2c2db4333c9cd458e259b (diff) | |
download | android_packages_apps_Trebuchet-3c938a7e0dfa6289bba557164f629873a230bd5c.tar.gz android_packages_apps_Trebuchet-3c938a7e0dfa6289bba557164f629873a230bd5c.tar.bz2 android_packages_apps_Trebuchet-3c938a7e0dfa6289bba557164f629873a230bd5c.zip |
resolved conflicts for merge of 3f7550c1 to ub-launcher3-master
Change-Id: I3bb155473d48832e496a8983f84c20e6e935fa41
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r-- | src/com/android/launcher3/model/WidgetsModel.java | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index cabff148f..eef4f9173 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -8,6 +8,9 @@ import android.util.Log; import com.android.launcher3.AppFilter; import com.android.launcher3.IconCache; +import com.android.launcher3.InvariantDeviceProfile; +import com.android.launcher3.ItemInfo; +import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.AlphabeticIndexCompat; @@ -40,7 +43,7 @@ public class WidgetsModel { private final AppWidgetManagerCompat mAppWidgetMgr; private final WidgetsAndShortcutNameComparator mWidgetAndShortcutNameComparator; - private final Comparator mAppNameComparator; + private final Comparator<ItemInfo> mAppNameComparator; private final IconCache mIconCache; private final AppFilter mAppFilter; private AlphabeticIndexCompat mIndexer; @@ -54,6 +57,7 @@ public class WidgetsModel { mIndexer = new AlphabeticIndexCompat(context); } + @SuppressWarnings("unchecked") private WidgetsModel(WidgetsModel model) { mAppWidgetMgr = model.mAppWidgetMgr; mPackageItemInfos = (ArrayList<PackageItemInfo>) model.mPackageItemInfos.clone(); @@ -105,6 +109,8 @@ public class WidgetsModel { mPackageItemInfos.clear(); mWidgetAndShortcutNameComparator.reset(); + InvariantDeviceProfile idp = LauncherAppState.getInstance().getInvariantDeviceProfile(); + // add and update. for (Object o: rawWidgetsShortcuts) { String packageName = ""; @@ -112,9 +118,23 @@ public class WidgetsModel { ComponentName componentName = null; if (o instanceof LauncherAppWidgetProviderInfo) { LauncherAppWidgetProviderInfo widgetInfo = (LauncherAppWidgetProviderInfo) o; - componentName = widgetInfo.provider; - packageName = widgetInfo.provider.getPackageName(); - userHandle = mAppWidgetMgr.getUser(widgetInfo); + + // Ensure that all widgets we show can be added on a workspace of this size + int minSpanX = Math.min(widgetInfo.spanX, widgetInfo.minSpanX); + int minSpanY = Math.min(widgetInfo.spanY, widgetInfo.minSpanY); + if (minSpanX <= (int) idp.numColumns && + minSpanY <= (int) idp.numRows) { + componentName = widgetInfo.provider; + packageName = widgetInfo.provider.getPackageName(); + userHandle = mAppWidgetMgr.getUser(widgetInfo); + } else { + if (DEBUG) { + Log.d(TAG, String.format( + "Widget %s : (%d X %d) can't fit on this device", + widgetInfo.provider, minSpanX, minSpanY)); + } + continue; + } } else if (o instanceof ResolveInfo) { ResolveInfo resolveInfo = (ResolveInfo) o; componentName = new ComponentName(resolveInfo.activityInfo.packageName, |