resolve merge conflicts of 26b174659 to ub-launcher3-master

Test: I solemnly swear I tested this conflict resolution. Change-Id: Ifb24f291b096b979044e5c87ec58c24e9c479728
2017-03-30 18:10:05 -07:00
parent 917f4a44cb 26b1746593
commit ca4e6b4b59
24 changed files with 491 additions and 97 deletions
@@ -3938,11 +3938,24 @@ public class Launcher extends BaseActivity
            mWidgetsView.setWidgets(allWidgets);
            mAllWidgets = null;
        }
+
+        AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(this);
+        if (topView != null) {
+            topView.onWidgetsBound();
+        }
+    }
+
+    public List<WidgetItem> getWidgetsForPackageUser(PackageUserKey packageUserKey) {
+        return mWidgetsView.getWidgetsForPackageUser(packageUserKey);
    }

    @Override
    public void notifyWidgetProvidersChanged() {
-        if (mWorkspace.getState().shouldUpdateWidget) {
+        notifyWidgetProvidersChanged(false);
+    }
+
+    public void notifyWidgetProvidersChanged(boolean force) {
+        if (force || mWorkspace.getState().shouldUpdateWidget) {
            mModel.refreshAndBindWidgetsAndShortcuts(this, mWidgetsView.isEmpty());
        }
    }