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

Commit a3520556 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Fix broken @see/@link references controls" into main

parents c41f52c3 ab71cfe4

core/java/android/service/controls/Control.java

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import java.lang.annotation.RetentionPolicy; 
 * and zone. Some of these values are defined by the user and/or the {@link ControlsProviderService}

 * and will be used to display the control as well as group them for management.

 * <p>

 * Each object will have an associated {@link DeviceTypes.DeviceType}. This will determine the icons and colors

 * Each object will have an associated {@link DeviceTypes}. This will determine the icons and colors

 * used to display it.

 * <p>

 * An {@link Intent} linking to the provider Activity that expands on this {@link Control} and
@@ -420,7 +420,7 @@ public final class Control implements Parcelable { 
     * This fixes the values relating to state of the {@link Control} as required by

     * {@link ControlsProviderService#createPublisherForAllAvailable}:

     * <ul>

     *     <li> Status: {@link Status#STATUS_UNKNOWN}

     *     <li> Status: {@link #STATUS_UNKNOWN}

     *     <li> Control template: {@link ControlTemplate#getNoTemplateObject}

     *     <li> Status text: {@code ""}

     *     <li> Auth Required: {@code true}
@@ -620,7 +620,7 @@ public final class Control implements Parcelable { 
     *     <li> Device type: {@link DeviceTypes#TYPE_UNKNOWN}

     *     <li> Title: {@code ""}

     *     <li> Subtitle: {@code ""}

     *     <li> Status: {@link Status#STATUS_UNKNOWN}

     *     <li> Status: {@link #STATUS_UNKNOWN}

     *     <li> Control template: {@link ControlTemplate#getNoTemplateObject}

     *     <li> Status text: {@code ""}

     *     <li> Auth Required: {@code true}

core/java/android/service/controls/ControlsProviderService.java

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public abstract class ControlsProviderService extends Service { 
     * The user has interacted with a Control. The action is dictated by the type of

     * {@link ControlAction} that was sent. A response can be sent via

     * {@link Consumer#accept}, with the Integer argument being one of the provided

     * {@link ControlAction.ResponseResult}. The Integer should indicate whether the action

     * {@link ControlAction} response results. The Integer should indicate whether the action

     * was received successfully, or if additional prompts should be presented to

     * the user. Any visual control updates should be sent via the Publisher.

core/java/android/service/controls/actions/ControlAction.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public abstract class ControlAction { 
    public static final @ResponseResult int RESPONSE_CHALLENGE_PASSPHRASE = 5;



    /**

     * The {@link ActionType} associated with this class.

     * The action type associated with this class.

     */

    public abstract @ActionType int getActionType();

core/java/android/service/controls/templates/ControlTemplate.java

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public abstract class ControlTemplate { 
    }



    /**

     * The {@link TemplateType} associated with this class.

     * The template type associated with this class.

     */

    public abstract @TemplateType int getTemplateType();