Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 am: b9f9f81d13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488 Change-Id: Ied1f6e341c4722d13b1f56a55d47ff62351b7d82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -190,6 +190,7 @@ public class ChooserActivity extends ResolverActivity implements
|
||||
private static final String SHORTCUT_TARGET = "shortcut_target";
|
||||
private static final int APP_PREDICTION_SHARE_TARGET_QUERY_PACKAGE_LIMIT = 20;
|
||||
public static final String APP_PREDICTION_INTENT_FILTER_KEY = "intent_filter";
|
||||
private static final String SHARED_TEXT_KEY = "shared_text";
|
||||
|
||||
private static final String PLURALS_COUNT = "count";
|
||||
private static final String PLURALS_FILE_NAME = "file_name";
|
||||
@@ -2201,6 +2202,7 @@ public class ChooserActivity extends ResolverActivity implements
|
||||
final IntentFilter filter = getTargetIntentFilter();
|
||||
Bundle extras = new Bundle();
|
||||
extras.putParcelable(APP_PREDICTION_INTENT_FILTER_KEY, filter);
|
||||
populateTextContent(extras);
|
||||
AppPredictionContext appPredictionContext = new AppPredictionContext.Builder(contextAsUser)
|
||||
.setUiSurface(APP_PREDICTION_SHARE_UI_SURFACE)
|
||||
.setPredictedTargetCount(APP_PREDICTION_SHARE_TARGET_QUERY_PACKAGE_LIMIT)
|
||||
@@ -2219,6 +2221,12 @@ public class ChooserActivity extends ResolverActivity implements
|
||||
return appPredictionSession;
|
||||
}
|
||||
|
||||
private void populateTextContent(Bundle extras) {
|
||||
final Intent intent = getTargetIntent();
|
||||
String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
|
||||
extras.putString(SHARED_TEXT_KEY, sharedText);
|
||||
}
|
||||
|
||||
/**
|
||||
* This will return an app predictor if it is enabled for direct share sorting
|
||||
* and if one exists. Otherwise, it returns null.
|
||||
|
||||
Reference in New Issue
Block a user