Merge "Implement landscape layout for time picker dialog" (228fd600) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -38872,6 +38872,7 @@ package android.widget {
		method public void addRule(int);
		method public void addRule(int, int);
		method public java.lang.String debug(java.lang.String);
		method public int getRule(int);
		method public int[] getRules();
		method public void removeRule(int);
		field public boolean alignWithParent;

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -41331,6 +41331,7 @@ package android.widget {
		method public void addRule(int);
		method public void addRule(int, int);
		method public java.lang.String debug(java.lang.String);
		method public int getRule(int);
		method public int[] getRules();
		method public void removeRule(int);
		field public boolean alignWithParent;

core/java/android/app/TimePickerDialog.java

+46 −34

Original line number	Diff line number	Diff line
		@@ -31,20 +31,21 @@ import android.widget.TimePicker.ValidationCallback;
		import com.android.internal.R;

		/**
		* A dialog that prompts the user for the time of day using a {@link TimePicker}.
		* A dialog that prompts the user for the time of day using a
		* {@link TimePicker}.
		*
		* <p>See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a>
		* guide.</p>
		* <p>
		* See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a>
		* guide.
		*/
		public class TimePickerDialog extends AlertDialog implements OnClickListener,
		OnTimeChangedListener {

		private static final String HOUR = "hour";
		private static final String MINUTE = "minute";
		private static final String IS_24_HOUR = "is24hour";

		private final TimePicker mTimePicker;
		private final OnTimeSetListener mTimeSetCallback;
		private final OnTimeSetListener mTimeSetListener;

		private final int mInitialHourOfDay;
		private final int mInitialMinute;
		@@ -52,59 +53,70 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,

		/**
		* The callback interface used to indicate the user is done filling in
		* the time (they clicked on the 'Done' button).
		* the time (e.g. they clicked on the 'OK' button).
		*/
		public interface OnTimeSetListener {

		/**
		* @param view The view associated with this listener.
		* @param hourOfDay The hour that was set.
		* @param minute The minute that was set.
		* Called when the user is done setting a new time and the dialog has
		* closed.
		*
		* @param view the view associated with this listener
		* @param hourOfDay the hour that was set
		* @param minute the minute that was set
		*/
		void onTimeSet(TimePicker view, int hourOfDay, int minute);
		public void onTimeSet(TimePicker view, int hourOfDay, int minute);
		}

		/**
		* @param context Parent.
		* @param callBack How parent is notified.
		* @param hourOfDay The initial hour.
		* @param minute The initial minute.
		* @param is24HourView Whether this is a 24 hour view, or AM/PM.
		* Creates a new time picker dialog.
		*
		* @param context the parent context
		* @param listener the listener to call when the time is set
		* @param hourOfDay the initial hour
		* @param minute the initial minute
		* @param is24HourView whether this is a 24 hour view or AM/PM
		*/
		public TimePickerDialog(Context context,
		OnTimeSetListener callBack,
		int hourOfDay, int minute, boolean is24HourView) {
		this(context, 0, callBack, hourOfDay, minute, is24HourView);
		public TimePickerDialog(Context context, OnTimeSetListener listener, int hourOfDay, int minute,
		boolean is24HourView) {
		this(context, 0, listener, hourOfDay, minute, is24HourView);
		}

		static int resolveDialogTheme(Context context, int resid) {
		if (resid == 0) {
		static int resolveDialogTheme(Context context, int resId) {
		if (resId == 0) {
		final TypedValue outValue = new TypedValue();
		context.getTheme().resolveAttribute(R.attr.timePickerDialogTheme, outValue, true);
		return outValue.resourceId;
		} else {
		return resid;
		return resId;
		}
		}

		/**
		* @param context Parent.
		* @param theme the theme to apply to this dialog
		* @param callBack How parent is notified.
		* @param hourOfDay The initial hour.
		* @param minute The initial minute.
		* Creates a new time picker dialog with the specified theme.
		*
		* @param context the parent context
		* @param themeResId the resource ID of the theme to apply to this dialog
		* @param listener the listener to call when the time is set
		* @param hourOfDay the initial hour
		* @param minute the initial minute
		* @param is24HourView Whether this is a 24 hour view, or AM/PM.
		*/
		public TimePickerDialog(Context context, int theme, OnTimeSetListener callBack, int hourOfDay,
		int minute, boolean is24HourView) {
		super(context, resolveDialogTheme(context, theme));
		public TimePickerDialog(Context context, int themeResId, OnTimeSetListener listener,
		int hourOfDay, int minute, boolean is24HourView) {
		super(context, resolveDialogTheme(context, themeResId));

		mTimeSetCallback = callBack;
		mTimeSetListener = listener;
		mInitialHourOfDay = hourOfDay;
		mInitialMinute = minute;
		mIs24HourView = is24HourView;

		final Context themeContext = getContext();


		final TypedValue outValue = new TypedValue();
		context.getTheme().resolveAttribute(R.attr.timePickerDialogTheme, outValue, true);
		final int layoutResId = outValue.resourceId;

		final LayoutInflater inflater = LayoutInflater.from(themeContext);
		final View view = inflater.inflate(R.layout.time_picker_dialog, null);
		setView(view);
		@@ -129,8 +141,8 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
		public void onClick(DialogInterface dialog, int which) {
		switch (which) {
		case BUTTON_POSITIVE:
		if (mTimeSetCallback != null) {
		mTimeSetCallback.onTimeSet(mTimePicker, mTimePicker.getCurrentHour(),
		if (mTimeSetListener != null) {
		mTimeSetListener.onTimeSet(mTimePicker, mTimePicker.getCurrentHour(),
		mTimePicker.getCurrentMinute());
		}
		break;

core/java/android/content/res/ColorStateList.java

+0 −40

Original line number	Diff line number	Diff line
		@@ -462,46 +462,6 @@ public class ColorStateList implements Parcelable {
		return mColors;
		}

		/**
		* If the color state list does not already have an entry matching the
		* specified state, prepends a state set and color pair to a color state
		* list.
		* <p>
		* This is a workaround used in TimePicker and DatePicker until we can
		* add support for theme attributes in ColorStateList.
		*
		* @param colorStateList the source color state list
		* @param state the state to prepend
		* @param color the color to use for the given state
		* @return a new color state list, or the source color state list if there
		* was already a matching state set
		*
		* @hide Remove when we can support theme attributes.
		*/
		public static ColorStateList addFirstIfMissing(
		ColorStateList colorStateList, int state, int color) {
		final int[][] inputStates = colorStateList.getStates();
		for (int i = 0; i < inputStates.length; i++) {
		final int[] inputState = inputStates[i];
		for (int j = 0; j < inputState.length; j++) {
		if (inputState[j] == state) {
		return colorStateList;
		}
		}
		}

		final int[][] outputStates = new int[inputStates.length + 1][];
		System.arraycopy(inputStates, 0, outputStates, 1, inputStates.length);
		outputStates[0] = new int[] { state };

		final int[] inputColors = colorStateList.getColors();
		final int[] outputColors = new int[inputColors.length + 1];
		System.arraycopy(inputColors, 0, outputColors, 1, inputColors.length);
		outputColors[0] = color;

		return new ColorStateList(outputStates, outputColors);
		}

		@Override
		public String toString() {
		return "ColorStateList{" +

core/java/android/view/View.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -10047,6 +10047,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @return The measured width of this view as a bit mask.
		*/
		@ViewDebug.ExportedProperty(category = "measurement", flagMapping = {
		@ViewDebug.FlagToString(mask = MEASURED_STATE_MASK, equals = MEASURED_STATE_TOO_SMALL,
		name = "MEASURED_STATE_TOO_SMALL"),
		})
		public final int getMeasuredWidthAndState() {
		return mMeasuredWidth;
		}
		@@ -10071,6 +10075,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @return The measured width of this view as a bit mask.
		*/
		@ViewDebug.ExportedProperty(category = "measurement", flagMapping = {
		@ViewDebug.FlagToString(mask = MEASURED_STATE_MASK, equals = MEASURED_STATE_TOO_SMALL,
		name = "MEASURED_STATE_TOO_SMALL"),
		})
		public final int getMeasuredHeightAndState() {
		return mMeasuredHeight;
		}