summaryrefslogtreecommitdiff
path: root/java/tests
diff options
context:
space:
mode:
author Andrey Yepin <ayepin@google.com> 2023-10-16 20:12:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-10-16 20:12:35 +0000
commit8a3d1eaadf52b713916517797e561e27421f67cf (patch)
tree5f552bb8e9d1b539aceb68c6b89c0b6c14c33323 /java/tests
parent6f76017966b3110d3a83ca1a91fadf56beed5615 (diff)
parent8ea89dd1b1a192710340d58eae28a003f63c804c (diff)
Merge "Replace array of strings with a class" into main
Diffstat (limited to 'java/tests')
-rw-r--r--java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java3
-rw-r--r--java/tests/src/com/android/intentresolver/v2/ResolverWrapperActivity.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java b/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
index fbcfcd35..7ffb90ce 100644
--- a/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
@@ -38,6 +38,7 @@ import com.android.intentresolver.chooser.DisplayResolveInfo;
import com.android.intentresolver.chooser.SelectableTargetInfo;
import com.android.intentresolver.chooser.TargetInfo;
import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
+import com.android.intentresolver.icons.LabelInfo;
import com.android.intentresolver.icons.TargetDataLoader;
import java.util.List;
@@ -263,7 +264,7 @@ public class ResolverWrapperActivity extends ResolverActivity {
@Override
public void loadLabel(
@NonNull DisplayResolveInfo info,
- @NonNull Consumer<CharSequence[]> callback) {
+ @NonNull Consumer<LabelInfo> callback) {
mLabelIdlingResource.increment();
mTargetDataLoader.loadLabel(
info,
diff --git a/java/tests/src/com/android/intentresolver/v2/ResolverWrapperActivity.java b/java/tests/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
index 610d031e..0fb77457 100644
--- a/java/tests/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
@@ -42,6 +42,7 @@ import com.android.intentresolver.chooser.DisplayResolveInfo;
import com.android.intentresolver.chooser.SelectableTargetInfo;
import com.android.intentresolver.chooser.TargetInfo;
import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
+import com.android.intentresolver.icons.LabelInfo;
import com.android.intentresolver.icons.TargetDataLoader;
import java.util.List;
@@ -267,7 +268,7 @@ public class ResolverWrapperActivity extends ResolverActivity {
@Override
public void loadLabel(
@NonNull DisplayResolveInfo info,
- @NonNull Consumer<CharSequence[]> callback) {
+ @NonNull Consumer<LabelInfo> callback) {
mLabelIdlingResource.increment();
mTargetDataLoader.loadLabel(
info,