Chromium Code Reviews| Index: content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java |
| diff --git a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java |
| index 8e75fed5e8d4b26d84e0442e7dfaf72064e06c24..01e01efc1df7d5e24c644d6db941312ff0dfa0ff 100644 |
| --- a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java |
| +++ b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java |
| @@ -28,10 +28,10 @@ class DateTimeChooserAndroid { |
| @Override |
| public void replaceDateTime( |
| int dialogType, |
| - int year, int month, int day, int hour, int minute, int second) { |
| + int year, int month, int day, int hour, int minute, int second, int week) { |
| nativeReplaceDateTime(mNativeDateTimeChooserAndroid, |
| dialogType, |
| - year, month, day, hour, minute, second); |
| + year, month, day, hour, minute, second, week); |
| } |
| @Override |
| @@ -42,35 +42,38 @@ class DateTimeChooserAndroid { |
| } |
| private void showDialog(int dialogType, int year, int month, int monthDay, |
| - int hour, int minute, int second, double min, double max) { |
| + int hour, int minute, int second, int week, |
|
Miguel Garcia
2013/06/11 13:02:52
nit: I think this fits in 100 cols
keishi
2013/06/12 13:23:07
Done.
|
| + double min, double max) { |
| mInputDialogContainer.showDialog(dialogType, year, month, monthDay, |
| - hour, minute, second, min, max); |
| + hour, minute, second, week, min, max); |
| } |
| @CalledByNative |
| private static DateTimeChooserAndroid createDateTimeChooser( |
| ContentViewCore contentViewCore, |
| int nativeDateTimeChooserAndroid, int dialogType, |
| - int year, int month, int day, int hour, int minute, |
| - int second, double min, double max) { |
| + int year, int month, int day, |
| + int hour, int minute, int second, int week, |
|
Miguel Garcia
2013/06/11 13:02:52
nit: I think this fits in 100 cols
keishi
2013/06/12 13:23:07
Done.
|
| + double min, double max) { |
| DateTimeChooserAndroid chooser = |
| new DateTimeChooserAndroid( |
| contentViewCore.getContext(), nativeDateTimeChooserAndroid); |
| - chooser.showDialog(dialogType, year, month, day, hour, minute, second, min, max); |
| + chooser.showDialog(dialogType, year, month, day, hour, minute, second, week, min, max); |
| return chooser; |
| } |
| @CalledByNative |
| private static void initializeDateInputTypes(int textInputTypeDate, int textInputTypeDateTime, |
| int textInputTypeDateTimeLocal, int textInputTypeMonth, |
| - int textInputTypeTime) { |
| - InputDialogContainer.initializeInputTypes(textInputTypeDate, textInputTypeDateTime, |
| - textInputTypeDateTimeLocal, textInputTypeMonth, textInputTypeTime); |
| + int textInputTypeTime, int textInputTypeWeek) { |
| + InputDialogContainer.initializeInputTypes(textInputTypeDate, |
| + textInputTypeDateTime, textInputTypeDateTimeLocal, |
| + textInputTypeMonth, textInputTypeTime, textInputTypeWeek); |
| } |
| private native void nativeReplaceDateTime(int nativeDateTimeChooserAndroid, |
| int dialogType, |
| - int year, int month, int day, int hour, int minute, int second); |
| + int year, int month, int day, int hour, int minute, int second, int week); |
| private native void nativeCancelDialog(int nativeDateTimeChooserAndroid); |
| } |