Widgets model should respect AppFilter.
> This pattern is already used in AllAppsList
> mBgWidgetsModel variable cleanup inside LauncherModel.
b/21739736
Change-Id: I03a05064ce3c3e5effb09055af9f4d4de2811c95
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index a132e91..b148b06 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -242,6 +242,7 @@
mApp = app;
mBgAllAppsList = new AllAppsList(iconCache, appFilter);
+ mBgWidgetsModel = new WidgetsModel(context, iconCache, appFilter);
mIconCache = iconCache;
final Resources res = context.getResources();
@@ -3346,10 +3347,12 @@
public void loadAndBindWidgetsAndShortcuts(final Context context, final Callbacks callbacks,
final boolean refresh) {
- runOnWorkerThread(new Runnable(){
+ runOnWorkerThread(new Runnable() {
@Override
public void run() {
- final WidgetsModel model = createWidgetsModel(context, refresh);
+ updateWidgetsModel(context, refresh);
+ final WidgetsModel model = mBgWidgetsModel.clone();
+
mHandler.post(new Runnable() {
@Override
public void run() {
@@ -3359,7 +3362,6 @@
}
}
});
- mBgWidgetsModel = model;
// update the Widget entries inside DB on the worker thread.
LauncherAppState.getInstance().getWidgetCache().removeObsoletePreviews(
model.getRawList());
@@ -3372,15 +3374,13 @@
*
* @see #loadAndBindWidgetsAndShortcuts
*/
- @Thunk WidgetsModel createWidgetsModel(Context context, boolean refresh) {
+ @Thunk void updateWidgetsModel(Context context, boolean refresh) {
PackageManager packageManager = context.getPackageManager();
final ArrayList<Object> widgetsAndShortcuts = new ArrayList<Object>();
widgetsAndShortcuts.addAll(getWidgetProviders(context, refresh));
Intent shortcutsIntent = new Intent(Intent.ACTION_CREATE_SHORTCUT);
widgetsAndShortcuts.addAll(packageManager.queryIntentActivities(shortcutsIntent, 0));
- WidgetsModel model = new WidgetsModel(context);
- model.addWidgetsAndShortcuts(widgetsAndShortcuts);
- return model;
+ mBgWidgetsModel.setWidgetsAndShortcuts(widgetsAndShortcuts);
}
@Thunk static boolean isPackageDisabled(Context context, String packageName,