| 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 f8fca5444c44e08e0154b93a1a35d621d9ad647b..460cb9a5062c1b0874c62a246bc17f6909233868 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,11 @@ 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 weekYear, int week) {
|
| nativeReplaceDateTime(mNativeDateTimeChooserAndroid,
|
| dialogType,
|
| - year, month, day, hour, minute, second);
|
| + year, month, day, hour, minute, second, weekYear, week);
|
| }
|
|
|
| @Override
|
| @@ -42,9 +43,9 @@ class DateTimeChooserAndroid {
|
| }
|
|
|
| private void showDialog(int dialogType, int year, int month, int monthDay,
|
| - int hour, int minute, int second) {
|
| + int hour, int minute, int second, int weekYear, int week) {
|
| mInputDialogContainer.showDialog(dialogType, year, month, monthDay,
|
| - hour, minute, second);
|
| + hour, minute, second, weekYear, week);
|
| }
|
|
|
| @CalledByNative
|
| @@ -52,25 +53,28 @@ class DateTimeChooserAndroid {
|
| ContentViewCore contentViewCore,
|
| int nativeDateTimeChooserAndroid, int dialogType,
|
| int year, int month, int day,
|
| - int hour, int minute, int second) {
|
| + int hour, int minute, int second,
|
| + int weekYear, int week) {
|
| DateTimeChooserAndroid chooser =
|
| new DateTimeChooserAndroid(
|
| contentViewCore.getContext(), nativeDateTimeChooserAndroid);
|
| - chooser.showDialog(dialogType, year, month, day, hour, minute, second);
|
| + chooser.showDialog(dialogType, year, month, day, hour, minute, second,
|
| + weekYear, week);
|
| 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 weekYear, int week);
|
|
|
| private native void nativeCancelDialog(int nativeDateTimeChooserAndroid);
|
| }
|
|
|