diff options
| author | 2024-11-08 11:46:48 +0000 | |
|---|---|---|
| committer | 2024-11-08 11:46:48 +0000 | |
| commit | 3a306e3f80cb36a88dee1d67d1e68c85c3ca8c87 (patch) | |
| tree | 4c65beba3f2b2f6233fdafaf35b346de24ef69d1 | |
| parent | e4df69fdeccc30d5a066c0aa38113052b60e9e2e (diff) | |
| parent | 4bb467741b35a8ad346b49ba811897c5429d1e44 (diff) | |
Merge "Add an extra in AssistContent for providing contextual app functions data." into main
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/assist/AssistContent.java | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index c8fe24df5c8b..f03ef8c10d88 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -8880,6 +8880,7 @@ package android.app.assist { method public void setWebUri(android.net.Uri); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.app.assist.AssistContent> CREATOR; + field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String EXTRA_APP_FUNCTION_DATA = "android.app.assist.extra.APP_FUNCTION_DATA"; } public class AssistStructure implements android.os.Parcelable { diff --git a/core/java/android/app/assist/AssistContent.java b/core/java/android/app/assist/AssistContent.java index a48868906487..43a46ba7885d 100644 --- a/core/java/android/app/assist/AssistContent.java +++ b/core/java/android/app/assist/AssistContent.java @@ -1,5 +1,6 @@ package android.app.assist; +import android.annotation.FlaggedApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ClipData; import android.content.Intent; @@ -15,6 +16,20 @@ import android.os.Parcelable; * {@link android.app.Activity#onProvideAssistContent Activity.onProvideAssistContent}. */ public class AssistContent implements Parcelable { + /** + * Extra for a {@link Bundle} that provides contextual AppFunction's information about the + * content currently being viewed in the application. + * <p> + * This extra can be optionally supplied in the {@link AssistContent#getExtras()} bundle. + * <p> + * The schema of the {@link Bundle} in this extra is defined in the AppFunction SDK. + * + * @see android.app.appfunctions.AppFunctionManager + */ + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public static final String EXTRA_APP_FUNCTION_DATA = + "android.app.assist.extra.APP_FUNCTION_DATA"; + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private boolean mIsAppProvidedIntent = false; private boolean mIsAppProvidedWebUri = false; |