Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fcb45f8 authored by Jonathan Miranda's avatar Jonathan Miranda
Browse files

Revert "Remove widgets that no longer fit the workspace in their current spans." 

This reverts commit bf6e8ffb.

Reason for revert: broken tests
Bug: 141313472
Change-Id: I1e93e21e2c6618dea6cd099a46c9b9d2ab3ab81c
parent bf6e8ffb

src/com/android/launcher3/model/LoaderTask.java

+0 −16
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import android.util.LongSparseArray; 
import android.util.TimingLogger;



import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherAppWidgetProviderInfo;

import com.android.launcher3.LauncherModel;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.Utilities;
@@ -307,7 +306,6 @@ public class LoaderTask implements Runnable { 
        final PackageManagerHelper pmHelper = new PackageManagerHelper(context);

        final boolean isSafeMode = pmHelper.isSafeMode();

        final boolean isSdCardReady = Utilities.isBootCompleted();

        final WidgetManagerHelper widgetHelper = new WidgetManagerHelper(context);



        boolean clearDb = false;

        try {
@@ -393,7 +391,6 @@ public class LoaderTask implements Runnable { 


                WorkspaceItemInfo info;

                LauncherAppWidgetInfo appWidgetInfo;

                LauncherAppWidgetProviderInfo widgetProviderInfo;

                Intent intent;

                String targetPkg;
@@ -723,19 +720,6 @@ public class LoaderTask implements Runnable { 
                                            + appWidgetInfo.spanX + "x" + appWidgetInfo.spanY);

                                    continue;

                                }

                                widgetProviderInfo =

                                        widgetHelper.getLauncherAppWidgetInfo(appWidgetId);

                                if (widgetProviderInfo != null

                                        && (appWidgetInfo.spanX < widgetProviderInfo.minSpanX

                                        || appWidgetInfo.spanY < widgetProviderInfo.minSpanY)) {

                                    // This can happen when display size changes.

                                    c.markDeleted("Widget removed, min sizes not met: "

                                            + "span=" + appWidgetInfo.spanX + "x"

                                            + appWidgetInfo.spanY + " minSpan="

                                            + widgetProviderInfo.minSpanX + "x"

                                            + widgetProviderInfo.minSpanY);

                                    continue;

                                }

                                if (!c.isOnWorkspaceOrHotseat()) {

                                    c.markDeleted("Widget found where container != " +

                                            "CONTAINER_DESKTOP nor CONTAINER_HOTSEAT - ignoring!");