Merge "Propagate TextView drawable state after resolving RTL drawables" (0cc6b5a4) · Commits · e / os / android_frameworks_base

core/java/android/util/StateSet.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,12 @@ public class StateSet {
		case R.attr.state_enabled:
		sb.append("E ");
		break;
		case R.attr.state_checked:
		sb.append("C ");
		break;
		case R.attr.state_activated:
		sb.append("A ");
		break;
		}
		}

core/java/android/widget/TextView.java

+38 −10

Original line number	Diff line number	Diff line
		@@ -394,7 +394,17 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		mOverride = false;
		}

		public void resolveWithLayoutDirection(int layoutDirection) {
		/**
		* Updates the list of displayed drawables to account for the current
		* layout direction.
		*
		* @param layoutDirection the current layout direction
		* @return {@code true} if the displayed drawables changed
		*/
		public boolean resolveWithLayoutDirection(int layoutDirection) {
		final Drawable previousLeft = mShowing[Drawables.LEFT];
		final Drawable previousRight = mShowing[Drawables.RIGHT];

		// First reset "left" and "right" drawables to their initial values
		mShowing[Drawables.LEFT] = mDrawableLeftInitial;
		mShowing[Drawables.RIGHT] = mDrawableRightInitial;
		@@ -442,16 +452,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		break;
		}
		}

		applyErrorDrawableIfNeeded(layoutDirection);
		updateDrawablesLayoutDirection(layoutDirection);
		}

		private void updateDrawablesLayoutDirection(int layoutDirection) {
		for (Drawable dr : mShowing) {
		if (dr != null) {
		dr.setLayoutDirection(layoutDirection);
		}
		}
		return mShowing[Drawables.LEFT] != previousLeft
		\|\| mShowing[Drawables.RIGHT] != previousRight;
		}

		public void setErrorDrawable(Drawable dr, TextView tv) {
		@@ -9846,7 +9851,30 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		// Resolve drawables
		if (mDrawables != null) {
		mDrawables.resolveWithLayoutDirection(layoutDirection);
		if (mDrawables.resolveWithLayoutDirection(layoutDirection)) {
		prepareDrawableForDisplay(mDrawables.mShowing[Drawables.LEFT]);
		prepareDrawableForDisplay(mDrawables.mShowing[Drawables.RIGHT]);
		applyCompoundDrawableTint();
		}
		}
		}

		/**
		* Prepares a drawable for display by propagating layout direction and
		* drawable state.
		*
		* @param dr the drawable to prepare
		*/
		private void prepareDrawableForDisplay(@Nullable Drawable dr) {
		if (dr == null) {
		return;
		}

		dr.setLayoutDirection(getLayoutDirection());

		if (dr.isStateful()) {
		dr.setState(getDrawableState());
		dr.jumpToCurrentState();
		}
		}