Re-expand payments UI after cancelling out of a payment app.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
index ba2101cdea40220ad2db7203d6fc5104c2fa2c59..9e38baabe59b92a7d32f73461bafb371717f6498 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
@@ -829,18 +829,20 @@ public class PaymentRequestUI implements DialogInterface.OnDismissListener, View
 
             // Turn the bottom sheet back into a collapsed bottom sheet showing only the spinner.
             // TODO(dfalcantara): Animate this: https://crbug.com/621955
-            FrameLayout.LayoutParams params =
-                    (FrameLayout.LayoutParams) mRequestView.getLayoutParams();
-            params.width = LayoutParams.MATCH_PARENT;
-            params.height = LayoutParams.WRAP_CONTENT;
-            params.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;

[gone, 2016/10/24 18:03:19]

Were the width and gravity params not required anymore?  They might have been
required because this thing flipped between being a bottom sheet and floaty
dialog, but I don't know what the current state of the world is.

[please use gerrit instead, 2016/10/24 18:59:11]

The width and gravity are always MATCH_PARENT and CENTER_HORIZONTAL|BOTTOM. See
line 385.

+            ((FrameLayout.LayoutParams) mRequestView.getLayoutParams()).height =
+                    LayoutParams.WRAP_CONTENT;
             mRequestView.requestLayout();
         } else {
             mRequestView.removeView(mSpinnyLayout);
             mRequestView.addView(mPaymentContainer);
             mRequestView.addView(mButtonBar);
 
-            if (mIsShowingEditDialog) expand(mSelectedSection);
+            if (mIsShowingEditDialog) {
+                ((FrameLayout.LayoutParams) mRequestView.getLayoutParams()).height =
+                        LayoutParams.MATCH_PARENT;
+                mRequestView.requestLayout();
+                expand(mSelectedSection);
+            }
         }
     }