Making various model objects injectable

Bug: 361850561
Test: Updated tests
Flag: EXEMPT dagger
Change-Id: Ibb45b72c186e6aeeed7a37b0ae3f8083472019d7
This commit is contained in:
Sunny Goyal committed 2025-03-10 14:37:43 -07:00
1 parent 24645d732c
commit 42975c39db
39 files changed
+601 -505

No files matched your search

@@ -45,13 +45,14 @@ import androidx.annotation.VisibleForTesting;
import com.android.launcher3.Flags;
import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.LauncherSettings.Favorites;
import com.android.launcher3.Utilities;
import com.android.launcher3.Workspace;
import com.android.launcher3.backuprestore.LauncherRestoreEventLogger;
import com.android.launcher3.backuprestore.LauncherRestoreEventLogger.RestoreError;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.dagger.ApplicationContext;
import com.android.launcher3.icons.IconCache;
import com.android.launcher3.logging.FileLog;
import com.android.launcher3.model.data.AppInfo;
@@ -70,6 +71,10 @@ import com.android.launcher3.util.IntSparseArrayMap;
import com.android.launcher3.util.PackageManagerHelper;
import com.android.launcher3.util.UserIconInfo;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedFactory;
import dagger.assisted.AssistedInject;
import java.net.URISyntaxException;
import java.security.InvalidParameterException;
@@ -82,8 +87,8 @@ public class LoaderCursor extends CursorWrapper {
private final LongSparseArray<UserHandle> allUsers;
private final LauncherAppState mApp;
private final Context mContext;
private final LauncherModel mModel;
private final PackageManagerHelper mPmHelper;
private final IconCache mIconCache;
private final InvariantDeviceProfile mIDP;
@@ -130,17 +135,24 @@ public class LoaderCursor extends CursorWrapper {
public int itemType;
public int restoreFlag;
public LoaderCursor(Cursor cursor, LauncherAppState app, UserManagerState userManagerState,
PackageManagerHelper pmHelper,
@Nullable LauncherRestoreEventLogger restoreEventLogger) {
@AssistedInject
public LoaderCursor(
@Assisted Cursor cursor,
@Assisted UserManagerState userManagerState,
@Assisted @Nullable LauncherRestoreEventLogger restoreEventLogger,
@ApplicationContext Context context,
IconCache iconCache,
InvariantDeviceProfile idp,
LauncherModel model,
PackageManagerHelper pmHelper) {
super(cursor);
mApp = app;
allUsers = userManagerState.allUsers;
mContext = app.getContext();
mIconCache = app.getIconCache();
mContext = context;
mIconCache = iconCache;
mIDP = idp;
mModel = model;
mPmHelper = pmHelper;
mIDP = app.getInvariantDeviceProfile();
allUsers = userManagerState.allUsers;
mRestoreEventLogger = restoreEventLogger;
// Init column indices
@@ -432,7 +444,7 @@ public class LoaderCursor extends CursorWrapper {
*/
public ContentWriter updater() {
return new ContentWriter(mContext, new ContentWriter.CommitParams(
mApp.getModel().getModelDbController(),
mModel.getModelDbController(),
BaseColumns._ID + "= ?", new String[]{Integer.toString(id)}));
}
@@ -454,7 +466,7 @@ public class LoaderCursor extends CursorWrapper {
public boolean commitDeleted() {
if (mItemsToRemove.size() > 0) {
// Remove dead items
mApp.getModel().getModelDbController().delete(TABLE_NAME,
mModel.getModelDbController().delete(TABLE_NAME,
Utilities.createDbSelectionQuery(Favorites._ID, mItemsToRemove), null);
return true;
}
@@ -480,7 +492,7 @@ public class LoaderCursor extends CursorWrapper {
// Update restored items that no longer require special handling
ContentValues values = new ContentValues();
values.put(Favorites.RESTORED, 0);
mApp.getModel().getModelDbController().update(TABLE_NAME, values,
mModel.getModelDbController().update(TABLE_NAME, values,
Utilities.createDbSelectionQuery(Favorites._ID, mRestoredRows), null);
}
if (mRestoreEventLogger != null) {
@@ -645,4 +657,12 @@ public class LoaderCursor extends CursorWrapper {
return false;
}
}
@AssistedFactory
public interface LoaderCursorFactory {
LoaderCursor createLoaderCursor(Cursor cursor,
UserManagerState userManagerState,
@Nullable LauncherRestoreEventLogger restoreEventLogger);
}
}