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

Commit e3eb8ec0 authored by Alan Viverette's avatar Alan Viverette
Browse files

Allow a null tint in TouchFeedbackDrawable 

This ensures we won't crash if a Quantum drawable is inflated in a
Holo theme, but it won't look correct, so don't do that.

BUG: 13677025
Change-Id: I30cbff36bf3746543240d4c96cc57776874566d8
parent 9ad8a533

graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java

+7 −10
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import org.xmlpull.v1.XmlPullParser; 
import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;

import java.util.ArrayList;



/**

 * Documentation pending.
@@ -98,7 +97,7 @@ public class TouchFeedbackDrawable extends LayerDrawable { 
    protected boolean onStateChange(int[] stateSet) {

        super.onStateChange(stateSet);



        if (mRipplePaint != null) {

        if (mRipplePaint != null && mState.mTint != null) {

            final ColorStateList stateList = mState.mTint;

            final int newColor = stateList.getColorForState(stateSet, 0);

            final int oldColor = mRipplePaint.getColor();
@@ -122,7 +121,7 @@ public class TouchFeedbackDrawable extends LayerDrawable { 


    @Override

    public boolean isStateful() {

        return super.isStateful() || mState.mTint.isStateful();

        return super.isStateful() || mState.mTint != null && mState.mTint.isStateful();

    }



    @Override
@@ -150,10 +149,6 @@ public class TouchFeedbackDrawable extends LayerDrawable { 


        if (themeAttrs == null || themeAttrs[R.styleable.TouchFeedbackDrawable_tint] == 0) {

            mState.mTint = a.getColorStateList(R.styleable.TouchFeedbackDrawable_tint);



            if (mState.mTint == null) {

                throw new RuntimeException("<touch-feedback> tag requires a 'tint' attribute");

            }

        }



        if (themeAttrs == null || themeAttrs[R.styleable.TouchFeedbackDrawable_tintMode] == 0) {
@@ -401,9 +396,11 @@ public class TouchFeedbackDrawable extends LayerDrawable { 
            mRipplePaint = new Paint();

            mRipplePaint.setAntiAlias(true);



            if (mState.mTint != null) {

                final int color = mState.mTint.getColorForState(getState(), Color.TRANSPARENT);

                mRipplePaint.setColor(color);

            }

        }

        return mRipplePaint;

    }