Move *Picker.java and *PickerDialog.java to ui/android/java/... - Part1

ui/android/java/src/org/chromium/ui/InputDialogContainer.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser.input;
+package org.chromium.ui;
 
 import android.app.AlertDialog;
 import android.app.DatePickerDialog.OnDateSetListener;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
 import android.text.format.DateFormat;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.DatePicker;
 import android.widget.ListView;
 import android.widget.TimePicker;
 
 import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.content.R;
-import org.chromium.content.browser.input.DateTimePickerDialog.OnDateTimeSetListener;
-import org.chromium.content.browser.input.MultiFieldTimePickerDialog.OnMultiFieldTimeSetListener;
+import org.chromium.ui.DateTimePickerDialog.OnDateTimeSetListener;
+import org.chromium.ui.MultiFieldTimePickerDialog.OnMultiFieldTimeSetListener;
 
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Opens the approprate date/time picker dialog for the given dialog type.
+ * Opens the appropriate date/time picker dialog for the given dialog type.
  */
 public class InputDialogContainer {
 
-    interface InputActionDelegate {
+    public interface InputActionDelegate {

[ankit, 2014/09/18 13:05:19]

DateTimeChooserAndroid.java is implementing this interface.

         void cancelDateTimeDialog();
         void replaceDateTime(double value);
     }
 
     private static int sTextInputTypeDate;
     private static int sTextInputTypeDateTime;
     private static int sTextInputTypeDateTimeLocal;
     private static int sTextInputTypeMonth;
     private static int sTextInputTypeTime;
     private static int sTextInputTypeWeek;
 
     private final Context mContext;
 
     // Prevents sending two notifications (from onClick and from onDismiss)
     private boolean mDialogAlreadyDismissed;
 
     private AlertDialog mDialog;
     private final InputActionDelegate mInputActionDelegate;
 
-    static void initializeInputTypes(int textInputTypeDate,
+    public static void initializeInputTypes(int textInputTypeDate,

[ankit, 2014/09/18 13:05:19]

DateTimeChooserAndroid.java is using this method.

             int textInputTypeDateTime, int textInputTypeDateTimeLocal,
             int textInputTypeMonth, int textInputTypeTime,
             int textInputTypeWeek) {
         sTextInputTypeDate = textInputTypeDate;
         sTextInputTypeDateTime = textInputTypeDateTime;
         sTextInputTypeDateTimeLocal = textInputTypeDateTimeLocal;
         sTextInputTypeMonth = textInputTypeMonth;
         sTextInputTypeTime = textInputTypeTime;
         sTextInputTypeWeek = textInputTypeWeek;
     }
 
-    static boolean isDialogInputType(int type) {
+    public static boolean isDialogInputType(int type) {

[ankit, 2014/09/18 13:05:19]

ImeAdapter is using this method.

         return type == sTextInputTypeDate || type == sTextInputTypeTime
                 || type == sTextInputTypeDateTime || type == sTextInputTypeDateTimeLocal
                 || type == sTextInputTypeMonth || type == sTextInputTypeWeek;
     }
 
-    InputDialogContainer(Context context, InputActionDelegate inputActionDelegate) {
+    public InputDialogContainer(Context context, InputActionDelegate inputActionDelegate) {

[ankit, 2014/09/18 13:05:19]

InputDialogContainerForTests is extending this class.

         mContext = context;
         mInputActionDelegate = inputActionDelegate;
     }
 
-    void showPickerDialog(final int dialogType, double dialogValue,
+    public void showPickerDialog(final int dialogType, double dialogValue,

[ankit, 2014/09/18 13:05:19]

Overridden by InputDialogContainerTest.java

         double min, double max, double step) {
         Calendar cal;
         // |dialogValue|, |min|, |max| mean different things depending on the |dialogType|.
         // For input type=month is the number of months since 1970.
         // For input type=time it is milliseconds since midnight.
         // For other types they are just milliseconds since 1970.
         // If |dialogValue| is NaN it means an empty value. We will show the current time.
         if (Double.isNaN(dialogValue)) {
             cal = Calendar.getInstance();
             cal.set(Calendar.MILLISECOND, 0);
@@ skipping 97 matching lines @@
                 if (mDialog == dialog && !mDialogAlreadyDismissed) {
                     mDialogAlreadyDismissed = true;
                     mInputActionDelegate.cancelDateTimeDialog();
                 }
             }
         });
         mDialogAlreadyDismissed = false;
         mDialog.show();
     }
 
-    void showDialog(final int type, final double value,
+    public void showDialog(final int type, final double value,

[ankit, 2014/09/18 13:05:19]

DateTimeChooserAndroid.java is using this method.

                     double min, double max, double step,
                     DateTimeSuggestion[] suggestions) {
         // When the web page asks to show a dialog while there is one already open,
         // dismiss the old one.
         dismissDialog();
         if (suggestions == null) {
             showPickerDialog(type, value, min, max, step);
         } else {
             showSuggestionDialog(type, value, min, max, step, suggestions);
         }
     }
 
-    void showPickerDialog(final int dialogType,
+    protected void showPickerDialog(final int dialogType,

[aurimas (slooooooooow), 2014/09/17 15:58:38]

What is the reason for all the visibility (public/protected) changes in this and
other files? Can we also move the code that is requiring all these changes?

[ankit, 2014/09/18 13:05:19]

This funtions is overridden by InputDialogCotainerTest.java.

             int year, int month, int monthDay,
             int hourOfDay, int minute, int second, int millis, int week,
             double min, double max, double step) {
         if (isDialogShowing()) mDialog.dismiss();
 
         int stepTime = (int) step;
 
         if (dialogType == sTextInputTypeDate) {
             ChromeDatePickerDialog dialog = new ChromeDatePickerDialog(mContext,
                     new DateListener(dialogType),
@@ skipping 155 matching lines @@
             cal.set(Calendar.MONTH, month);
             cal.set(Calendar.DAY_OF_MONTH, monthDay);
             cal.set(Calendar.HOUR_OF_DAY, hourOfDay);
             cal.set(Calendar.MINUTE, minute);
             cal.set(Calendar.SECOND, second);
             cal.set(Calendar.MILLISECOND, millis);
             mInputActionDelegate.replaceDateTime(cal.getTimeInMillis());
         }
     }
 }