Properly dismiss the InputDialogs in all cases

content/public/android/java/src/org/chromium/content/browser/input/InputDialogContainer.java

 // Copyright (c) 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;
 
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
 import android.app.DatePickerDialog.OnDateSetListener;
@@ skipping 150 matching lines @@
             mDialog = new WeekPickerDialog(mContext, new MonthOrWeekListener(dialogType),
                     year, week, minTime, maxTime);
         }
 
         mDialog.setButton(DialogInterface.BUTTON_POSITIVE,
                 mContext.getText(R.string.date_picker_dialog_set),
                 (DialogInterface.OnClickListener) mDialog);
 
         mDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
                 mContext.getText(android.R.string.cancel),
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        mDialogAlreadyDismissed = true;
-                        mInputActionDelegate.cancelDateTimeDialog();
-                    }
-                });
+                (DialogInterface.OnClickListener) null);
 
         mDialog.setButton(DialogInterface.BUTTON_NEUTRAL,
                 mContext.getText(R.string.date_picker_dialog_clear),
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         mDialogAlreadyDismissed = true;
                         mInputActionDelegate.replaceDateTime(dialogType, 0, 0, 0, 0, 0, 0, 0, 0);
                     }
                 });
 
+        mDialog.setOnDismissListener(
+                new OnDismissListener() {
+                    public void onDismiss(final DialogInterface dialog) {
+                        if (!mDialogAlreadyDismissed) {
+                            mDialogAlreadyDismissed = true;
+                            mInputActionDelegate.cancelDateTimeDialog();
+                        }
+                    }
+                });
+
         mDialogAlreadyDismissed = false;
         mDialog.show();
     }
 
     boolean isDialogShowing() {
         return mDialog != null && mDialog.isShowing();
     }
 
     void dismissDialog() {
         if (isDialogShowing()) mDialog.dismiss();
@@ skipping 108 matching lines @@
             int year, int month, int monthDay, int hourOfDay,
             int minute, int second, int milli, int week, String dateFormat) {
         // Prevents more than one callback being sent to the native
         // side when the dialog triggers multiple events.
         mDialogAlreadyDismissed = true;
 
         mInputActionDelegate.replaceDateTime(
             dialogType, year, month, monthDay, hourOfDay, minute, second, milli, week);
     }
 }