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

Commit 9b487b82 authored Oct 08, 2024 by Treehugger Robot Committed by Automerger Merge Worker Oct 08, 2024

Merge "Fully qualify @attr reference to android.R field" into main am: 153008c5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3296236

Change-Id: I47543aacb1964774f67a47986399a68a9c73532e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a8aa472b 153008c5

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;