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

Commit fb3c505d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add two new SearcTargetEvent types to represent user action to... 

Merge "Merge "Add two new SearcTargetEvent types to represent user action to delete or dismiss a target." into udc-dev am: c928a86d am: b089441a"
parents d0ac9cb3 5f9eb2a4

core/api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -2363,6 +2363,8 @@ package android.app.search { 
    method @NonNull public String getTargetId();

    method @NonNull public String getTargetId();

    method @NonNull public java.util.List<java.lang.String> getTargetIds();

    method @NonNull public java.util.List<java.lang.String> getTargetIds();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field public static final int ACTION_DELETE = 9; // 0x9

    field public static final int ACTION_DISMISS = 10; // 0xa

    field public static final int ACTION_DRAGNDROP = 7; // 0x7

    field public static final int ACTION_DRAGNDROP = 7; // 0x7

    field public static final int ACTION_LAUNCH_KEYBOARD_FOCUS = 6; // 0x6

    field public static final int ACTION_LAUNCH_KEYBOARD_FOCUS = 6; // 0x6

    field public static final int ACTION_LAUNCH_TOUCH = 5; // 0x5

    field public static final int ACTION_LAUNCH_TOUCH = 5; // 0x5

core/java/android/app/search/SearchTargetEvent.java

+13 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,9 @@ public final class SearchTargetEvent implements Parcelable { 
            ACTION_LAUNCH_TOUCH,

            ACTION_LAUNCH_TOUCH,

            ACTION_LAUNCH_KEYBOARD_FOCUS,

            ACTION_LAUNCH_KEYBOARD_FOCUS,

            ACTION_DRAGNDROP,

            ACTION_DRAGNDROP,

            ACTION_SURFACE_INVISIBLE

            ACTION_SURFACE_INVISIBLE,

            ACTION_DELETE,

            ACTION_DISMISS

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface ActionType {}

    public @interface ActionType {}
@@ -114,6 +116,16 @@ public final class SearchTargetEvent implements Parcelable { 
     */

     */

    public static final int ACTION_SURFACE_INVISIBLE = 8;

    public static final int ACTION_SURFACE_INVISIBLE = 8;





     /**

     * Constant that defines user deleted a target.

     */

    public static final int ACTION_DELETE = 9;



    /**

     * Constant that defines user dismissed a target.

     */

    public static final int ACTION_DISMISS = 10;



    private SearchTargetEvent(@NonNull List<String> targetIds,

    private SearchTargetEvent(@NonNull List<String> targetIds,

            @Nullable String location,

            @Nullable String location,

            @ActionType int actionType,

            @ActionType int actionType,