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

Commit a7d538f9 authored by Paul Duffin's avatar Paul Duffin
Browse files

Fully qualify @attr reference to android.R field 

Currently, Metalava has some special handling of '@attr ref R.<field>`
references to make sure that they are fully qualified, i.e.
`@attr ref android.R.<field>`. That special handling complicates
Metalava and is blocking some flagged API work so will be removed.
Before that can be done, the existing incorrect documentation needs to
be cleaned up.

This change cleans up those cases in this repo.

Bug: 371997321
Test: Run `m offline-sdk-docs` before and after to make sure that
      there are no differences.
Flag: DOCS_ONLY
Merged-In: Ie4386107205f97a90b970ceb98a0fe4889812ebf
Change-Id: Ie4386107205f97a90b970ceb98a0fe4889812ebf
parent 448c575e

core/java/android/view/inputmethod/InputMethodInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ public final class InputMethodInfo implements Parcelable { 
     * <p>e.g.<pre><code>startActivity(createStylusHandwritingSettingsActivityIntent());</code>

     * </pre></p>

     *

     * @attr ref R.styleable#InputMethod_stylusHandwritingSettingsActivity

     * @attr ref android.R.styleable#InputMethod_stylusHandwritingSettingsActivity

     * @see #getSettingsActivity()

     * @see #supportsStylusHandwriting()

     */
@@ -886,7 +886,7 @@ public final class InputMethodInfo implements Parcelable { 
     * the IME language settings activity.</p>

     * <p>e.g.<pre><code>startActivity(createImeLanguageSettingsActivityIntent());</code></pre></p>

     *

     * @attr ref R.styleable#InputMethod_languageSettingsActivity

     * @attr ref android.R.styleable#InputMethod_languageSettingsActivity

     */

    @FlaggedApi(android.view.inputmethod.Flags.FLAG_IME_SWITCHER_REVAMP)

    @Nullable

core/java/android/widget/ListView.java

+2 −2
Original line number Diff line number Diff line
@@ -3636,7 +3636,7 @@ public class ListView extends AbsListView { 
     * Returns the drawable that will be drawn between each item in the list.

     *

     * @return the current drawable drawn between list elements

     * @attr ref R.styleable#ListView_divider

     * @attr ref android.R.styleable#ListView_divider

     */

    @InspectableProperty

    @Nullable
@@ -3651,7 +3651,7 @@ public class ListView extends AbsListView { 
     * height, you should also call {@link #setDividerHeight(int)}.

     *

     * @param divider the drawable to use

     * @attr ref R.styleable#ListView_divider

     * @attr ref android.R.styleable#ListView_divider

     */

    public void setDivider(@Nullable Drawable divider) {

        if (divider != null) {

packages/SystemUI/src/com/android/systemui/util/AlphaTintDrawableWrapper.java

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ import java.io.IOException; 
 * This class should only be used in XML.

 *

 * @attr ref android.R.styleable#DrawableWrapper_drawable

 * @attr ref R.styleable#AlphaTintDrawableWrapper_tint

 * @attr ref R.styleable#AlphaTintDrawableWrapper_alpha

 * @attr ref android.R.styleable#AlphaTintDrawableWrapper_tint

 * @attr ref android.R.styleable#AlphaTintDrawableWrapper_alpha

 */

public class AlphaTintDrawableWrapper extends InsetDrawable {

    private ColorStateList mTint;