commit 4b325fbec44c64bbe13371ecf29462c4fdd210cc
author Rouslan Solomakhin <rouslan@chromium.org> Fri Jun 09 22:45:03 2017
committer Commit Bot <commit-bot@chromium.org> Sat Jun 10 10:45:27 2017
tree 9b4ebb1ed5c58fb1714fcfc0c90596691864d195
parent 5a101abbe0fd58cfa3fdadfeacde86c8dd108ec7

Avoid method name conflict in payments editor dialog.

EditorDialog.dismissDialog() incorrectly overrides
Dialog.dismissDialog(). This prevents correctly dismissing the dialog on
older versions of Android, e.g., Kit Kat and Jelly Bean.

Bug: 730829
Change-Id: Idf43f85bf3c6e7ebd15f3b73bfdabf8bcc8161cb
Reviewed-on: https://chromium-review.googlesource.com/530344
Reviewed-by: Ganggui Tang <gogerald@chromium.org>
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#478514}

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java
index d4d1fff..c73f272 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java
@@ -200,7 +200,7 @@
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                dismissDialog();
+                animateOutDialog();
             }
         });
 
@@ -270,17 +270,17 @@
             if (validateForm()) {
                 if (mEditorModel != null) mEditorModel.done();
                 mEditorModel = null;
-                dismissDialog();
+                animateOutDialog();
                 return;
             }
 
             if (mObserverForTest != null) mObserverForTest.onPaymentRequestEditorValidationError();
         } else if (view.getId() == R.id.payments_edit_cancel_button) {
-            dismissDialog();
+            animateOutDialog();
         }
     }
 
-    private void dismissDialog() {
+    private void animateOutDialog() {
         if (mDialogInOutAnimator != null || !isShowing()) return;
 
         Animator dropDown =