am e11794a2: Merge "Update switch, checkbox, radio button, button, and toggle... (de220369) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsSeekBar.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,16 @@ public abstract class AbsSeekBar extends ProgressBar {
		}
		}

		@Override
		public void invalidateDrawable(Drawable dr) {
		super.invalidateDrawable(dr);

		if (dr == mThumb) {
		// Handle changes to thumb width and height.
		requestLayout();
		}
		}

		@Override
		void onProgressRefresh(float scale, boolean fromUser) {
		super.onProgressRefresh(scale, fromUser);

core/java/android/widget/CheckedTextView.java

+33 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.graphics.Canvas;
		import android.graphics.drawable.Drawable;
		import android.util.AttributeSet;
		import android.view.Gravity;
		import android.view.RemotableViewMethod;
		import android.view.ViewDebug;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityNodeInfo;
		@@ -156,10 +157,36 @@ public class CheckedTextView extends TextView implements Checkable {
		mCheckMarkWidth = 0;
		}
		mCheckMarkDrawable = d;
		// Do padding resolution. This will call internalSetPadding() and do a requestLayout() if needed.

		// Do padding resolution. This will call internalSetPadding() and do a
		// requestLayout() if needed.
		resolvePadding();
		}

		@RemotableViewMethod
		@Override
		public void setVisibility(int visibility) {
		super.setVisibility(visibility);

		if (mCheckMarkDrawable != null) {
		mCheckMarkDrawable.setVisible(visibility == VISIBLE, false);
		}
		}

		@Override
		public void jumpDrawablesToCurrentState() {
		super.jumpDrawablesToCurrentState();

		if (mCheckMarkDrawable != null) {
		mCheckMarkDrawable.jumpToCurrentState();
		}
		}

		@Override
		protected boolean verifyDrawable(Drawable who) {
		return who == mCheckMarkDrawable \|\| super.verifyDrawable(who);
		}

		/**
		* Gets the checkmark drawable
		*
		@@ -249,6 +276,11 @@ public class CheckedTextView extends TextView implements Checkable {
		}
		checkMarkDrawable.setBounds(mScrollX + left, top, mScrollX + right, bottom);
		checkMarkDrawable.draw(canvas);

		final Drawable background = getBackground();
		if (background != null) {
		background.setHotspotBounds(mScrollX + left, top, mScrollX + right, bottom);
		}
		}
		}

core/java/android/widget/Switch.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -951,9 +951,8 @@ public class Switch extends CompoundButton {

		final int[] myDrawableState = getDrawableState();

		if (mThumbDrawable != null && mThumbDrawable.setState(myDrawableState)) {
		// Handle changes to thumb width and height.
		requestLayout();
		if (mThumbDrawable != null) {
		mThumbDrawable.setState(myDrawableState);
		}

		if (mTrackDrawable != null) {
		@@ -963,6 +962,16 @@ public class Switch extends CompoundButton {
		invalidate();
		}

		@Override
		public void invalidateDrawable(Drawable drawable) {
		super.invalidateDrawable(drawable);

		if (drawable == mThumbDrawable) {
		// Handle changes to thumb width and height.
		requestLayout();
		}
		}

		@Override
		protected boolean verifyDrawable(Drawable who) {
		return super.verifyDrawable(who) \|\| who == mThumbDrawable \|\| who == mTrackDrawable;

core/java/com/android/internal/app/AlertController.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -1026,7 +1026,7 @@ public class AlertController {
		? dialog.mSingleChoiceItemLayout : dialog.mListItemLayout;
		if (mCursor == null) {
		adapter = (mAdapter != null) ? mAdapter
		: new ArrayAdapter<CharSequence>(mContext, layout, R.id.text1, mItems);
		: new CheckedItemAdapter(mContext, layout, R.id.text1, mItems);
		} else {
		adapter = new SimpleCursorAdapter(mContext, layout,
		mCursor, new String[]{mLabelColumn}, new int[]{R.id.text1});
		@@ -1081,4 +1081,20 @@ public class AlertController {
		}
		}

		private static class CheckedItemAdapter extends ArrayAdapter<CharSequence> {
		public CheckedItemAdapter(Context context, int resource, int textViewResourceId,
		CharSequence[] objects) {
		super(context, resource, textViewResourceId, objects);
		}

		@Override
		public boolean hasStableIds() {
		return true;
		}

		@Override
		public long getItemId(int position) {
		return position;
		}
		}
		}

core/res/res/drawable-hdpi/btn_check_anim_00000_qntm_alpha.png

deleted100644 → 0

−211 B

Loading image diff...