Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb (1ec1fdfc) · Commits · e / os / android_frameworks_base

api/11.xml

+23 −2

Original line number	Diff line number	Diff line
		@@ -39712,6 +39712,16 @@
		visibility="public"
		>
		</field>
		<field name="previewImage"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="provider"
		type="android.content.ComponentName"
		transient="false"
		@@ -146705,6 +146715,17 @@
		visibility="public"
		>
		</method>
		<method name="detectActivityLeaks"
		return="android.os.StrictMode.VmPolicy.Builder"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="detectAll"
		return="android.os.StrictMode.VmPolicy.Builder"
		abstract="false"
		@@ -249479,7 +249500,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="onValueChangedListener" type="android.widget.NumberPicker.OnValueChangedListener">
		<parameter name="onValueChangedListener" type="android.widget.NumberPicker.OnValueChangeListener">
		</parameter>
		</method>
		<method name="setValue"
		@@ -249586,7 +249607,7 @@
		>
		</field>
		</interface>
		<interface name="NumberPicker.OnValueChangedListener"
		<interface name="NumberPicker.OnValueChangeListener"
		abstract="true"
		static="true"
		final="false"

api/current.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -249500,7 +249500,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="onValueChangedListener" type="android.widget.NumberPicker.OnValueChangedListener">
		<parameter name="onValueChangedListener" type="android.widget.NumberPicker.OnValueChangeListener">
		</parameter>
		</method>
		<method name="setValue"
		@@ -249607,7 +249607,7 @@
		>
		</field>
		</interface>
		<interface name="NumberPicker.OnValueChangedListener"
		<interface name="NumberPicker.OnValueChangeListener"
		abstract="true"
		static="true"
		final="false"

core/java/android/widget/DatePicker.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import android.util.AttributeSet;
		import android.util.Log;
		import android.util.SparseArray;
		import android.view.LayoutInflater;
		import android.widget.NumberPicker.OnValueChangedListener;
		import android.widget.NumberPicker.OnValueChangeListener;

		import java.text.ParseException;
		import java.text.SimpleDateFormat;
		@@ -154,7 +154,7 @@ public class DatePicker extends FrameLayout {
		.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
		inflater.inflate(layoutResourceId, this, true);

		OnValueChangedListener onChangeListener = new OnValueChangedListener() {
		OnValueChangeListener onChangeListener = new OnValueChangeListener() {
		public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
		updateDate(mYearSpinner.getValue(), mMonthSpinner.getValue(), mDaySpinner
		.getValue());

core/java/android/widget/NumberPicker.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ public class NumberPicker extends LinearLayout {
		/**
		* Listener to be notified upon current value change.
		*/
		private OnValueChangedListener mOnValueChangedListener;
		private OnValueChangeListener mOnValueChangeListener;

		/**
		* Listener to be notified upon scroll state change.
		@@ -362,7 +362,7 @@ public class NumberPicker extends LinearLayout {
		/**
		* Interface to listen for changes of the current value.
		*/
		public interface OnValueChangedListener {
		public interface OnValueChangeListener {

		/**
		* Called upon a change of the current value.
		@@ -808,8 +808,8 @@ public class NumberPicker extends LinearLayout {
		*
		* @param onValueChangedListener The listener.
		*/
		public void setOnValueChangedListener(OnValueChangedListener onValueChangedListener) {
		mOnValueChangedListener = onValueChangedListener;
		public void setOnValueChangedListener(OnValueChangeListener onValueChangedListener) {
		mOnValueChangeListener = onValueChangedListener;
		}

		/**
		@@ -1432,8 +1432,8 @@ public class NumberPicker extends LinearLayout {
		* NumberPicker.
		*/
		private void notifyChange(int previous, int current) {
		if (mOnValueChangedListener != null) {
		mOnValueChangedListener.onValueChange(this, previous, mValue);
		if (mOnValueChangeListener != null) {
		mOnValueChangeListener.onValueChange(this, previous, mValue);
		}
		}

core/java/android/widget/TimePicker.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.os.Parcelable;
		import android.util.AttributeSet;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.NumberPicker.OnValueChangedListener;
		import android.widget.NumberPicker.OnValueChangeListener;

		import java.text.DateFormatSymbols;
		import java.util.Calendar;
		@@ -125,7 +125,7 @@ public class TimePicker extends FrameLayout {

		// hour
		mHourSpinner = (NumberPicker) findViewById(R.id.hour);
		mHourSpinner.setOnValueChangedListener(new NumberPicker.OnValueChangedListener() {
		mHourSpinner.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() {
		public void onValueChange(NumberPicker spinner, int oldVal, int newVal) {
		if (!is24HourView()) {
		int minValue = mHourSpinner.getMinValue();
		@@ -154,7 +154,7 @@ public class TimePicker extends FrameLayout {
		mMinuteSpinner.setMaxValue(59);
		mMinuteSpinner.setOnLongPressUpdateInterval(100);
		mMinuteSpinner.setFormatter(NumberPicker.TWO_DIGIT_FORMATTER);
		mMinuteSpinner.setOnValueChangedListener(new NumberPicker.OnValueChangedListener() {
		mMinuteSpinner.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() {
		public void onValueChange(NumberPicker spinner, int oldVal, int newVal) {
		int minValue = mMinuteSpinner.getMinValue();
		int maxValue = mMinuteSpinner.getMaxValue();
		@@ -200,7 +200,7 @@ public class TimePicker extends FrameLayout {
		mAmPmSpinner.setMinValue(0);
		mAmPmSpinner.setMaxValue(1);
		mAmPmSpinner.setDisplayedValues(mAmPmStrings);
		mAmPmSpinner.setOnValueChangedListener(new OnValueChangedListener() {
		mAmPmSpinner.setOnValueChangedListener(new OnValueChangeListener() {
		public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
		picker.requestFocus();
		mIsAm = !mIsAm;