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

Commit 0ab3e1df authored Oct 29, 2014 by Alan Viverette Committed by Android Git Automerger Oct 29, 2014

am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev

* commit '4e7c562c':
  Update drawable state after updating tint list

parents 39f35336 4e7c562c

core/java/android/view/View.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -16302,6 +16302,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (tintInfo.mHasTintMode) {
		mBackground.setTintMode(tintInfo.mTintMode);
		}

		// The drawable (or one of its children) may not have been
		// stateful before applying the tint, so let's try again.
		if (mBackground.isStateful()) {
		mBackground.setState(getDrawableState());
		}
		}
		}
		}

core/java/android/widget/AbsSeekBar.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,12 @@ public abstract class AbsSeekBar extends ProgressBar {
		if (mHasThumbTintMode) {
		mThumb.setTintMode(mThumbTintMode);
		}

		// The drawable (or one of its children) may not have been
		// stateful before applying the tint, so let's try again.
		if (mThumb.isStateful()) {
		mThumb.setState(getDrawableState());
		}
		}
		}

core/java/android/widget/CheckedTextView.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,12 @@ public class CheckedTextView extends TextView implements Checkable {
		if (mHasCheckMarkTintMode) {
		mCheckMarkDrawable.setTintMode(mCheckMarkTintMode);
		}

		// The drawable (or one of its children) may not have been
		// stateful before applying the tint, so let's try again.
		if (mCheckMarkDrawable.isStateful()) {
		mCheckMarkDrawable.setState(getDrawableState());
		}
		}
		}

core/java/android/widget/CompoundButton.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -315,6 +315,12 @@ public abstract class CompoundButton extends Button implements Checkable {
		if (mHasButtonTintMode) {
		mButtonDrawable.setTintMode(mButtonTintMode);
		}

		// The drawable (or one of its children) may not have been
		// stateful before applying the tint, so let's try again.
		if (mButtonDrawable.isStateful()) {
		mButtonDrawable.setState(getDrawableState());
		}
		}
		}

core/java/android/widget/FrameLayout.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -384,6 +384,12 @@ public class FrameLayout extends ViewGroup {
		if (mHasForegroundTintMode) {
		mForeground.setTintMode(mForegroundTintMode);
		}

		// The drawable (or one of its children) may not have been
		// stateful before applying the tint, so let's try again.
		if (mForeground.isStateful()) {
		mForeground.setState(getDrawableState());
		}
		}
		}