Moving widgetFilter to dagger
Moving widget filtering to UI layer as it changes with surface Bug: 361850561 Test: Presubmit Flag: EXEMPT dagger Change-Id: I9d9377540ca36873659cea4ecc91fb162d82cd44
This commit is contained in:
1 parent
3848c51edb
commit
5025b9ab04
25 files changed
+147
-373
No files matched your search
@@ -20,7 +20,6 @@ import static com.android.launcher3.BuildConfig.WIDGET_ON_FIRST_SCREEN;
|
||||
import static com.android.launcher3.Flags.enableLauncherBrMetricsFixed;
|
||||
import static com.android.launcher3.Flags.enableSmartspaceAsAWidget;
|
||||
import static com.android.launcher3.Flags.enableSmartspaceRemovalToggle;
|
||||
import static com.android.launcher3.Flags.enableTieredWidgetsByDefaultInPicker;
|
||||
import static com.android.launcher3.LauncherPrefs.IS_FIRST_LOAD_AFTER_RESTORE;
|
||||
import static com.android.launcher3.LauncherPrefs.SHOULD_SHOW_SMARTSPACE;
|
||||
import static com.android.launcher3.LauncherSettings.Favorites.DESKTOP_ICON_FLAG;
|
||||
@@ -148,7 +147,6 @@ public class LoaderTask implements Runnable {
|
||||
private final UserManager mUserManager;
|
||||
private final UserCache mUserCache;
|
||||
private final PackageManagerHelper mPmHelper;
|
||||
private final WidgetsFilterDataProvider mWidgetsFilterDataProvider;
|
||||
|
||||
private final InstallSessionHelper mSessionHelper;
|
||||
private final IconCache mIconCache;
|
||||
@@ -167,16 +165,13 @@ public class LoaderTask implements Runnable {
|
||||
private String mDbName;
|
||||
|
||||
public LoaderTask(@NonNull LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel bgModel,
|
||||
ModelDelegate modelDelegate, @NonNull BaseLauncherBinder launcherBinder,
|
||||
@NonNull WidgetsFilterDataProvider widgetsFilterDataProvider) {
|
||||
this(app, bgAllAppsList, bgModel, modelDelegate, launcherBinder, widgetsFilterDataProvider,
|
||||
new UserManagerState());
|
||||
ModelDelegate modelDelegate, @NonNull BaseLauncherBinder launcherBinder) {
|
||||
this(app, bgAllAppsList, bgModel, modelDelegate, launcherBinder, new UserManagerState());
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
LoaderTask(@NonNull LauncherAppState app, AllAppsList bgAllAppsList, BgDataModel bgModel,
|
||||
ModelDelegate modelDelegate, @NonNull BaseLauncherBinder launcherBinder,
|
||||
WidgetsFilterDataProvider widgetsFilterDataProvider,
|
||||
UserManagerState userManagerState) {
|
||||
mApp = app;
|
||||
mBgAllAppsList = bgAllAppsList;
|
||||
@@ -191,7 +186,6 @@ public class LoaderTask implements Runnable {
|
||||
mIconCache = mApp.getIconCache();
|
||||
mUserManagerState = userManagerState;
|
||||
mInstallingPkgsCached = null;
|
||||
mWidgetsFilterDataProvider = widgetsFilterDataProvider;
|
||||
}
|
||||
|
||||
protected synchronized void waitForIdle() {
|
||||
@@ -348,13 +342,6 @@ public class LoaderTask implements Runnable {
|
||||
|
||||
// fourth step
|
||||
WidgetsModel widgetsModel = mBgDataModel.widgetsModel;
|
||||
if (enableTieredWidgetsByDefaultInPicker()) {
|
||||
// Begin periodic refresh of filters
|
||||
mWidgetsFilterDataProvider.initPeriodicDataRefresh(
|
||||
mApp.getModel()::onWidgetFiltersLoaded);
|
||||
// And, update model with currently cached data.
|
||||
widgetsModel.updateWidgetFilters(mWidgetsFilterDataProvider);
|
||||
}
|
||||
List<CachedObject> allWidgetsList = widgetsModel.update(mApp, /*packageUser=*/null);
|
||||
logASplit("load widgets finished");
|
||||
|
||||
|
||||
Reference in new issue
Block a user