Adds ResolverRequest, moves handing to tested code

This formalizes the inputs to ResolverActivity, replacing
the equivalent inline code. Fields that were temporarily
routed through 'ActivityLogic' are now removed.

Bug: 300157408
Test: atest IntentResolver-tests-activity
Test: atest IntentResolver-tests-unit:ResolveRequestTest
Change-Id: I79d9fa21b91d0ce9b008af12ba3bffbd60e91a38

3 files changed, 2 insertions, 7 deletions

diff --git a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
index 64c8e49d..07e6e7b4 100644
--- a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
@@ -40,7 +40,6 @@ import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
-import com.android.intentresolver.v2.ui.model.ChooserRequest;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
 import java.util.List;
@@ -55,12 +54,11 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
     private UsageStatsManager mUsm;
 
     @Override
-    protected final ChooserActivityLogic createActivityLogic(ChooserRequest chooserRequest) {
+    protected final ChooserActivityLogic createActivityLogic() {
         return new TestChooserActivityLogic(
                 "ChooserWrapper",
                 /* activity = */ this,
                 this::onWorkProfileStatusUpdated,
-                chooserRequest,
                 sOverrides.annotatedUserHandles,
                 sOverrides.mWorkProfileAvailability);
     }
diff --git a/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt b/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt
index 3c22254a..fe649819 100644
--- a/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt
+++ b/tests/activity/src/com/android/intentresolver/v2/TestChooserActivityLogic.kt
@@ -3,14 +3,12 @@ package com.android.intentresolver.v2
 import androidx.activity.ComponentActivity
 import com.android.intentresolver.AnnotatedUserHandles
 import com.android.intentresolver.WorkProfileAvailabilityManager
-import com.android.intentresolver.v2.ui.model.ChooserRequest
 
 /** Activity logic for use when testing [ChooserActivity]. */
 class TestChooserActivityLogic(
     tag: String,
     activity: ComponentActivity,
     onWorkProfileStatusUpdated: () -> Unit,
-    chooserRequest: ChooserRequest? = null,
     private val annotatedUserHandlesOverride: AnnotatedUserHandles?,
     private val workProfileAvailabilityOverride: WorkProfileAvailabilityManager?,
 ) :
@@ -18,7 +16,6 @@ class TestChooserActivityLogic(
         tag,
         activity,
         onWorkProfileStatusUpdated,
-        chooserRequest,
     ) {
     override val annotatedUserHandles: AnnotatedUserHandles?
         get() = annotatedUserHandlesOverride ?: super.annotatedUserHandles
diff --git a/tests/activity/src/com/android/intentresolver/v2/ui/model/TestActivityLaunchModule.kt b/tests/activity/src/com/android/intentresolver/v2/ui/model/TestActivityLaunchModule.kt
index d674bbc2..7dd15dbe 100644
--- a/tests/activity/src/com/android/intentresolver/v2/ui/model/TestActivityLaunchModule.kt
+++ b/tests/activity/src/com/android/intentresolver/v2/ui/model/TestActivityLaunchModule.kt
@@ -36,6 +36,6 @@ class TestActivityLaunchModule {
     companion object {
         const val LAUNCHED_FROM_PACKAGE = "example.com"
         const val LAUNCHED_FROM_UID = 1234
-        val REFERRER: Uri = Uri.parse("android-app://$LAUNCHED_FROM_PACKAGE")
+        val REFERRER: Uri = Uri.fromParts(ANDROID_APP_SCHEME, LAUNCHED_FROM_PACKAGE, "")
     }
 }