Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c05b150 authored by Song Hu's avatar Song Hu Committed by Automerger Merge Worker
Browse files

Merge "Pass shared text content from ChooserActivity to AppPredictionService"... 

Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c087 am: b9f9f81d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488



Change-Id: I94636ed5f92c8e1442c89b3d25b8760b3db6791a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84841c37 b9f9f81d

core/java/com/android/internal/app/ChooserActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -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";
@@ -2214,6 +2215,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)
@@ -2232,6 +2234,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.