aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Widgets model should respect AppFilter.

Browse Source 
> This pattern is already used in AllAppsList
> mBgWidgetsModel variable cleanup inside LauncherModel.

b/21739736

Change-Id: I03a05064ce3c3e5effb09055af9f4d4de2811c95
This commit is contained in:
Hyunyoung Song
2015-06-17 21:12:44 -07:00
parent d730f9d74f
commit eaf291b9fe
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/launcher3/LauncherModel.java
View File

@@ -242,6 +242,7 @@ public class LauncherModel extends BroadcastReceiver
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 class LauncherModel extends BroadcastReceiver
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 @@ public class LauncherModel extends BroadcastReceiver
}
}
});
mBgWidgetsModel = model;
// update the Widget entries inside DB on the worker thread.
LauncherAppState.getInstance().getWidgetCache().removeObsoletePreviews(
model.getRawList());
@@ -3372,15 +3374,13 @@ public class LauncherModel extends BroadcastReceiver
*
* @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,