| 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 c5b42ac872cb6d864669c31df73b7ec4f5b4524b..1b06d78becc8cbc24e68b0e39ba3d3f8c779d9d4 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
|
| @@ -16,23 +16,21 @@ import org.chromium.content.browser.ContentViewCore;
|
| @JNINamespace("content")
|
| class DateTimeChooserAndroid {
|
|
|
| + private final int mIdentifier;
|
| private final long mNativeDateTimeChooserAndroid;
|
| private final InputDialogContainer mInputDialogContainer;
|
|
|
| private DateTimeChooserAndroid(Context context,
|
| - long nativeDateTimeChooserAndroid) {
|
| + long nativeDateTimeChooserAndroid,
|
| + int identifier) {
|
| + mIdentifier = identifier;
|
| mNativeDateTimeChooserAndroid = nativeDateTimeChooserAndroid;
|
| mInputDialogContainer = new InputDialogContainer(context,
|
| new InputDialogContainer.InputActionDelegate() {
|
|
|
| @Override
|
| - public void replaceDateTime(
|
| - int dialogType,
|
| - int year, int month, int day, int hour, int minute,
|
| - int second, int milli, int week) {
|
| - nativeReplaceDateTime(mNativeDateTimeChooserAndroid,
|
| - dialogType,
|
| - year, month, day, hour, minute, second, milli, week);
|
| + public void replaceDateTime(double value) {
|
| + nativeReplaceDateTime(mNativeDateTimeChooserAndroid, mIdentifier, value);
|
| }
|
|
|
| @Override
|
| @@ -42,28 +40,23 @@ class DateTimeChooserAndroid {
|
| });
|
| }
|
|
|
| - private void showDialog(int dialogType, int year, int month, int monthDay,
|
| - int hour, int minute, int second, int milli,
|
| - int week, double min, double max, double step) {
|
| - mInputDialogContainer.showDialog(
|
| - dialogType, year, month, monthDay,
|
| - hour, minute, second, milli, week, min, max, step);
|
| + private void showDialog(int dialogType, double dialogValue,
|
| + double min, double max, double step) {
|
| + mInputDialogContainer.showDialog(dialogType, dialogValue, min, max, step);
|
| }
|
|
|
| @CalledByNative
|
| private static DateTimeChooserAndroid createDateTimeChooser(
|
| ContentViewCore contentViewCore,
|
| - long nativeDateTimeChooserAndroid, int dialogType,
|
| - int year, int month, int day,
|
| - int hour, int minute, int second, int milli, int week,
|
| + long nativeDateTimeChooserAndroid,
|
| + int identifier, int dialogType, double dialogValue,
|
| double min, double max, double step) {
|
| DateTimeChooserAndroid chooser =
|
| new DateTimeChooserAndroid(
|
| contentViewCore.getContext(),
|
| - nativeDateTimeChooserAndroid);
|
| - chooser.showDialog(
|
| - dialogType, year, month, day, hour, minute, second, milli,
|
| - week, min, max, step);
|
| + nativeDateTimeChooserAndroid,
|
| + identifier);
|
| + chooser.showDialog(dialogType, dialogValue, min, max, step);
|
| return chooser;
|
| }
|
|
|
| @@ -77,10 +70,9 @@ class DateTimeChooserAndroid {
|
| textInputTypeMonth, textInputTypeTime, textInputTypeWeek);
|
| }
|
|
|
| - private native void nativeReplaceDateTime(
|
| - long nativeDateTimeChooserAndroid, int dialogType,
|
| - int year, int month, int day, int hour, int minute,
|
| - int second, int milli, int week);
|
| + private native void nativeReplaceDateTime(long nativeDateTimeChooserAndroid,
|
| + int identifier,
|
| + double dialogValue);
|
|
|
| private native void nativeCancelDialog(long nativeDateTimeChooserAndroid);
|
| }
|
|
|