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

Commit 123db917 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Better docs for ImageView legacy tint" into nyc-mr1-dev

parents 8c5dce56 2b4e14cf

core/java/android/widget/ImageView.java

+7 −0
Original line number Diff line number Diff line
@@ -545,6 +545,13 @@ public class ImageView extends View { 
     * Subsequent calls to {@link #setImageDrawable(Drawable)} will automatically

     * mutate the drawable and apply the specified tint and tint mode using

     * {@link Drawable#setTintList(ColorStateList)}.

     * <p>

     * <em>Note:</em> The default tint mode used by this setter is NOT

     * consistent with the default tint mode used by the

     * {@link android.R.styleable#ImageView_tint android:tint}

     * attribute. If the {@code android:tint} attribute is specified, the

     * default tint mode will be set to {@link PorterDuff.Mode#SRC_ATOP} to

     * ensure consistency with earlier versions of the platform.

     *

     * @param tint the tint to apply, may be {@code null} to clear tint

     *

core/res/res/values/attrs.xml

+4 −1
Original line number Diff line number Diff line
@@ -3790,7 +3790,10 @@ i 
        <!-- An optional argument to supply a maximum height for this view.

             See {see android.widget.ImageView#setMaxHeight} for details. -->

        <attr name="maxHeight" format="dimension" />

        <!-- Set a tinting color for the image. By default, the tint will blend using SRC_ATOP mode. -->

        <!-- The tinting color for the image. By default, the tint will blend using SRC_ATOP mode.

             Please note that for compatibility reasons, this is NOT consistent with the default

             SRC_IN tint mode used by {@link android.widget.ImageView#setImageTintList} and by

             similar tint attributes on other views. -->

        <attr name="tint" format="color" />

        <!-- If true, the image view will be baseline aligned with based on its

             bottom edge. -->