author | Jim Chen <nchen@mozilla.com> |
Mon, 05 Nov 2012 14:33:43 -0500 | |
changeset 112340 | c69822a9bd0fe015d1696be81c9e92a9203a477a |
parent 112339 | f8cd6fa12a8bee4f601bea35b7f8be6e94969bce |
child 112341 | bc191fe62b436ff9b265110ba16d09af7bb9c863 |
push id | 23812 |
push user | emorley@mozilla.com |
push date | Tue, 06 Nov 2012 14:01:34 +0000 |
treeherder | mozilla-central@f4aeed115e54 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | wesj |
bugs | 808405 |
milestone | 19.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/PromptService.java +++ b/mobile/android/base/PromptService.java @@ -17,16 +17,17 @@ import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.text.InputType; +import android.text.format.DateFormat; import android.util.Log; import android.view.inputmethod.InputMethodManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; @@ -153,16 +154,17 @@ public class PromptService implements On view = (View)input; } } else if (type.equals("week")) { DateTimePicker input = new DateTimePicker(GeckoApp.mAppContext, "yyyy-'W'ww", value, DateTimePicker.pickersState.WEEK); view = (View)input; } else if (type.equals("time")) { TimePicker input = new TimePicker(GeckoApp.mAppContext); + input.setIs24HourView(DateFormat.is24HourFormat(GeckoApp.mAppContext)); if (!value.equals("")) { try { GregorianCalendar calendar = new GregorianCalendar(); calendar.setTime(new SimpleDateFormat("kk:mm").parse(value)); input.setCurrentHour(calendar.get(GregorianCalendar.HOUR_OF_DAY)); input.setCurrentMinute(calendar.get(GregorianCalendar.MINUTE)); } catch (Exception e) { } }