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

Commit 875ca05e authored by Hui Wu's avatar Hui Wu Committed by Automerger Merge Worker
Browse files

Merge "CloudSearch API: adds two keys for app intents in ExtraInfo" into tm-dev am: 8fe47c1c 

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

Change-Id: I609557b2be1026a89dab15896310a6325402cf3d
parents 7a61c7a8 8fe47c1c

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,7 @@ package android.app.cloudsearch { 
    field public static final String EXTRAINFO_ACTION_BUTTON_IMAGE_PREREGISTERING = "android.app.cloudsearch.ACTION_BUTTON_IMAGE";

    field public static final String EXTRAINFO_ACTION_BUTTON_TEXT_PREREGISTERING = "android.app.cloudsearch.ACTION_BUTTON_TEXT";

    field public static final String EXTRAINFO_APP_BADGES = "android.app.cloudsearch.APP_BADGES";

    field public static final String EXTRAINFO_APP_CARD_ACTION = "android.app.cloudsearch.APP_CARD_ACTION";

    field public static final String EXTRAINFO_APP_CONTAINS_ADS_DISCLAIMER = "android.app.cloudsearch.APP_CONTAINS_ADS_DISCLAIMER";

    field public static final String EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER = "android.app.cloudsearch.APP_CONTAINS_IAP_DISCLAIMER";

    field public static final String EXTRAINFO_APP_DEVELOPER_NAME = "android.app.cloudsearch.APP_DEVELOPER_NAME";
@@ -1713,6 +1714,7 @@ package android.app.cloudsearch { 
    field public static final String EXTRAINFO_APP_REVIEW_COUNT = "android.app.cloudsearch.APP_REVIEW_COUNT";

    field public static final String EXTRAINFO_APP_SIZE_BYTES = "android.app.cloudsearch.APP_SIZE_BYTES";

    field public static final String EXTRAINFO_APP_STAR_RATING = "android.app.cloudsearch.APP_STAR_RATING";

    field public static final String EXTRAINFO_INSTALL_BUTTON_ACTION = "android.app.cloudsearch.INSTALL_BUTTON_ACTION";

    field public static final String EXTRAINFO_LONG_DESCRIPTION = "android.app.cloudsearch.LONG_DESCRIPTION";

    field public static final String EXTRAINFO_SCREENSHOTS = "android.app.cloudsearch.SCREENSHOTS";

    field public static final String EXTRAINFO_SHORT_DESCRIPTION = "android.app.cloudsearch.SHORT_DESCRIPTION";

core/java/android/app/cloudsearch/SearchResult.java

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ public final class SearchResult implements Parcelable { 
            EXTRAINFO_APP_BADGES,

            EXTRAINFO_ACTION_BUTTON_TEXT_PREREGISTERING,

            EXTRAINFO_ACTION_BUTTON_IMAGE_PREREGISTERING,

            EXTRAINFO_APP_CARD_ACTION,

            EXTRAINFO_INSTALL_BUTTON_ACTION,

            EXTRAINFO_WEB_URL,

            EXTRAINFO_WEB_ICON})

    public @interface SearchResultExtraInfoKey {}
@@ -119,6 +121,14 @@ public final class SearchResult implements Parcelable { 
    @SuppressLint("IntentName")

    public static final String EXTRAINFO_ACTION_BUTTON_IMAGE_PREREGISTERING =

            "android.app.cloudsearch.ACTION_BUTTON_IMAGE";

    /** Intent for tapping the app card, PendingIntent expected. */

    @SuppressLint("IntentName")

    public static final String EXTRAINFO_APP_CARD_ACTION =

            "android.app.cloudsearch.APP_CARD_ACTION";

    /** Intent for tapping the install button, PendingIntent expected. */

    @SuppressLint("IntentName")

    public static final String EXTRAINFO_INSTALL_BUTTON_ACTION =

            "android.app.cloudsearch.INSTALL_BUTTON_ACTION";

    /** Web content's URL, String value expected. */

    public static final String EXTRAINFO_WEB_URL = "android.app.cloudsearch.WEB_URL";

    /** Web content's domain icon, android.graphics.drawable.Icon expected. */