Merge "Ensure toggle calls setChecked() since apps may have relied on this" (6f4fd85a) · Commits · e / os / android_frameworks_base

core/java/android/widget/Switch.java

+17 −14

Original line number	Diff line number	Diff line
		@@ -659,29 +659,28 @@ public class Switch extends CompoundButton {
		*/
		private void stopDrag(MotionEvent ev) {
		mTouchMode = TOUCH_MODE_IDLE;
		// Up and not canceled, also checks the switch has not been disabled during the drag
		boolean commitChange = ev.getAction() == MotionEvent.ACTION_UP && isEnabled();

		cancelSuperTouch(ev);

		// Commit the change if the event is up and not canceled and the switch
		// has not been disabled during the drag.
		final boolean commitChange = ev.getAction() == MotionEvent.ACTION_UP && isEnabled();
		final boolean newState;
		if (commitChange) {
		boolean newState;
		mVelocityTracker.computeCurrentVelocity(1000);
		float xvel = mVelocityTracker.getXVelocity();
		final float xvel = mVelocityTracker.getXVelocity();
		if (Math.abs(xvel) > mMinFlingVelocity) {
		newState = isLayoutRtl() ? (xvel < 0) : (xvel > 0);
		} else {
		newState = getTargetCheckedState();
		}
		animateThumbToCheckedState(newState);
		} else {
		animateThumbToCheckedState(isChecked());
		newState = isChecked();
		}

		setChecked(newState);
		cancelSuperTouch(ev);
		}

		private void animateThumbToCheckedState(boolean newCheckedState) {
		super.setChecked(newCheckedState);

		final float targetPosition = newCheckedState ? 1 : 0;
		mPositionAnimator = ObjectAnimator.ofFloat(this, THUMB_POS, targetPosition);
		mPositionAnimator.setDuration(THUMB_ANIMATION_DURATION);
		@@ -711,17 +710,21 @@ public class Switch extends CompoundButton {

		@Override
		public void toggle() {
		animateThumbToCheckedState(!isChecked());
		setChecked(!isChecked());
		}

		@Override
		public void setChecked(boolean checked) {
		super.setChecked(checked);

		if (isAttachedToWindow() && isLaidOut()) {
		animateThumbToCheckedState(checked);
		} else {
		// Immediately move the thumb to the new position.
		cancelPositionAnimator();
		setThumbPosition(checked ? 1 : 0);
		}
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {