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

Commit 7869f4c9 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "Fix breakages in update-api."

parents b222f6c5 0d9ada9f

core/java/android/printservice/PrintService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -192,7 +192,7 @@ public abstract class PrintService extends Service { 




    /**

    /**

     * If you declared an optional activity with advanced print options via the

     * If you declared an optional activity with advanced print options via the

     * {@link R.attr#advancedPrintOptionsActivity advancedPrintOptionsActivity}

     * {@link android.R.attr#advancedPrintOptionsActivity advancedPrintOptionsActivity}

     * attribute, this extra is used to pass in the currently constructed {@link

     * attribute, this extra is used to pass in the currently constructed {@link

     * PrintJobInfo} to your activity allowing you to modify it. After you are

     * PrintJobInfo} to your activity allowing you to modify it. After you are

     * done, you must return the modified {@link PrintJobInfo} via the same extra.

     * done, you must return the modified {@link PrintJobInfo} via the same extra.
@@ -224,7 +224,7 @@ public abstract class PrintService extends Service { 




    /**

    /**

     * If you declared an optional activity with advanced print options via the

     * If you declared an optional activity with advanced print options via the

     * {@link R.attr#advancedPrintOptionsActivity advancedPrintOptionsActivity}

     * {@link android.R.attr#advancedPrintOptionsActivity advancedPrintOptionsActivity}

     * attribute, this extra is used to pass in the currently selected printer's

     * attribute, this extra is used to pass in the currently selected printer's

     * {@link android.print.PrinterInfo} to your activity allowing you to inspect it.

     * {@link android.print.PrinterInfo} to your activity allowing you to inspect it.

     *

     *

core/res/res/values/attrs.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -5996,11 +5996,11 @@ 
             set when a view is enabled. -->

             set when a view is enabled. -->

        <attr name="state_enabled" format="boolean" />

        <attr name="state_enabled" format="boolean" />

        <!-- State identifier indicating that the object <var>may</var> display a check mark.

        <!-- State identifier indicating that the object <var>may</var> display a check mark.

             See {@link R.attr#state_checked} for the identifier that indicates whether it is

             See {@link android.R.attr#state_checked} for the identifier that indicates whether it is

             actually checked. -->

             actually checked. -->

        <attr name="state_checkable" format="boolean"/>

        <attr name="state_checkable" format="boolean"/>

        <!-- State identifier indicating that the object is currently checked.  See

        <!-- State identifier indicating that the object is currently checked.  See

             {@link R.attr#state_checkable} for an additional identifier that can indicate if

             {@link android.R.attr#state_checkable} for an additional identifier that can indicate if

             any object may ever display a check, regardless of whether state_checked is

             any object may ever display a check, regardless of whether state_checked is

             currently set. -->

             currently set. -->

        <attr name="state_checked" format="boolean"/>

        <attr name="state_checked" format="boolean"/>