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

Commit 1454fe95 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute... 

am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev

* commit '56fbc5751bd2da6227c03372f3d90ab4c7333f22':
  Always apply ImageView's tint attribute using SRC_ATOP by default
parents e45ed5e8 c6d995dd

core/java/android/widget/ImageView.java

+4 −5
Original line number Diff line number Diff line
@@ -173,12 +173,11 @@ public class ImageView extends View { 
            mDrawableTintList = a.getColorStateList(R.styleable.ImageView_tint);

            mHasDrawableTint = true;



            // Prior to L, the tint mode was always SRC_ATOP.

            if (mContext.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.L) {

            // Prior to L, this attribute would always set a color filter with

            // blending mode SRC_ATOP. Preserve that default behavior.

            mDrawableTintMode = PorterDuff.Mode.SRC_ATOP;

            mHasDrawableTintMode = true;

        }

        }



        if (a.hasValue(R.styleable.ImageView_tintMode)) {

            mDrawableTintMode = Drawable.parseTintMode(a.getInt(

core/res/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -3446,7 +3446,7 @@ 
        <!-- 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. -->

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

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

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

             bottom edge. -->