Merge "Remove SelectableTargetInfo#SelectableTargetInfoCommunicator interface" into tm-qpr-dev

3 files changed, 16 insertions, 25 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index bbe68ac0..f22d7211 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -118,7 +118,6 @@ import androidx.viewpager.widget.ViewPager;
 import com.android.intentresolver.ResolverListAdapter.ViewHolder;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.MultiDisplayResolveInfo;
-import com.android.intentresolver.chooser.SelectableTargetInfo.SelectableTargetInfoCommunicator;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.shortcuts.AppPredictorFactory;
 import com.android.intentresolver.widget.ResolverDrawerLayout;
@@ -153,8 +152,7 @@ import java.util.function.Supplier;
  *
  */
 public class ChooserActivity extends ResolverActivity implements
-        ChooserListAdapter.ChooserListCommunicator,
-        SelectableTargetInfoCommunicator {
+        ChooserListAdapter.ChooserListCommunicator {
     private static final String TAG = "ChooserActivity";
 
     private boolean mShouldDisplayLandscape;
@@ -2222,9 +2220,15 @@ public class ChooserActivity extends ResolverActivity implements
     public ChooserListAdapter createChooserListAdapter(Context context,
             List<Intent> payloadIntents, Intent[] initialIntents, List<ResolveInfo> rList,
             boolean filterLastUsed, ResolverListController resolverListController) {
-        return new ChooserListAdapter(context, payloadIntents, initialIntents, rList,
-                filterLastUsed, resolverListController, this,
-                this, context.getPackageManager(),
+        return new ChooserListAdapter(
+                context,
+                payloadIntents,
+                initialIntents,
+                rList,
+                filterLastUsed,
+                resolverListController,
+                this,
+                context.getPackageManager(),
                 getChooserActivityLogger());
     }
 
diff --git a/java/src/com/android/intentresolver/ChooserListAdapter.java b/java/src/com/android/intentresolver/ChooserListAdapter.java
index f20ee38f..e31bf2ab 100644
--- a/java/src/com/android/intentresolver/ChooserListAdapter.java
+++ b/java/src/com/android/intentresolver/ChooserListAdapter.java
@@ -53,7 +53,6 @@ import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.MultiDisplayResolveInfo;
 import com.android.intentresolver.chooser.NotSelectableTargetInfo;
 import com.android.intentresolver.chooser.SelectableTargetInfo;
-import com.android.intentresolver.chooser.SelectableTargetInfo.SelectableTargetInfoCommunicator;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
@@ -85,7 +84,6 @@ public class ChooserListAdapter extends ResolverListAdapter {
     public static final float SHORTCUT_TARGET_SCORE_BOOST = 90.f;
 
     private final ChooserListCommunicator mChooserListCommunicator;
-    private final SelectableTargetInfoCommunicator mSelectableTargetInfoCommunicator;
     private final ChooserActivityLogger mChooserActivityLogger;
 
     private final Map<TargetInfo, AsyncTask> mIconLoaders = new HashMap<>();
@@ -139,7 +137,6 @@ public class ChooserListAdapter extends ResolverListAdapter {
             boolean filterLastUsed,
             ResolverListController resolverListController,
             ChooserListCommunicator chooserListCommunicator,
-            SelectableTargetInfoCommunicator selectableTargetInfoCommunicator,
             PackageManager packageManager,
             ChooserActivityLogger chooserActivityLogger) {
         // Don't send the initial intents through the shared ResolverActivity path,
@@ -150,7 +147,6 @@ public class ChooserListAdapter extends ResolverListAdapter {
         mChooserListCommunicator = chooserListCommunicator;
         mPlaceHolderTargetInfo = NotSelectableTargetInfo.newPlaceHolderTargetInfo(context);
         createPlaceHolders();
-        mSelectableTargetInfoCommunicator = selectableTargetInfoCommunicator;
         mChooserActivityLogger = chooserActivityLogger;
         mShortcutSelectionLogic = new ShortcutSelectionLogic(
                 context.getResources().getInteger(R.integer.config_maxShortcutTargetsPerApp),
@@ -554,8 +550,8 @@ public class ChooserListAdapter extends ResolverListAdapter {
                 directShareToShortcutInfos,
                 directShareToAppTargets,
                 mContext.createContextAsUser(getUserHandle(), 0),
-                mSelectableTargetInfoCommunicator.getTargetIntent(),
-                mSelectableTargetInfoCommunicator.getReferrerFillInIntent(),
+                mChooserListCommunicator.getTargetIntent(),
+                mChooserListCommunicator.getReferrerFillInIntent(),
                 mChooserListCommunicator.getMaxRankedTargets(),
                 mServiceTargets);
         if (isUpdated) {
@@ -645,6 +641,10 @@ public class ChooserListAdapter extends ResolverListAdapter {
         int getMaxRankedTargets();
 
         boolean isSendAction(Intent targetIntent);
+
+        Intent getTargetIntent();
+
+        Intent getReferrerFillInIntent();
     }
 
     /**
diff --git a/java/src/com/android/intentresolver/chooser/SelectableTargetInfo.java b/java/src/com/android/intentresolver/chooser/SelectableTargetInfo.java
index c25efeb6..51a776db 100644
--- a/java/src/com/android/intentresolver/chooser/SelectableTargetInfo.java
+++ b/java/src/com/android/intentresolver/chooser/SelectableTargetInfo.java
@@ -34,7 +34,6 @@ import android.text.SpannableStringBuilder;
 import android.util.HashedStringCache;
 import android.util.Log;
 
-import com.android.intentresolver.ChooserActivity;
 import com.android.intentresolver.ResolverActivity;
 import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
 
@@ -330,16 +329,4 @@ public final class SelectableTargetInfo extends ChooserTargetInfo {
         sb.clearSpans();
         return sb.toString();
     }
-
-    // TODO: merge into ChooserListAdapter.ChooserListCommunicator and delete.
-    /**
-     * Necessary methods to communicate between {@link SelectableTargetInfo}
-     * and {@link ResolverActivity} or {@link ChooserActivity}.
-     */
-    public interface SelectableTargetInfoCommunicator {
-
-        Intent getTargetIntent();
-
-        Intent getReferrerFillInIntent();
-    }
 }