summaryrefslogtreecommitdiff
path: root/java/tests
diff options
context:
space:
mode:
author Joshua Trask <joshtrask@google.com> 2023-02-17 06:35:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-17 06:35:38 +0000
commitdf3fbb4868f1c7877f3b150d4f31e4af582fe8be (patch)
treead9b3fe312b357702f1c96139b77fefded6c232f /java/tests
parentc4810d3f07aa98c063f715e2f05f2e9deb8c267a (diff)
parent9a733ee98ed889b80c6182fa95fa123c8bbdb7b7 (diff)
Extract ChooserActionFactory. am: 9a733ee98e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21444756 Change-Id: I3e720c98c83360b74f31c766e622b0da3eea255c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/tests')
-rw-r--r--java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java19
1 files changed, 8 insertions, 11 deletions
diff --git a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
index a47014e8..17084e1c 100644
--- a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
@@ -37,7 +37,6 @@ import com.android.intentresolver.AbstractMultiProfilePagerAdapter.CrossProfileI
import com.android.intentresolver.AbstractMultiProfilePagerAdapter.MyUserIdProvider;
import com.android.intentresolver.AbstractMultiProfilePagerAdapter.QuietModeManager;
import com.android.intentresolver.chooser.DisplayResolveInfo;
-import com.android.intentresolver.chooser.NotSelectableTargetInfo;
import com.android.intentresolver.chooser.TargetInfo;
import com.android.intentresolver.flags.FeatureFlagRepository;
import com.android.intentresolver.grid.ChooserGridAdapter;
@@ -120,15 +119,13 @@ public class ChooserWrapperActivity
}
@Override
- protected ComponentName getNearbySharingComponent() {
- // an arbitrary pre-installed activity that handles this type of intent
- return ComponentName.unflattenFromString("com.google.android.apps.messaging/"
- + "com.google.android.apps.messaging.ui.conversationlist.ShareIntentActivity");
- }
-
- @Override
- protected TargetInfo getNearbySharingTarget(Intent originalIntent) {
- return NotSelectableTargetInfo.newEmptyTargetInfo();
+ protected ChooserIntegratedDeviceComponents getIntegratedDeviceComponents() {
+ return new ChooserIntegratedDeviceComponents(
+ /* editSharingComponent=*/ null,
+ // An arbitrary pre-installed activity that handles this type of intent:
+ /* nearbySharingComponent=*/ new ComponentName(
+ "com.google.android.apps.messaging",
+ ".ui.conversationlist.ShareIntentActivity"));
}
@Override
@@ -172,7 +169,7 @@ public class ChooserWrapperActivity
}
@Override
- public void safelyStartActivity(com.android.intentresolver.chooser.TargetInfo cti) {
+ public void safelyStartActivity(TargetInfo cti) {
if (sOverrides.onSafelyStartCallback != null
&& sOverrides.onSafelyStartCallback.apply(cti)) {
return;