Removes TargetDataLoader from adapter factory method chain

TargetDataLoader is removed from ActivityLogic since it is now
only used via direct constructor call by ResolverActivity, and
injected directly to a field of ChooserActivity.

Since it is only needed to pass to the ChooserListAdapter
or ResolverListAdapter constructor, this removes the parameter
from being forwarded through a sequence of functions and instead
references the injected parameter directly when calling the
contructor. This allows smoother transition to an assisted-inject
factory.

Bug: 300157408
Test: atest IntentResolver-tests-activity:com.android.intentresolver.v2
Change-Id: I18b230eaf97bf8e26e23e2e1cd1372e7d078520f

3 files changed, 4 insertions, 11 deletions

diff --git a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
index b045c801..0b268905 100644
--- a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
@@ -39,7 +39,6 @@ import com.android.intentresolver.TestContentPreviewViewModel;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
-import com.android.intentresolver.icons.TargetDataLoader;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
@@ -60,7 +59,6 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
                         "ChooserWrapper",
                         /* activity = */ this,
                         this::onWorkProfileStatusUpdated,
-                        mTargetDataLoader,
                         sOverrides);
     }
 
@@ -82,8 +80,7 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
             UserHandle userHandle,
             Intent targetIntent,
             Intent referrerFillInIntent,
-            int maxTargetsPerRow,
-            TargetDataLoader targetDataLoader) {
+            int maxTargetsPerRow) {
 
         return new ChooserListAdapter(
                 context,
@@ -100,7 +97,7 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
                 getEventLog(),
                 maxTargetsPerRow,
                 userHandle,
-                targetDataLoader,
+                mTargetDataLoader,
                 null,
                 mFeatureFlags);
     }
diff --git a/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java b/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
index fcd6205c..d06b7929 100644
--- a/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
@@ -84,8 +84,7 @@ public class ResolverWrapperActivity extends ResolverActivity {
             Intent[] initialIntents,
             List<ResolveInfo> rList,
             boolean filterLastUsed,
-            UserHandle userHandle,
-            TargetDataLoader targetDataLoader) {
+            UserHandle userHandle) {
         return new ResolverListAdapter(
                 context,
                 payloadIntents,
@@ -97,7 +96,7 @@ public class ResolverWrapperActivity extends ResolverActivity {
                 payloadIntents.get(0),  // TODO: extract upstream
                 this,
                 userHandle,
-                new TargetDataLoaderWrapper(targetDataLoader, mLabelIdlingResource));
+                new TargetDataLoaderWrapper(mTargetDataLoader, mLabelIdlingResource));
     }
 
     @Override
diff --git a/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt b/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt
index b6354c7a..0849e511 100644
--- a/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt
+++ b/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt
@@ -3,21 +3,18 @@ package com.android.intentresolver.v2
 import androidx.activity.ComponentActivity
 import com.android.intentresolver.AnnotatedUserHandles
 import com.android.intentresolver.WorkProfileAvailabilityManager
-import com.android.intentresolver.icons.TargetDataLoader
 
 /** Activity logic for use when testing [ChooserActivity]. */
 class TestChooserActivityLogic(
     tag: String,
     activity: ComponentActivity,
     onWorkProfileStatusUpdated: () -> Unit,
-    targetDataLoader: TargetDataLoader,
     private val overrideData: ChooserActivityOverrideData,
 ) :
     ChooserActivityLogic(
         tag,
         activity,
         onWorkProfileStatusUpdated,
-        targetDataLoader,
     ) {
 
     override val annotatedUserHandles: AnnotatedUserHandles? by lazy {