New Number picker widget (206316a6) · Commits · e / os / android_frameworks_base

core/java/android/app/TimePickerDialog.java

+9 −23

Original line number	Diff line number	Diff line
		@@ -16,29 +16,26 @@

		package android.app;

		import com.android.internal.R;

		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.DialogInterface.OnClickListener;
		import android.os.Build;
		import android.os.Bundle;
		import android.text.format.DateFormat;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.TimePicker;
		import android.widget.TimePicker.OnTimeChangedListener;

		import com.android.internal.R;

		import java.util.Calendar;

		/**
		* A dialog that prompts the user for the time of day using a {@link TimePicker}.
		*
		* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Time Picker
		* tutorial</a>.</p>
		*/
		public class TimePickerDialog extends AlertDialog implements OnClickListener,
		OnTimeChangedListener {
		public class TimePickerDialog extends AlertDialog
		implements OnClickListener, OnTimeChangedListener {

		/**
		* The callback interface used to indicate the user is done filling in
		@@ -60,8 +57,6 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,

		private final TimePicker mTimePicker;
		private final OnTimeSetListener mCallback;
		private final Calendar mCalendar;
		private final java.text.DateFormat mDateFormat;

		int mInitialHourOfDay;
		int mInitialMinute;
		@@ -102,14 +97,13 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
		mInitialMinute = minute;
		mIs24HourView = is24HourView;

		mDateFormat = DateFormat.getTimeFormat(context);
		mCalendar = Calendar.getInstance();
		updateTitle(mInitialHourOfDay, mInitialMinute);
		setCanceledOnTouchOutside(false);
		setIcon(0);
		setTitle(R.string.time_picker_dialog_title);

		setButton(BUTTON_POSITIVE, context.getText(R.string.date_time_set), this);
		setButton(BUTTON_NEGATIVE, context.getText(R.string.cancel),
		(OnClickListener) null);
		setIcon(R.drawable.ic_dialog_time);

		LayoutInflater inflater =
		(LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
		@@ -132,19 +126,13 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
		}
		}

		public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
		updateTitle(hourOfDay, minute);
		}

		public void updateTime(int hourOfDay, int minutOfHour) {
		mTimePicker.setCurrentHour(hourOfDay);
		mTimePicker.setCurrentMinute(minutOfHour);
		}

		private void updateTitle(int hour, int minute) {
		mCalendar.set(Calendar.HOUR_OF_DAY, hour);
		mCalendar.set(Calendar.MINUTE, minute);
		setTitle(mDateFormat.format(mCalendar.getTime()));
		public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
		/* do nothing */
		}

		@Override
		@@ -164,7 +152,5 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
		mTimePicker.setCurrentHour(hour);
		mTimePicker.setCurrentMinute(minute);
		mTimePicker.setIs24HourView(savedInstanceState.getBoolean(IS_24_HOUR));
		mTimePicker.setOnTimeChangedListener(this);
		updateTitle(hour, minute);
		}
		}

core/java/android/widget/NumberPicker.java

+1114 −266

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/widget/NumberPickerButton.java

deleted100644 → 0

+0 −96

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.widget;

		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.widget.ImageButton;
		import android.widget.NumberPicker;

		import com.android.internal.R;

		/**
		* This class exists purely to cancel long click events, that got
		* started in NumberPicker
		*/
		class NumberPickerButton extends ImageButton {

		private NumberPicker mNumberPicker;

		public NumberPickerButton(Context context, AttributeSet attrs,
		int defStyle) {
		super(context, attrs, defStyle);
		}

		public NumberPickerButton(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		public NumberPickerButton(Context context) {
		super(context);
		}

		public void setNumberPicker(NumberPicker picker) {
		mNumberPicker = picker;
		}

		@Override
		public boolean onTouchEvent(MotionEvent event) {
		cancelLongpressIfRequired(event);
		return super.onTouchEvent(event);
		}

		@Override
		public boolean onTrackballEvent(MotionEvent event) {
		cancelLongpressIfRequired(event);
		return super.onTrackballEvent(event);
		}

		@Override
		public boolean onKeyUp(int keyCode, KeyEvent event) {
		if ((keyCode == KeyEvent.KEYCODE_DPAD_CENTER)
		\|\| (keyCode == KeyEvent.KEYCODE_ENTER)) {
		cancelLongpress();
		}
		return super.onKeyUp(keyCode, event);
		}

		private void cancelLongpressIfRequired(MotionEvent event) {
		if ((event.getAction() == MotionEvent.ACTION_CANCEL)
		\|\| (event.getAction() == MotionEvent.ACTION_UP)) {
		cancelLongpress();
		}
		}

		private void cancelLongpress() {
		if (R.id.increment == getId()) {
		mNumberPicker.cancelIncrement();
		} else if (R.id.decrement == getId()) {
		mNumberPicker.cancelDecrement();
		}
		}

		public void onWindowFocusChanged(boolean hasWindowFocus) {
		super.onWindowFocusChanged(hasWindowFocus);
		if (!hasWindowFocus) {
		cancelLongpress();
		}
		}

		}

core/java/android/widget/TimePicker.java

+48 −46

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.widget;

		import com.android.internal.R;

		import android.annotation.Widget;
		import android.content.Context;
		import android.os.Parcel;
		@@ -23,9 +25,7 @@ import android.os.Parcelable;
		import android.util.AttributeSet;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.NumberPicker;

		import com.android.internal.R;
		import android.widget.NumberPicker.OnChangedListener;

		import java.text.DateFormatSymbols;
		import java.util.Calendar;
		@@ -70,9 +70,10 @@ public class TimePicker extends FrameLayout {
		// ui components
		private final NumberPicker mHourPicker;
		private final NumberPicker mMinutePicker;
		private final Button mAmPmButton;
		private final String mAmText;
		private final String mPmText;
		private final NumberPicker mAmPmPicker;
		private final TextView mDivider;

		private final String[] mAmPmStrings;

		// callbacks
		private OnTimeChangedListener mOnTimeChangedListener;
		@@ -127,6 +128,10 @@ public class TimePicker extends FrameLayout {
		}
		});

		// divider
		mDivider = (TextView) findViewById(R.id.divider);
		mDivider.setText(R.string.time_picker_separator);

		// digits of minute
		mMinutePicker = (NumberPicker) findViewById(R.id.minute);
		mMinutePicker.setRange(0, 59);
		@@ -140,50 +145,41 @@ public class TimePicker extends FrameLayout {
		});

		// am/pm
		mAmPmButton = (Button) findViewById(R.id.amPm);

		// now that the hour/minute picker objects have been initialized, set
		// the hour range properly based on the 12/24 hour display mode.
		configurePickerRanges();

		// initialize to current time
		Calendar cal = Calendar.getInstance();
		setOnTimeChangedListener(NO_OP_CHANGE_LISTENER);

		// by default we're not in 24 hour mode
		setCurrentHour(cal.get(Calendar.HOUR_OF_DAY));
		setCurrentMinute(cal.get(Calendar.MINUTE));

		mIsAm = (mCurrentHour < 12);

		/* Get the localized am/pm strings and use them in the spinner */
		DateFormatSymbols dfs = new DateFormatSymbols();
		String[] dfsAmPm = dfs.getAmPmStrings();
		mAmText = dfsAmPm[Calendar.AM];
		mPmText = dfsAmPm[Calendar.PM];
		mAmPmButton.setText(mIsAm ? mAmText : mPmText);
		mAmPmButton.setOnClickListener(new OnClickListener() {
		public void onClick(View v) {
		requestFocus();
		mAmPmPicker = (NumberPicker) findViewById(R.id.amPm);
		mAmPmPicker.setOnChangeListener(new OnChangedListener() {
		public void onChanged(NumberPicker picker, int oldVal, int newVal) {
		picker.requestFocus();
		if (mIsAm) {

		// Currently AM switching to PM
		if (mCurrentHour < 12) {
		mCurrentHour += 12;
		}
		} else {

		// Currently PM switching to AM
		if (mCurrentHour >= 12) {
		mCurrentHour -= 12;
		}
		}
		mIsAm = !mIsAm;
		mAmPmButton.setText(mIsAm ? mAmText : mPmText);
		onTimeChanged();
		}
		});

		/* Get the localized am/pm strings and use them in the spinner */
		mAmPmStrings = new DateFormatSymbols().getAmPmStrings();

		// now that the hour/minute picker objects have been initialized, set
		// the hour range properly based on the 12/24 hour display mode.
		configurePickerRanges();

		// initialize to current time
		Calendar cal = Calendar.getInstance();
		setOnTimeChangedListener(NO_OP_CHANGE_LISTENER);

		// by default we're not in 24 hour mode
		setCurrentHour(cal.get(Calendar.HOUR_OF_DAY));
		setCurrentMinute(cal.get(Calendar.MINUTE));

		if (!isEnabled()) {
		setEnabled(false);
		}
		@@ -194,7 +190,7 @@ public class TimePicker extends FrameLayout {
		super.setEnabled(enabled);
		mMinutePicker.setEnabled(enabled);
		mHourPicker.setEnabled(enabled);
		mAmPmButton.setEnabled(enabled);
		mAmPmPicker.setEnabled(enabled);
		}

		/**
		@@ -327,12 +323,15 @@ public class TimePicker extends FrameLayout {
		int currentHour = mCurrentHour;
		if (!mIs24HourView) {
		// convert [0,23] ordinal to wall clock display
		if (currentHour > 12) currentHour -= 12;
		else if (currentHour == 0) currentHour = 12;
		if (currentHour > 12) {
		currentHour -= 12;
		} else if (currentHour == 0) {
		currentHour = 12;
		}
		}
		mHourPicker.setCurrent(currentHour);
		mIsAm = mCurrentHour < 12;
		mAmPmButton.setText(mIsAm ? mAmText : mPmText);
		mAmPmPicker.setCurrent(mIsAm ? Calendar.AM : Calendar.PM);
		onTimeChanged();
		}

		@@ -340,23 +339,26 @@ public class TimePicker extends FrameLayout {
		if (mIs24HourView) {
		mHourPicker.setRange(0, 23);
		mHourPicker.setFormatter(NumberPicker.TWO_DIGIT_FORMATTER);
		mAmPmButton.setVisibility(View.GONE);
		mAmPmPicker.setVisibility(View.GONE);
		} else {
		mHourPicker.setRange(1, 12);
		mHourPicker.setFormatter(null);
		mAmPmButton.setVisibility(View.VISIBLE);
		mAmPmPicker.setVisibility(View.VISIBLE);
		mAmPmPicker.setRange(0, 1, mAmPmStrings);
		}
		}

		private void onTimeChanged() {
		if (mOnTimeChangedListener != null) {
		mOnTimeChangedListener.onTimeChanged(this, getCurrentHour(), getCurrentMinute());
		}
		}

		/**
		* Set the state of the spinners appropriate to the current minute.
		*/
		private void updateMinuteDisplay() {
		mMinutePicker.setCurrent(mCurrentMinute);
		mOnTimeChangedListener.onTimeChanged(this, getCurrentHour(), getCurrentMinute());
		onTimeChanged();
		}
		}

core/res/res/drawable/timepicker_down_btn.xml

+22 −9

Original line number	Diff line number	Diff line
		@@ -16,15 +16,28 @@

		<selector xmlns:android="http://schemas.android.com/apk/res/android">

		<item android:state_pressed="false" android:state_enabled="true"
		android:state_focused="false" android:drawable="@drawable/timepicker_down_normal" />
		<item android:state_pressed="true" android:state_enabled="true"
		<item android:state_pressed="false"
		android:state_enabled="true"
		android:state_focused="false"
		android:drawable="@drawable/timepicker_down_normal" />

		<item android:state_pressed="true"
		android:state_enabled="true"
		android:drawable="@drawable/timepicker_down_pressed" />
		<item android:state_pressed="false" android:state_enabled="true"
		android:state_focused="true" android:drawable="@drawable/timepicker_down_selected" />
		<item android:state_pressed="false" android:state_enabled="false"
		android:state_focused="false" android:drawable="@drawable/timepicker_down_disabled" />
		<item android:state_pressed="false" android:state_enabled="false"
		android:state_focused="true" android:drawable="@drawable/timepicker_down_disabled_focused" />

		<item android:state_pressed="false"
		android:state_enabled="true"
		android:state_focused="true"
		android:drawable="@drawable/timepicker_down_selected" />

		<item android:state_pressed="false"
		android:state_enabled="false"
		android:state_focused="false"
		android:drawable="@drawable/timepicker_down_disabled" />

		<item android:state_pressed="false"
		android:state_enabled="false"
		android:state_focused="true"
		android:drawable="@drawable/timepicker_down_disabled_focused" />

		</selector>