Merge "Revamp of the NumberPicker widget." (ca07bc1d) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26958,7 +26958,6 @@ package android.widget {
	method public void setOnValueChangedListener(android.widget.NumberPicker.OnValueChangeListener);		method public void setOnValueChangedListener(android.widget.NumberPicker.OnValueChangeListener);
	method public void setValue(int);		method public void setValue(int);
	method public void setWrapSelectorWheel(boolean);		method public void setWrapSelectorWheel(boolean);
	field public static final int SELECTOR_WHEEL_ITEM_COUNT = 5; // 0x5
	}		}

	public static abstract interface NumberPicker.Formatter {		public static abstract interface NumberPicker.Formatter {

core/java/android/view/ViewGroup.java

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -2679,15 +2679,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	return child.draw(canvas, this, drawingTime);		return child.draw(canvas, this, drawingTime);
	}		}

	@Override
	public void requestLayout() {
	if (mChildrenCount > 0 && getAccessibilityNodeProvider() != null) {
	throw new IllegalStateException("Views with AccessibilityNodeProvider"
	+ " can't have children.");
	}
	super.requestLayout();
	}

	/**		/**
	*		*
	* @param enabled True if children should be drawn with layers, false otherwise.		* @param enabled True if children should be drawn with layers, false otherwise.
	@@ -3109,11 +3100,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
	private void addViewInner(View child, int index, LayoutParams params,		private void addViewInner(View child, int index, LayoutParams params,
	boolean preventRequestLayout) {		boolean preventRequestLayout) {

	if (getAccessibilityNodeProvider() != null) {
	throw new IllegalStateException("Views with AccessibilityNodeProvider"
	+ " can't have children.");
	}

	if (mTransition != null) {		if (mTransition != null) {
	// Don't prevent other add transitions from completing, but cancel remove		// Don't prevent other add transitions from completing, but cancel remove
	// transitions to let them complete the process before we add to the container		// transitions to let them complete the process before we add to the container

core/java/android/widget/DatePicker.java

+21 −16

Original line number	Original line	Diff line number	Diff line
	@@ -29,8 +29,8 @@ import android.util.AttributeSet;
	import android.util.Log;		import android.util.Log;
	import android.util.SparseArray;		import android.util.SparseArray;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
			import android.view.View;
	import android.view.accessibility.AccessibilityEvent;		import android.view.accessibility.AccessibilityEvent;
	import android.view.accessibility.AccessibilityManager;
	import android.view.accessibility.AccessibilityNodeInfo;		import android.view.accessibility.AccessibilityNodeInfo;
	import android.view.inputmethod.EditorInfo;		import android.view.inputmethod.EditorInfo;
	import android.view.inputmethod.InputMethodManager;		import android.view.inputmethod.InputMethodManager;
	@@ -280,10 +280,8 @@ public class DatePicker extends FrameLayout {
	reorderSpinners();		reorderSpinners();

	// set content descriptions		// set content descriptions
	if (AccessibilityManager.getInstance(mContext).isEnabled()) {
	setContentDescriptions();		setContentDescriptions();
	}		}
	}

	/**		/**
	* Gets the minimal date supported by this {@link DatePicker} in		* Gets the minimal date supported by this {@link DatePicker} in
	@@ -717,20 +715,27 @@ public class DatePicker extends FrameLayout {

	private void setContentDescriptions() {		private void setContentDescriptions() {
	// Day		// Day
	String text = mContext.getString(R.string.date_picker_increment_day_button);		trySetContentDescription(mDaySpinner, R.id.increment,
	mDaySpinner.findViewById(R.id.increment).setContentDescription(text);		R.string.date_picker_increment_day_button);
	text = mContext.getString(R.string.date_picker_decrement_day_button);		trySetContentDescription(mDaySpinner, R.id.decrement,
	mDaySpinner.findViewById(R.id.decrement).setContentDescription(text);		R.string.date_picker_decrement_day_button);
	// Month		// Month
	text = mContext.getString(R.string.date_picker_increment_month_button);		trySetContentDescription(mMonthSpinner, R.id.increment,
	mMonthSpinner.findViewById(R.id.increment).setContentDescription(text);		R.string.date_picker_increment_month_button);
	text = mContext.getString(R.string.date_picker_decrement_month_button);		trySetContentDescription(mMonthSpinner, R.id.decrement,
	mMonthSpinner.findViewById(R.id.decrement).setContentDescription(text);		R.string.date_picker_decrement_month_button);
	// Year		// Year
	text = mContext.getString(R.string.date_picker_increment_year_button);		trySetContentDescription(mYearSpinner, R.id.increment,
	mYearSpinner.findViewById(R.id.increment).setContentDescription(text);		R.string.date_picker_increment_year_button);
	text = mContext.getString(R.string.date_picker_decrement_year_button);		trySetContentDescription(mYearSpinner, R.id.decrement,
	mYearSpinner.findViewById(R.id.decrement).setContentDescription(text);		R.string.date_picker_decrement_year_button);
			}

			private void trySetContentDescription(View root, int viewId, int contDescResId) {
			View target = root.findViewById(viewId);
			if (target != null) {
			target.setContentDescription(mContext.getString(contDescResId));
			}
	}		}

	private void updateInputState() {		private void updateInputState() {

core/java/android/widget/NumberPicker.java

+723 −577

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/widget/TimePicker.java

+19 −12

Original line number	Original line	Diff line number	Diff line
	@@ -532,21 +532,28 @@ public class TimePicker extends FrameLayout {

	private void setContentDescriptions() {		private void setContentDescriptions() {
	// Minute		// Minute
	String text = mContext.getString(R.string.time_picker_increment_minute_button);		trySetContentDescription(mMinuteSpinner, R.id.increment,
	mMinuteSpinner.findViewById(R.id.increment).setContentDescription(text);		R.string.time_picker_increment_minute_button);
	text = mContext.getString(R.string.time_picker_decrement_minute_button);		trySetContentDescription(mMinuteSpinner, R.id.decrement,
	mMinuteSpinner.findViewById(R.id.decrement).setContentDescription(text);		R.string.time_picker_decrement_minute_button);
	// Hour		// Hour
	text = mContext.getString(R.string.time_picker_increment_hour_button);		trySetContentDescription(mHourSpinner, R.id.increment,
	mHourSpinner.findViewById(R.id.increment).setContentDescription(text);		R.string.time_picker_increment_hour_button);
	text = mContext.getString(R.string.time_picker_decrement_hour_button);		trySetContentDescription(mHourSpinner, R.id.decrement,
	mHourSpinner.findViewById(R.id.decrement).setContentDescription(text);		R.string.time_picker_decrement_hour_button);
	// AM/PM		// AM/PM
	if (mAmPmSpinner != null) {		if (mAmPmSpinner != null) {
	text = mContext.getString(R.string.time_picker_increment_set_pm_button);		trySetContentDescription(mAmPmSpinner, R.id.increment,
	mAmPmSpinner.findViewById(R.id.increment).setContentDescription(text);		R.string.time_picker_increment_set_pm_button);
	text = mContext.getString(R.string.time_picker_decrement_set_am_button);		trySetContentDescription(mAmPmSpinner, R.id.decrement,
	mAmPmSpinner.findViewById(R.id.decrement).setContentDescription(text);		R.string.time_picker_decrement_set_am_button);
			}
			}

			private void trySetContentDescription(View root, int viewId, int contDescResId) {
			View target = root.findViewById(viewId);
			if (target != null) {
			target.setContentDescription(mContext.getString(contDescResId));
	}		}
	}		}