Merge "Load app target labels explicitly" into main

8 files changed, 50 insertions, 55 deletions

diff --git a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
index 87e58954..a4078365 100644
--- a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
+++ b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
@@ -123,8 +123,7 @@ class ChooserListAdapterTest {
                 ResolverDataProvider.createResolveInfo(2, 0, userHandle),
                 null,
                 "extended info",
-                Intent(),
-                /* resolveInfoPresentationGetter= */ null
+                Intent()
             )
         testSubject.onBindView(view, targetInfo, 0)
 
@@ -200,7 +199,6 @@ class ChooserListAdapterTest {
                 appLabel,
                 "extended info",
                 Intent(),
-                /* resolveInfoPresentationGetter= */ null
             )
             .apply {
                 if (isPinned) {
diff --git a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
index fbc99a3a..48f8be5d 100644
--- a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
@@ -224,16 +224,18 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
     }
 
     @Override
-    public DisplayResolveInfo createTestDisplayResolveInfo(Intent originalIntent, ResolveInfo pri,
-            CharSequence pLabel, CharSequence pInfo, Intent replacementIntent,
-            @Nullable TargetPresentationGetter resolveInfoPresentationGetter) {
+    public DisplayResolveInfo createTestDisplayResolveInfo(
+            Intent originalIntent,
+            ResolveInfo pri,
+            CharSequence pLabel,
+            CharSequence pInfo,
+            Intent replacementIntent) {
         return DisplayResolveInfo.newDisplayResolveInfo(
                 originalIntent,
                 pri,
                 pLabel,
                 pInfo,
-                replacementIntent,
-                resolveInfoPresentationGetter);
+                replacementIntent);
     }
 
     @Override
diff --git a/java/tests/src/com/android/intentresolver/IChooserWrapper.java b/java/tests/src/com/android/intentresolver/IChooserWrapper.java
index d439b037..e34217a8 100644
--- a/java/tests/src/com/android/intentresolver/IChooserWrapper.java
+++ b/java/tests/src/com/android/intentresolver/IChooserWrapper.java
@@ -16,7 +16,6 @@
 
 package com.android.intentresolver;
 
-import android.annotation.Nullable;
 import android.app.usage.UsageStatsManager;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ -37,9 +36,12 @@ public interface IChooserWrapper {
     ChooserListAdapter getWorkListAdapter();
     boolean getIsSelected();
     UsageStatsManager getUsageStatsManager();
-    DisplayResolveInfo createTestDisplayResolveInfo(Intent originalIntent, ResolveInfo pri,
-            CharSequence pLabel, CharSequence pInfo, Intent replacementIntent,
-            @Nullable TargetPresentationGetter resolveInfoPresentationGetter);
+    DisplayResolveInfo createTestDisplayResolveInfo(
+            Intent originalIntent,
+            ResolveInfo pri,
+            CharSequence pLabel,
+            CharSequence pInfo,
+            Intent replacementIntent);
     UserHandle getCurrentUserHandle();
     Executor getMainExecutor();
 }
diff --git a/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java b/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
index 60180c0b..1bb05437 100644
--- a/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
@@ -273,10 +273,9 @@ public class ResolverWrapperActivity extends ResolverActivity {
                     });
         }
 
-        @NonNull
         @Override
-        public TargetPresentationGetter createPresentationGetter(@NonNull ResolveInfo info) {
-            return mTargetDataLoader.createPresentationGetter(info);
+        public void getOrLoadLabel(@NonNull DisplayResolveInfo info) {
+            mTargetDataLoader.getOrLoadLabel(info);
         }
     }
 }
diff --git a/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt b/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt
index 9ddeed84..2346d98b 100644
--- a/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt
+++ b/java/tests/src/com/android/intentresolver/ShortcutSelectionLogicTest.kt
@@ -19,7 +19,6 @@ package com.android.intentresolver
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ResolveInfo
 import android.content.pm.ShortcutInfo
 import android.os.UserHandle
 import android.service.chooser.ChooserTarget
@@ -60,16 +59,16 @@ class ShortcutSelectionLogicTest {
             ResolverDataProvider.createResolveInfo(3, 0, PERSONAL_USER_HANDLE),
             "label",
             "extended info",
-            Intent(),
-            /* resolveInfoPresentationGetter= */ null)
+            Intent()
+    )
 
     private val otherBaseDisplayInfo = DisplayResolveInfo.newDisplayResolveInfo(
             Intent(),
             ResolverDataProvider.createResolveInfo(4, 0, PERSONAL_USER_HANDLE),
             "label 2",
             "extended info 2",
-            Intent(),
-            /* resolveInfoPresentationGetter= */ null)
+            Intent()
+    )
 
     private operator fun Map<String, Array<ChooserTarget>>.get(pkg: String, idx: Int) =
         this[pkg]?.get(idx) ?: error("missing package $pkg")
diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
index bc9e521c..73977f86 100644
--- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
+++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
@@ -511,8 +511,8 @@ public class UnbundledChooserActivityTest {
         };
         ResolveInfo toChoose = resolvedComponentInfos.get(0).getResolveInfoAt(0);
         DisplayResolveInfo testDri =
-                activity.createTestDisplayResolveInfo(sendIntent, toChoose, "testLabel", "testInfo",
-                        sendIntent, /* resolveInfoPresentationGetter */ null);
+                activity.createTestDisplayResolveInfo(
+                        sendIntent, toChoose, "testLabel", "testInfo", sendIntent);
         onView(withText(toChoose.activityInfo.name))
                 .perform(click());
         waitForIdle();
@@ -1425,8 +1425,7 @@ public class UnbundledChooserActivityTest {
                         ResolverDataProvider.createResolveInfo(3, 0, PERSONAL_USER_HANDLE),
                         "testLabel",
                         "testInfo",
-                        sendIntent,
-                /* resolveInfoPresentationGetter */ null);
+                        sendIntent);
         final ChooserListAdapter adapter = activity.getAdapter();
 
         assertThat(adapter.getBaseScore(null, 0), is(CALLER_TARGET_SCORE_BOOST));
@@ -1965,8 +1964,7 @@ public class UnbundledChooserActivityTest {
                                 ri,
                                 "testLabel",
                                 "testInfo",
-                                sendIntent,
-                                /* resolveInfoPresentationGetter */ null),
+                                sendIntent),
                         serviceTargets,
                         TARGET_TYPE_CHOOSER_TARGET,
                         directShareToShortcutInfos,
diff --git a/java/tests/src/com/android/intentresolver/chooser/ImmutableTargetInfoTest.kt b/java/tests/src/com/android/intentresolver/chooser/ImmutableTargetInfoTest.kt
index f3ca76a9..6712bf31 100644
--- a/java/tests/src/com/android/intentresolver/chooser/ImmutableTargetInfoTest.kt
+++ b/java/tests/src/com/android/intentresolver/chooser/ImmutableTargetInfoTest.kt
@@ -21,7 +21,6 @@ import android.app.prediction.AppTarget
 import android.app.prediction.AppTargetId
 import android.content.ComponentName
 import android.content.Intent
-import android.content.pm.ResolveInfo
 import android.os.Bundle
 import android.os.UserHandle
 import com.android.intentresolver.createShortcutInfo
@@ -52,15 +51,15 @@ class ImmutableTargetInfoTest {
         ResolverDataProvider.createResolveInfo(2, 0, PERSONAL_USER_HANDLE),
         "display1 label",
         "display1 extended info",
-        Intent("display1_resolved"),
-        /* resolveInfoPresentationGetter= */ null)
+        Intent("display1_resolved")
+    )
     private val displayTarget2 = DisplayResolveInfo.newDisplayResolveInfo(
         Intent("display2"),
         ResolverDataProvider.createResolveInfo(3, 0, PERSONAL_USER_HANDLE),
         "display2 label",
         "display2 extended info",
-        Intent("display2_resolved"),
-        /* resolveInfoPresentationGetter= */ null)
+        Intent("display2_resolved")
+    )
     private val directShareShortcutInfo = createShortcutInfo(
         "shortcutid", ResolverDataProvider.createComponentName(4), 4)
     private val directShareAppTarget = AppTarget(
@@ -73,8 +72,8 @@ class ImmutableTargetInfoTest {
         ResolverDataProvider.createResolveInfo(5, 0, PERSONAL_USER_HANDLE),
         "displayresolve label",
         "displayresolve extended info",
-        Intent("display_resolved"),
-        /* resolveInfoPresentationGetter= */ null)
+        Intent("display_resolved")
+    )
     private val hashProvider: ImmutableTargetInfo.TargetHashProvider = mock()
 
     @Test
diff --git a/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt b/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt
index 78e0c3ee..a7574c12 100644
--- a/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt
+++ b/java/tests/src/com/android/intentresolver/chooser/TargetInfoTest.kt
@@ -87,8 +87,8 @@ class TargetInfoTest {
             ResolverDataProvider.createResolveInfo(1, 0, PERSONAL_USER_HANDLE),
             "label",
             "extended info",
-            resolvedIntent,
-            /* resolveInfoPresentationGetter= */ null)
+            resolvedIntent
+        )
         val chooserTarget = createChooserTarget(
             "title", 0.3f, ResolverDataProvider.createComponentName(2), "test_shortcut_id")
         val shortcutInfo = createShortcutInfo("id", ResolverDataProvider.createComponentName(3), 3)
@@ -161,8 +161,8 @@ class TargetInfoTest {
             ResolverDataProvider.createResolveInfo(1, 0),
             "label",
             "extended info",
-            resolvedIntent,
-            /* resolveInfoPresentationGetter= */ null)
+            resolvedIntent
+        )
         val chooserTarget = createChooserTarget(
             "title", 0.3f, ResolverDataProvider.createComponentName(2), "test_shortcut_id")
         val shortcutInfo = createShortcutInfo("id", ResolverDataProvider.createComponentName(3), 3)
@@ -200,8 +200,8 @@ class TargetInfoTest {
             resolveInfo,
             "label",
             "extended info",
-            intent,
-            /* resolveInfoPresentationGetter= */ null)
+            intent
+        )
         assertThat(targetInfo.isDisplayResolveInfo()).isTrue()
         assertThat(targetInfo.isMultiDisplayResolveInfo()).isFalse()
         assertThat(targetInfo.isChooserTargetInfo()).isFalse()
@@ -223,8 +223,8 @@ class TargetInfoTest {
             ResolverDataProvider.createResolveInfo(3, 0),
             "label",
             "extended info",
-            originalIntent,
-            /* resolveInfoPresentationGetter= */ null)
+            originalIntent
+        )
         originalInfo.addAlternateSourceIntent(mismatchedAlternate)
         originalInfo.addAlternateSourceIntent(targetAlternate)
         originalInfo.addAlternateSourceIntent(extraMatch)
@@ -257,8 +257,8 @@ class TargetInfoTest {
             ResolverDataProvider.createResolveInfo(3, 0),
             "label",
             "extended info",
-            originalIntent,
-            /* resolveInfoPresentationGetter= */ null)
+            originalIntent
+        )
         originalInfo.addAlternateSourceIntent(mismatchedAlternate)
 
         val refinement = Intent("PROPOSED_REFINEMENT")
@@ -277,15 +277,15 @@ class TargetInfoTest {
             resolveInfo,
             "label 1",
             "extended info 1",
-            intent,
-            /* resolveInfoPresentationGetter= */ null)
+            intent
+        )
         val secondTargetInfo = DisplayResolveInfo.newDisplayResolveInfo(
             intent,
             resolveInfo,
             "label 2",
             "extended info 2",
-            intent,
-            /* resolveInfoPresentationGetter= */ null)
+            intent
+        )
 
         val multiTargetInfo = MultiDisplayResolveInfo.newMultiDisplayResolveInfo(
             listOf(firstTargetInfo, secondTargetInfo))
@@ -328,24 +328,23 @@ class TargetInfoTest {
             resolveInfo,
             "Send Image",
             "Sends only images",
-            sendImage,
-            /* resolveInfoPresentationGetter= */ null)
+            sendImage
+        )
 
         val textOnlyTarget = DisplayResolveInfo.newDisplayResolveInfo(
             sendUri,
             resolveInfo,
             "Send Text",
             "Sends only text",
-            sendUri,
-            /* resolveInfoPresentationGetter= */ null)
+            sendUri
+        )
 
         val imageOrTextTarget = DisplayResolveInfo.newDisplayResolveInfo(
             sendImage,
             resolveInfo,
             "Send Image or Text",
             "Sends images or text",
-            sendImage,
-            /* resolveInfoPresentationGetter= */ null
+            sendImage
         ).apply {
             addAlternateSourceIntent(sendUri)
         }
@@ -377,8 +376,7 @@ class TargetInfoTest {
                 ResolverDataProvider.createResolveInfo(1, 0),
                 "Target One",
                 "Target One",
-                sendImage,
-                /* resolveInfoPresentationGetter= */ null
+                sendImage
             )
         )
         val targetTwo = mock<DisplayResolveInfo> {