diff --git a/lib/java/com/google/android/material/appbar/res/values/attrs.xml b/lib/java/com/google/android/material/appbar/res/values/attrs.xml index 849d53e02..0bdf75ff6 100644 --- a/lib/java/com/google/android/material/appbar/res/values/attrs.xml +++ b/lib/java/com/google/android/material/appbar/res/values/attrs.xml @@ -54,7 +54,7 @@ `RecyclerView`, etc.). Default is false. --> @@ -64,9 +64,9 @@ - + - + diff --git a/lib/java/com/google/android/material/bottomsheet/BottomSheetDialog.java b/lib/java/com/google/android/material/bottomsheet/BottomSheetDialog.java index 8e2fe4fae..d68eab5e8 100644 --- a/lib/java/com/google/android/material/bottomsheet/BottomSheetDialog.java +++ b/lib/java/com/google/android/material/bottomsheet/BottomSheetDialog.java @@ -55,10 +55,9 @@ import com.google.android.material.shape.MaterialShapeDrawable; * Base class for {@link android.app.Dialog}s styled as a bottom sheet. * *

Edge to edge window flags are automatically applied if the {@link - * android.R.attr#navigationBarColor} is transparent or translucent and {@link - * R.attr#enableEdgeToEdge} is true. These can be set in the theme that is passed to the - * constructor, or will be taken from the theme of the context (ie. your application or activity - * theme). + * android.R.attr#navigationBarColor} is transparent or translucent and {@code enableEdgeToEdge} is + * true. These can be set in the theme that is passed to the constructor, or will be taken from the + * theme of the context (ie. your application or activity theme). * *

In edge to edge mode, padding will be added automatically to the top when sliding under the * status bar. Padding can be applied automatically to the left, right, or bottom if any of diff --git a/lib/java/com/google/android/material/button/MaterialButton.java b/lib/java/com/google/android/material/button/MaterialButton.java index 474857639..4786c0081 100644 --- a/lib/java/com/google/android/material/button/MaterialButton.java +++ b/lib/java/com/google/android/material/button/MaterialButton.java @@ -83,9 +83,9 @@ import java.util.LinkedHashSet; * tint color and {@code ?attr/colorOnPrimary} for the text color. For unfilled buttons, this class * uses {@code ?attr/colorPrimary} for the text color and transparent for the background tint. * - *

Add icons to the start, center, or end of this button using the {@link R.attr#icon app:icon}, - * {@link R.attr#iconPadding app:iconPadding}, {@link R.attr#iconTint app:iconTint}, {@link - * R.attr#iconTintMode app:iconTintMode} and {@link R.attr#iconGravity app:iconGravity} attributes. + *

Add icons to the start, center, or end of this button using the {@code app:icon}, {@code + * app:iconPadding}, {@code app:iconTint}, {@code app:iconTintMode} and {@code app:iconGravity} + * attributes. * *

If a start-aligned icon is added to this button, please use a style like one of the ".Icon" * styles specified in the default MaterialButton styles. The ".Icon" styles adjust padding slightly @@ -93,21 +93,18 @@ import java.util.LinkedHashSet; * button. If your icon is end-aligned, you cannot use a ".Icon" style and must instead manually * adjust your padding such that the visual adjustment is mirrored. * - *

Specify background tint using the {@link R.attr#backgroundTint app:backgroundTint} and {@link - * R.attr#backgroundTintMode app:backgroundTintMode} attributes, which accepts either a color or a - * color state list. + *

Specify background tint using the {@code app:backgroundTint} and {@code + * app:backgroundTintMode} attributes, which accepts either a color or a color state list. * - *

Ripple color / press state color can be specified using the {@link R.attr#rippleColor - * app:rippleColor} attribute. Ripple opacity will be determined by the Android framework when - * available. Otherwise, this color will be overlaid on the button at a 50% opacity when button is - * pressed. + *

Ripple color / press state color can be specified using the {@code app:rippleColor} attribute. + * Ripple opacity will be determined by the Android framework when available. Otherwise, this color + * will be overlaid on the button at a 50% opacity when button is pressed. * - *

Set the stroke color using the {@link R.attr#strokeColor app:strokeColor} attribute, which - * accepts either a color or a color state list. Stroke width can be set using the {@link - * R.attr#strokeWidth app:strokeWidth} attribute. + *

Set the stroke color using the {@code app:strokeColor} attribute, which accepts either a color + * or a color state list. Stroke width can be set using the {@code app:strokeWidth} attribute. * - *

Specify the radius of all four corners of the button using the {@link R.attr#cornerRadius - * app:cornerRadius} attribute. + *

Specify the radius of all four corners of the button using the {@code app:cornerRadius} + * attribute. */ public class MaterialButton extends AppCompatButton implements Checkable, Shapeable { diff --git a/lib/java/com/google/android/material/button/MaterialButtonToggleGroup.java b/lib/java/com/google/android/material/button/MaterialButtonToggleGroup.java index 4aaf952b9..1ead51d8b 100644 --- a/lib/java/com/google/android/material/button/MaterialButtonToggleGroup.java +++ b/lib/java/com/google/android/material/button/MaterialButtonToggleGroup.java @@ -96,13 +96,13 @@ import java.util.TreeMap; * methods. * *

Note: Styling must applied to each child button individually. It is recommended to use the - * {@link R.attr#materialButtonOutlinedStyle} attribute for all child buttons. {@link - * R.attr#materialButtonOutlinedStyle} will most closely match the Material Design guidelines for - * this component, and supports the checked state for child buttons. + * {@code materialButtonOutlinedStyle} attribute for all child buttons. {@code + * materialButtonOutlinedStyle} will most closely match the Material Design guidelines for this + * component, and supports the checked state for child buttons. * *

Any {@link MaterialButton}s added to this view group are automatically marked as {@code * checkable}, and by default multiple buttons within the same group can be checked. To enforce that - * only one button can be checked at a time, set the {@link R.attr#singleSelection + * only one button can be checked at a time, set the {@code * app:singleSelection} attribute to {@code true} on the MaterialButtonToggleGroup or call {@link * #setSingleSelection(boolean) setSingleSelection(true)}. * diff --git a/lib/java/com/google/android/material/button/res/values/attrs.xml b/lib/java/com/google/android/material/button/res/values/attrs.xml index 2a64901cf..5f4cecf1b 100644 --- a/lib/java/com/google/android/material/button/res/values/attrs.xml +++ b/lib/java/com/google/android/material/button/res/values/attrs.xml @@ -52,17 +52,17 @@ + {@code iconPadding} from the text. --> + {@code iconPadding} from the text. --> + {@code iconPadding} from the text. --> diff --git a/lib/java/com/google/android/material/card/MaterialCardView.java b/lib/java/com/google/android/material/card/MaterialCardView.java index 36759a028..ada421427 100644 --- a/lib/java/com/google/android/material/card/MaterialCardView.java +++ b/lib/java/com/google/android/material/card/MaterialCardView.java @@ -60,8 +60,8 @@ import com.google.android.material.shape.Shapeable; * stroked border, regardless of the {@code strokeWidth} value. * *

Cards implement {@link Checkable}, a default way to switch to {@code android:checked_state} is - * not provided. Clients have to call {@link #setChecked(boolean)}. This shows the {@link - * R.attr#checkedIcon app:checkedIcon} and changes the overlay color. + * not provided. Clients have to call {@link #setChecked(boolean)}. This shows the {@code + * app:checkedIcon} and changes the overlay color. * *

Cards also have a custom state meant to be used when a card is draggable {@code * app:dragged_state}. It's used by calling {@link #setDragged(boolean)}. This changes the overlay diff --git a/lib/java/com/google/android/material/chip/Chip.java b/lib/java/com/google/android/material/chip/Chip.java index b6bd0faf6..c6182cc24 100644 --- a/lib/java/com/google/android/material/chip/Chip.java +++ b/lib/java/com/google/android/material/chip/Chip.java @@ -93,7 +93,7 @@ import java.util.List; * accessibility navigation. The main chip and close icon are considered to be separate logical * sub-views, and contain their own navigation behavior and state. * - *

All attributes from {@link R.styleable#Chip} are supported. Do not use the {@code + *

All attributes from {@code R.styleable.Chip} are supported. Do not use the {@code * android:background} attribute. It will be ignored because Chip manages its own background * Drawable. Also do not use the {@code android:drawableStart} and {@code android:drawableEnd} * attributes. They will be ignored because Chip manages its own start ({@code app:chipIcon}) and @@ -103,13 +103,12 @@ import java.util.List; *

  • {@link android.R.attr#checkable android:checkable} - If true, the chip can be toggled. If * false, the chip acts like a button. *
  • {@link android.R.attr#text android:text} - Sets the text of the chip. - *
  • {@link R.attr#chipIcon app:chipIcon} and {@link R.attr#chipIconEnabled app:chipIconEnabled} - * - Sets the icon of the chip. Usually on the left. - *
  • {@link R.attr#checkedIcon app:checkedIcon} and {@link R.attr#checkedIconEnabled - * app:checkedIconEnabled} - Sets a custom icon to use when checked. Usually on the left. - *
  • {@link R.attr#closeIcon app:closeIcon} and {@link R.attr#closeIconEnabled - * app:closeIconEnabled} - Sets a custom icon that the user can click to close. Usually on the - * right. + *
  • {@code app:chipIcon} and {@code app:chipIconEnabled} - Sets the icon of the chip. Usually + * on the left. + *
  • {@code app:checkedIcon} and {@code app:checkedIconEnabled} - Sets a custom icon to use when + * checked. Usually on the left. + *
  • {@code app:closeIcon} and {@code app:closeIconEnabled} - Sets a custom icon that the user + * can click to close. Usually on the right. * * *

    You can register a listener on the main chip with {@link #setOnClickListener(OnClickListener)} diff --git a/lib/java/com/google/android/material/chip/ChipDrawable.java b/lib/java/com/google/android/material/chip/ChipDrawable.java index 776f989fa..c8338a07c 100644 --- a/lib/java/com/google/android/material/chip/ChipDrawable.java +++ b/lib/java/com/google/android/material/chip/ChipDrawable.java @@ -102,12 +102,12 @@ import java.util.Arrays; *

  • {@link android.R.attr#checkable android:checkable} - If true, the chip can be toggled. If * false, the chip acts like a button. *
  • {@link android.R.attr#text android:text} - Sets the text of the chip. - *
  • {@link R.attr#chipIcon app:chipIcon} - Sets the icon of the chip, or use @null to display + *
  • {@code app:chipIcon} - Sets the icon of the chip, or use @null to display no icon. Usually + * on the left. + *
  • {@code app:checkedIcon} - Sets a custom icon to use when checked, or use @null to display * no icon. Usually on the left. - *
  • {@link R.attr#checkedIcon app:checkedIcon} - Sets a custom icon to use when checked, or - * use @null to display no icon. Usually on the left. - *
  • {@link R.attr#closeIcon app:closeIcon} - Sets a custom icon that the user can click to - * close, or use @null to display no icon. Usually on the right. + *
  • {@code app:closeIcon} - Sets a custom icon that the user can click to close, or use @null + * to display no icon. Usually on the right. *
  • {@link android.R.attr#ellipsize} - Does not support {@link * android.text.TextUtils.TruncateAt#MARQUEE} because chip text should not scroll. * diff --git a/lib/java/com/google/android/material/chip/ChipGroup.java b/lib/java/com/google/android/material/chip/ChipGroup.java index 4528a4b07..abc244073 100644 --- a/lib/java/com/google/android/material/chip/ChipGroup.java +++ b/lib/java/com/google/android/material/chip/ChipGroup.java @@ -44,14 +44,14 @@ import java.util.List; /** * A ChipGroup is used to hold multiple {@link Chip}s. By default, the chips are reflowed across - * multiple lines. Set the {@link R.attr#singleLine app:singleLine} attribute to constrain the chips - * to a single horizontal line. If you do so, you'll usually want to wrap this ChipGroup in a {@link + * multiple lines. Set the {@code app:singleLine} attribute to constrain the chips to a single + * horizontal line. If you do so, you'll usually want to wrap this ChipGroup in a {@link * android.widget.HorizontalScrollView}. * - *

    ChipGroup also supports a multiple-exclusion scope for a set of chips. When you set the {@link - * R.attr#singleSelection app:singleSelection} attribute, checking one chip that belongs to a chip - * group unchecks any previously checked chip within the same group. The behavior mirrors that of - * {@link android.widget.RadioGroup}. + *

    ChipGroup also supports a multiple-exclusion scope for a set of chips. When you set the {@code + * app:singleSelection} attribute, checking one chip that belongs to a chip group unchecks any + * previously checked chip within the same group. The behavior mirrors that of {@link + * android.widget.RadioGroup}. */ public class ChipGroup extends FlowLayout { diff --git a/lib/java/com/google/android/material/color/DynamicColors.java b/lib/java/com/google/android/material/color/DynamicColors.java index 2b4df4244..58ae64218 100644 --- a/lib/java/com/google/android/material/color/DynamicColors.java +++ b/lib/java/com/google/android/material/color/DynamicColors.java @@ -51,12 +51,11 @@ public class DynamicColors { /** * Applies dynamic colors to all activities with the theme overlay designated by the theme - * attribute {@link R.attr.dynamicColorThemeOverlay} by registering a - * {@link ActivityLifecycleCallbacks} to your application. + * attribute {@code dynamicColorThemeOverlay} by registering a {@link ActivityLifecycleCallbacks} + * to your application. * * @see #applyToActivitiesIfAvailable(Application, int, Precondition) for more detailed info and - * examples. - * + * examples. * @param application The target application. */ public static void applyToActivitiesIfAvailable(@NonNull Application application) { @@ -80,12 +79,11 @@ public class DynamicColors { /** * Applies dynamic colors to all activities with the theme overlay designated by the theme - * attribute {@link R.attr.dynamicColorThemeOverlay} according to the given precondition by - * registering a {@link ActivityLifecycleCallbacks} to your application. + * attribute {@code dynamicColorThemeOverlay} according to the given precondition by registering a + * {@link ActivityLifecycleCallbacks} to your application. * * @see #applyToActivitiesIfAvailable(Application, int, Precondition) for more detailed info and - * examples. - * + * examples. * @param application The target application. * @param precondition The precondition to decide if dynamic colors should be applied. */ @@ -126,7 +124,7 @@ public class DynamicColors { /** * Applies dynamic colors to the given activity with the theme overlay designated by the theme - * attribute {@link R.attr.dynamicColorThemeOverlay}. + * attribute {@code dynamicColorThemeOverlay}. * * @param activity The target activity. */ @@ -146,7 +144,7 @@ public class DynamicColors { /** * Applies dynamic colors to the given activity with the theme overlay designated by the theme - * attribute {@link R.attr.dynamicColorThemeOverlay} according to the given precondition. + * attribute {@code dynamicColorThemeOverlay} according to the given precondition. * * @param activity The target activity. * @param precondition The precondition to decide if dynamic colors should be applied. @@ -170,11 +168,11 @@ public class DynamicColors { } /** - * Wraps the given context with the theme overlay designated by the theme attribute - * {@link R.attr.dynamicColorThemeOverlay}. The returned context can be used to create - * views with dynamic color support. + * Wraps the given context with the theme overlay designated by the theme attribute {@code + * dynamicColorThemeOverlay}. The returned context can be used to create views with dynamic color + * support. * - * If dynamic color support or the dynamic color theme overlay is not available, the original + *

    If dynamic color support or the dynamic color theme overlay is not available, the original * context will be returned. * * @param originalContext The original context. diff --git a/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java b/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java index 866203c20..92d88dc61 100644 --- a/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java +++ b/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java @@ -36,7 +36,7 @@ import com.google.android.material.shape.MaterialShapeDrawable; import com.google.android.material.shape.ShapeAppearanceModel; /** - * Loads and applies {@link R.styleable#MaterialCalendarDay} attributes to {@link TextView} + * Loads and applies {@code R.styleable.MaterialCalendarDay} attributes to {@link TextView} * instances. */ final class CalendarItemStyle { @@ -131,7 +131,7 @@ final class CalendarItemStyle { backgroundColor, textColor, strokeColor, strokeWidth, itemShape, insets); } - /** Applies the {@link R.styleable#MaterialCalendarDay} style to the provided {@code item} */ + /** Applies the {@code R.styleable.MaterialCalendarDay} style to the provided {@code item} */ void styleItem(@NonNull TextView item) { MaterialShapeDrawable backgroundDrawable = new MaterialShapeDrawable(); MaterialShapeDrawable shapeMask = new MaterialShapeDrawable(); diff --git a/lib/java/com/google/android/material/datepicker/CalendarStyle.java b/lib/java/com/google/android/material/datepicker/CalendarStyle.java index c5e84fea8..0299f606f 100644 --- a/lib/java/com/google/android/material/datepicker/CalendarStyle.java +++ b/lib/java/com/google/android/material/datepicker/CalendarStyle.java @@ -26,40 +26,40 @@ import com.google.android.material.resources.MaterialAttributes; import com.google.android.material.resources.MaterialResources; /** - * Data class for loaded {@link R.styleable#MaterialCalendar} and {@link - * R.styleable#MaterialCalendarItem} attributes. + * Data class for loaded {@code R.styleable.MaterialCalendar} and {@code + * R.styleable.MaterialCalendarItem} attributes. */ final class CalendarStyle { /** - * The {@link R.styleable#MaterialCalendarItem} style for days with no unique characteristics from - * {@link R.styleable#MaterialCalendar_dayStyle}. + * The {@code R.styleable.MaterialCalendarItem} style for days with no unique characteristics from + * {@code R.styleable.MaterialCalendar_dayStyle}. */ @NonNull final CalendarItemStyle day; /** - * The {@link R.styleable#MaterialCalendarItem} style for selected days from {@link - * R.styleable#MaterialCalendar_daySelectedStyle}. + * The {@code R.styleable.MaterialCalendarItem} style for selected days from {@code + * R.styleable.MaterialCalendar_daySelectedStyle}. */ @NonNull final CalendarItemStyle selectedDay; /** - * The {@link R.styleable#MaterialCalendarItem} style for today from {@link - * R.styleable#MaterialCalendar_dayTodayStyle}. + * The {@code R.styleable.MaterialCalendarItem} style for today from {@code + * R.styleable.MaterialCalendar_dayTodayStyle}. */ @NonNull final CalendarItemStyle todayDay; /** - * The {@link R.styleable#MaterialCalendarItem} style for years with no unique characteristics - * from {@link R.styleable#MaterialCalendar_yearStyle}. + * The {@code R.styleable.MaterialCalendarItem} style for years with no unique characteristics + * from {@code R.styleable#MaterialCalendar_yearStyle}. */ @NonNull final CalendarItemStyle year; /** - * The {@link R.styleable#MaterialCalendarItem} style for selected years from {@link - * R.styleable#MaterialCalendar_yearSelectedStyle}. + * The {@code R.styleable.MaterialCalendarItem} style for selected years from {@code + * R.styleable.MaterialCalendar_yearSelectedStyle}. */ @NonNull final CalendarItemStyle selectedYear; /** - * The {@link R.styleable#MaterialCalendarItem} style for today's year from {@link - * R.styleable#MaterialCalendar_yearTodayStyle}. + * The {@code R.styleable.MaterialCalendarItem} style for today's year from {@code + * R.styleable.MaterialCalendar_yearTodayStyle}. */ @NonNull final CalendarItemStyle todayYear; diff --git a/lib/java/com/google/android/material/datepicker/DateSelector.java b/lib/java/com/google/android/material/datepicker/DateSelector.java index 44a1ecd6f..c35e3fe29 100644 --- a/lib/java/com/google/android/material/datepicker/DateSelector.java +++ b/lib/java/com/google/android/material/datepicker/DateSelector.java @@ -72,7 +72,7 @@ public interface DateSelector extends Parcelable { /** * Returns a list of longs whose time value represents days that should be marked selected. * - *

    Uses {@link R.styleable#MaterialCalendar_daySelectedStyle} for styling. + *

    Uses {@code R.styleable.MaterialCalendar_daySelectedStyle} for styling. */ @NonNull Collection getSelectedDays(); @@ -80,7 +80,7 @@ public interface DateSelector extends Parcelable { /** * Returns a list of ranges whose time values represent ranges that should be filled. * - *

    Uses {@link R.styleable#MaterialCalendar_rangeFillColor} for styling. + *

    Uses {@code R.styleable.MaterialCalendar_rangeFillColor} for styling. */ @NonNull Collection> getSelectedRanges(); diff --git a/lib/java/com/google/android/material/internal/ThemeEnforcement.java b/lib/java/com/google/android/material/internal/ThemeEnforcement.java index 23f2b3900..6520a925a 100644 --- a/lib/java/com/google/android/material/internal/ThemeEnforcement.java +++ b/lib/java/com/google/android/material/internal/ThemeEnforcement.java @@ -52,13 +52,12 @@ public final class ThemeEnforcement { * Safely retrieve styled attribute information in this Context's theme, after checking whether * the theme is compatible with the component's given style. * - *

    Set a component's {@link R.attr#enforceMaterialTheme enforceMaterialTheme} attribute to - * true to ensure that the Context's theme inherits from {@link - * R.style#Theme_MaterialComponents Theme.MaterialComponents}. For example, you'll want to do this - * if the component uses a new attribute defined in Theme.MaterialComponents like - * {@link R.attr#colorSecondary colorSecondary}. + *

    Set a component's {@code enforceMaterialTheme} attribute to true to ensure that + * the Context's theme inherits from {@code Theme.MaterialComponents}. For example, you'll want to + * do this if the component uses a new attribute defined in + * Theme.MaterialComponents like {@code colorSecondary}. * - *

    If {@link R.attr#enforceTextAppearance} attribute is set to true and + *

    If the {@code enforceTextAppearance} attribute is set to true and * textAppearanceResIndices parameter is specified and has non-negative values, this will also * check that a valid TextAppearance is set on this component for the text appearance resources * passed in. @@ -87,18 +86,17 @@ public final class ThemeEnforcement { * androidx.appcompat.widget.TintTypedArray}, after checking whether the theme is compatible with * the component's given style. * - *

    Set a component's {@link R.attr#enforceMaterialTheme enforceMaterialTheme} attribute to - * true to ensure that the Context's theme inherits from {@link - * R.style#Theme_MaterialComponents Theme.MaterialComponents}. For example, you'll want to do this - * if the component uses a new attribute defined in Theme.MaterialComponents like - * {@link R.attr#colorSecondary colorSecondary}. + *

    Set a component's {@code enforceMaterialTheme} attribute to true to ensure that + * the Context's theme inherits from {@code Theme.MaterialComponents}. For example, you'll want to + * do this if the component uses a new attribute defined in Theme.MaterialComponents + * like {@code colorSecondary}. * *

    New components should prefer to use {@link #obtainStyledAttributes(Context, AttributeSet, - * int[], int, int, int...)}, and use - * {@link com.google.android.material.resources.MaterialResources} - * as a replacement for the functionality in {@link androidx.appcompat.widget.TintTypedArray}. + * int[], int, int, int...)}, and use {@link + * com.google.android.material.resources.MaterialResources} as a replacement for the functionality + * in {@link androidx.appcompat.widget.TintTypedArray}. * - *

    If {@link R.attr#enforceTextAppearance} attribute is set to true and + *

    If the {@code enforceTextAppearance} attribute is set to true and * textAppearanceResIndices parameter is specified and has non-negative values, this will also * check that a valid TextAppearance is set on this component for the text appearance resources * passed in. diff --git a/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java b/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java index e7257f52c..5f8b0f461 100644 --- a/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java +++ b/lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java @@ -52,7 +52,7 @@ import java.util.Arrays; * This class contains the common functions shared in different types of progress indicators. This * is an abstract class which is not meant for directly use. * - *

    With the default style {@link R.style#Widget_MaterialComponents_ProgressIndicator}, 4dp + *

    With the default style {@code Widget.MaterialComponents.ProgressIndicator}, 4dp * indicator/track thickness and no animation is used for visibility change. Without customization, * primaryColor will be used as the indicator color; the indicator color applying disabledAlpha will * be used as the track color. The following attributes can be used to customize the progress diff --git a/lib/java/com/google/android/material/progressindicator/BaseProgressIndicatorSpec.java b/lib/java/com/google/android/material/progressindicator/BaseProgressIndicatorSpec.java index 673004990..3cb22a059 100644 --- a/lib/java/com/google/android/material/progressindicator/BaseProgressIndicatorSpec.java +++ b/lib/java/com/google/android/material/progressindicator/BaseProgressIndicatorSpec.java @@ -38,7 +38,7 @@ import com.google.android.material.progressindicator.BaseProgressIndicator.ShowA /** * This class contains the parameters shared between linear type and circular type. The parameters - * reflect the attributes defined in {@link R.styleable#BaseProgressIndicator}. + * reflect the attributes defined in {@code R.styleable.BaseProgressIndicator}. */ public abstract class BaseProgressIndicatorSpec { /** The thickness of the track and indicator. */ diff --git a/lib/java/com/google/android/material/progressindicator/CircularProgressIndicator.java b/lib/java/com/google/android/material/progressindicator/CircularProgressIndicator.java index 6fdd45d14..bd83b3a2e 100644 --- a/lib/java/com/google/android/material/progressindicator/CircularProgressIndicator.java +++ b/lib/java/com/google/android/material/progressindicator/CircularProgressIndicator.java @@ -35,10 +35,10 @@ import java.lang.annotation.RetentionPolicy; /** * This class implements the circular type progress indicators. * - *

    With the default style {@link R.style#Widget_MaterialComponents_CircularProgressIndicator}, - * 4dp indicator/track thickness is used without animation for visibility change. Without - * customization, primaryColor will be used as the indicator color; the track is transparent. The - * following attributes can be used to customize the component's appearance: + *

    With the default style {@code Widget.MaterialComponents.CircularProgressIndicator}, 4dp + * indicator/track thickness is used without animation for visibility change. Without customization, + * primaryColor will be used as the indicator color; the track is transparent. The following + * attributes can be used to customize the component's appearance: * *

      *
    • {@code trackThickness}: the thickness of the indicator and track. diff --git a/lib/java/com/google/android/material/progressindicator/CircularProgressIndicatorSpec.java b/lib/java/com/google/android/material/progressindicator/CircularProgressIndicatorSpec.java index e7230b68c..117b14219 100644 --- a/lib/java/com/google/android/material/progressindicator/CircularProgressIndicatorSpec.java +++ b/lib/java/com/google/android/material/progressindicator/CircularProgressIndicatorSpec.java @@ -34,8 +34,8 @@ import com.google.android.material.progressindicator.CircularProgressIndicator.I /** * This class contains the parameters for drawing a circular type progress indicator. The parameters - * reflect the attributes defined in {@link R.styleable#BaseProgressIndicator} and {@link - * R.styleable#CircularProgressIndicator}. + * reflect the attributes defined in {@code R.styleable.BaseProgressIndicator} and {@code + * R.styleable.CircularProgressIndicator}. */ public final class CircularProgressIndicatorSpec extends BaseProgressIndicatorSpec { @@ -51,10 +51,10 @@ public final class CircularProgressIndicatorSpec extends BaseProgressIndicatorSp /** * Instantiates the spec for {@link CircularProgressIndicator}. * - *

      If attributes in {@link R.styleable#CircularProgressIndicator} are missing, the values in - * the default style {@link R.style#Widget_MaterialComponents_CircularProgressIndicator} will be - * loaded. If attributes in {@link R.styleable#BaseProgressIndicator} are missing, the values in - * the default style {@link R.style#Widget_MaterialComponents_ProgressIndicator} will be loaded. + *

      If attributes in {@code R.styleable.CircularProgressIndicator} are missing, the values in + * the default style {@code Widget.MaterialComponents.CircularProgressIndicator} will be loaded. + * If attributes in {@code R.styleable.BaseProgressIndicator} are missing, the values in the + * default style {@code Widget.MaterialComponents.ProgressIndicator} will be loaded. * * @param context Current themed context. * @param attrs Component's attributes set. diff --git a/lib/java/com/google/android/material/progressindicator/LinearProgressIndicator.java b/lib/java/com/google/android/material/progressindicator/LinearProgressIndicator.java index 15ed5f478..6b8780af7 100644 --- a/lib/java/com/google/android/material/progressindicator/LinearProgressIndicator.java +++ b/lib/java/com/google/android/material/progressindicator/LinearProgressIndicator.java @@ -34,7 +34,7 @@ import java.lang.annotation.RetentionPolicy; /** * This class implements the linear type progress indicators. * - *

      With the default style {@link R.style#Widget_MaterialComponents_LinearProgressIndicator}, 4dp + *

      With the default style {@code Widget.MaterialComponents.LinearProgressIndicator}, 4dp * indicator/track thickness is used without animation is used for visibility change. Without * customization, primaryColor will be used as the indicator color; the track is the (first) * indicator color applying the disabledAlpha. The following attributes can be used to customize the diff --git a/lib/java/com/google/android/material/progressindicator/LinearProgressIndicatorSpec.java b/lib/java/com/google/android/material/progressindicator/LinearProgressIndicatorSpec.java index 3628ff265..ec9a4f5f4 100644 --- a/lib/java/com/google/android/material/progressindicator/LinearProgressIndicatorSpec.java +++ b/lib/java/com/google/android/material/progressindicator/LinearProgressIndicatorSpec.java @@ -31,8 +31,8 @@ import com.google.android.material.progressindicator.LinearProgressIndicator.Ind /** * This class contains the parameters for drawing a linear type progress indicator. The parameters - * reflect the attributes defined in {@link R.styleable#BaseProgressIndicator} and {@link - * R.styleable#LinearProgressIndicator}. + * reflect the attributes defined in {@code R.styleable.BaseProgressIndicator} and {@code + * R.styleable.LinearProgressIndicator}. */ public final class LinearProgressIndicatorSpec extends BaseProgressIndicatorSpec { @@ -47,10 +47,10 @@ public final class LinearProgressIndicatorSpec extends BaseProgressIndicatorSpec /** * Instantiates the spec for {@link LinearProgressIndicator}. * - *

      If attributes in {@link R.styleable#LinearProgressIndicator} are missing, the values in the - * default style {@link R.style#Widget_MaterialComponents_LinearProgressIndicator} will be loaded. - * If attributes in {@link R.styleable#BaseProgressIndicator} are missing, the values in the - * default style {@link R.style#Widget_MaterialComponents_ProgressIndicator} will be loaded. + *

      If attributes in {@code R.styleable.LinearProgressIndicator} are missing, the values in the + * default style {@code Widget.MaterialComponents.LinearProgressIndicator} will be loaded. If + * attributes in {@code R.styleable.BaseProgressIndicator} are missing, the values in the default + * style {@code Widget.MaterialComponents.ProgressIndicator} will be loaded. * * @param context Current themed context. * @param attrs Component's attributes set. diff --git a/lib/javatests/com/google/android/material/theme/ThemeTest.java b/lib/javatests/com/google/android/material/theme/ThemeTest.java index efdd53f91..4fae7e953 100644 --- a/lib/javatests/com/google/android/material/theme/ThemeTest.java +++ b/lib/javatests/com/google/android/material/theme/ThemeTest.java @@ -88,8 +88,8 @@ public class ThemeTest { /** * These are color attribtues that all themes, including bridge themes, should have. * - *

      All Light themes should match {@link R.style#Theme_MaterialComponents_Light} and all Dark - * themes should match {@link R.style#Theme_MaterialComponents}. + *

      All Light themes should match {@code Theme.MaterialComponents.Light} and all Dark themes + * should match {@code Theme.MaterialComponents}. */ private static final ImmutableList MATERIAL_BRIDGE_COLOR_ATTRIBUTES = ImmutableList.of( @@ -108,8 +108,8 @@ public class ThemeTest { * These are color attributes that all full themes should have in addition to {@link * #MATERIAL_BRIDGE_COLOR_ATTRIBUTES}. * - *

      All Light full themes should match {@link R.style#Theme_MaterialComponents_Light} and all - * Dark themes should match {@link R.style#Theme_MaterialComponents}. + *

      All Light full themes should match {@code Theme.MaterialComponents.Light} and all Dark + * themes should match {@code Theme.MaterialComponents}. */ private static final ImmutableList MATERIAL_NON_BRIDGE_COLOR_ATTRIBUTES = ImmutableList.of( @@ -122,8 +122,8 @@ public class ThemeTest { /** * There are color attribtues that all theme overlays should have. * - *

      All Light theme overlays shold match {@link R.style#Theme_MaterialComponents_Light} and all - * Dark theme overlays should match {@link R.style#Theme_MaterialComponents}. + *

      All Light theme overlays shold match {@code Theme.MaterialComponents.Light} and all Dark + * theme overlays should match {@code Theme.MaterialComponents}. */ private static final ImmutableList MATERIAL_OVERLAY_COLOR_ATTRIBUTES = ImmutableList.of( @@ -137,8 +137,8 @@ public class ThemeTest { /** * These are all the color attributes that all full themes should have. * - *

      All Light full themes should match {@link R.style#Theme_MaterialComponents_Light} and all - * Dark full themes should match {@link R.style#Theme_MaterialComponents}. + *

      All Light full themes should match {@code Theme.MaterialComponents.Light} and all Dark full + * themes should match {@code Theme.MaterialComponents}. */ private static final ImmutableList MATERIAL_FULL_COLOR_ATTRIBUTES = ImmutableList.builder() @@ -214,8 +214,8 @@ public class ThemeTest { .build(); /** - * These are all the attributes where full themes should match {@link - * R.style#Theme_MaterialComponents} or {@link R.style#Theme_MaterialComponents_Light}. + * These are all the attributes where full themes should match {@code Theme.MaterialComponents} or + * {@code Theme.MaterialComponents.Light}. */ private static final ImmutableList MATERIAL_FULL_ATTRIBUTES = ImmutableList.builder() @@ -226,8 +226,8 @@ public class ThemeTest { /** * These are color attributes that all M3 themes should have. * - *

      All M3 Light themes should match {@link R.style#Theme_Material3_Light} and all M3 Dark - * themes should match {@link R.style#Theme_Material3_Dark}. + *

      All M3 Light themes should match {@code Theme.Material3.Light} and all M3 Dark themes should + * match {@code Theme.Material3.Dark}. */ private static final ImmutableList M3_ACCENT_COLOR_ATTRIBUTES = ImmutableList.of( @@ -252,8 +252,8 @@ public class ThemeTest { /** * These are color attributes that all themes and theme overlays should have. * - *

      All M3 Light themes should match {@link R.style#Theme_Material3_Light} and all M3 Dark - * themes should match {@link R.style#Theme_Material3_Dark}. + *

      All M3 Light themes should match {@code Theme.Material3.Light} and all M3 Dark themes should + * match {@code Theme.Material3.Dark}. */ private static final ImmutableList M3_ADDITIONAL_COLOR_ATTRIBUTES = ImmutableList.of( @@ -384,8 +384,8 @@ public class ThemeTest { R.attr.toolbarSurfaceStyle); /** - * These are all the attributes where full themes should match {@link - * R.style#Theme_Material3_Light} or {@link R.style#Theme_Material3_Dark}. + * These are all the attributes where full themes should match {@code Theme.Material3.Light} or + * {@code Theme_Material3_Dark}. */ private static final ImmutableList M3_FULL_ATTRIBUTES = ImmutableList.builder()