PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preventing widgets that don't fit from showing in tray. (Bug 6331357)

Browse Source 
Change-Id: I9cbe85bed5c633f2be9b420eecbbee9a1b171e51
This commit is contained in:
Winson Chung
2012-04-12 14:04:41 -07:00
parent 2c2b28ae55
commit a5c9636f56
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AppsCustomizePagedView.java
+12 -4
View File
@@ -480,7 +480,15 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
List<ResolveInfo> shortcuts = mPackageManager.queryIntentActivities(shortcutsIntent, 0);
for (AppWidgetProviderInfo widget : widgets) {
if (widget.minWidth > 0 && widget.minHeight > 0) {
mWidgets.add(widget);
// Ensure that all widgets we show can be added on a workspace of this size
int[] spanXY = mLauncher.getSpanForWidget(widget);
int[] minSpanXY = mLauncher.getMinSpanForWidget(widget);
int minSpanX = Math.min(spanXY[0], minSpanXY[0]);
int minSpanY = Math.min(spanXY[1], minSpanXY[1]);
if (minSpanX < LauncherModel.getCellCountX() &&
minSpanY < LauncherModel.getCellCountY()) {
mWidgets.add(widget);
}
} else {
Log.e(LOG_TAG, "Widget " + widget.provider + " has invalid dimensions (" +
widget.minWidth + ", " + widget.minHeight + ")");
@@ -1205,12 +1213,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
createItemInfo = new PendingAddWidgetInfo(info, null, null);
// Determine the widget spans and min resize spans.
int[] spanXY = mLauncher.getSpanForWidget(info, null);
int[] spanXY = mLauncher.getSpanForWidget(info);
int[] size = mLauncher.getWorkspace().estimateItemSize(spanXY[0],
spanXY[1], createItemInfo, true);
createItemInfo.spanX = spanXY[0];
createItemInfo.spanY = spanXY[1];
int[] minSpanXY = mLauncher.getMinSpanForWidget(info, null);
int[] minSpanXY = mLauncher.getMinSpanForWidget(info);
createItemInfo.minSpanX = minSpanXY[0];
createItemInfo.minSpanY = minSpanXY[1];
@@ -1297,7 +1305,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
Object rawInfo = items.get(i);
if (rawInfo instanceof AppWidgetProviderInfo) {
AppWidgetProviderInfo info = (AppWidgetProviderInfo) rawInfo;
int[] cellSpans = mLauncher.getSpanForWidget(info, null);
int[] cellSpans = mLauncher.getSpanForWidget(info);
int maxWidth = Math.min(data.maxImageWidth,
mWidgetSpacingLayout.estimateCellWidth(cellSpans[0]));