Merge "Start saving CheckedTextView checked state." (664e040f) · Commits · e / os / android_frameworks_base

core/java/android/widget/CheckedTextView.java

+64 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@ import android.content.res.TypedArray;
		import android.graphics.Canvas;
		import android.graphics.PorterDuff;
		import android.graphics.drawable.Drawable;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.AttributeSet;
		import android.view.Gravity;
		import android.view.RemotableViewMethod;
		@@ -447,6 +449,68 @@ public class CheckedTextView extends TextView implements Checkable {
		return CheckedTextView.class.getName();
		}

		static class SavedState extends BaseSavedState {
		boolean checked;

		/**
		* Constructor called from {@link CheckedTextView#onSaveInstanceState()}
		*/
		SavedState(Parcelable superState) {
		super(superState);
		}

		/**
		* Constructor called from {@link #CREATOR}
		*/
		private SavedState(Parcel in) {
		super(in);
		checked = (Boolean)in.readValue(null);
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		super.writeToParcel(out, flags);
		out.writeValue(checked);
		}

		@Override
		public String toString() {
		return "CheckedTextView.SavedState{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " checked=" + checked + "}";
		}

		public static final Parcelable.Creator<SavedState> CREATOR
		= new Parcelable.Creator<SavedState>() {
		public SavedState createFromParcel(Parcel in) {
		return new SavedState(in);
		}

		public SavedState[] newArray(int size) {
		return new SavedState[size];
		}
		};
		}

		@Override
		public Parcelable onSaveInstanceState() {
		Parcelable superState = super.onSaveInstanceState();

		SavedState ss = new SavedState(superState);

		ss.checked = isChecked();
		return ss;
		}

		@Override
		public void onRestoreInstanceState(Parcelable state) {
		SavedState ss = (SavedState) state;

		super.onRestoreInstanceState(ss.getSuperState());
		setChecked(ss.checked);
		requestLayout();
		}

		/** @hide */
		@Override
		public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {