Improvements to the Payment Address Form UI

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

Index: 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 8217f88174c2d5c60292c2a84bdd83e66237e3f2..3bdfe75f14389e38b6dfea6df14c610af96012e3 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
@@ -79,6 +79,7 @@ public class EditorDialog
     private final Handler mHandler;
     private final TextView.OnEditorActionListener mEditorActionListener;
     private final int mHalfRowMargin;
+    private final int mDropdownTopPadding;
     private final List<EditorFieldView> mFieldViews;
     private final List<EditText> mEditableTextFields;
     private final List<Spinner> mDropdownFields;
@@ -131,6 +132,8 @@ public class EditorDialog
 
         mHalfRowMargin = activity.getResources().getDimensionPixelSize(
                 R.dimen.payments_section_large_spacing);
+        mDropdownTopPadding = activity.getResources().getDimensionPixelSize(
+                R.dimen.payments_section_dropdown_top_padding);
         mFieldViews = new ArrayList<>();
         mEditableTextFields = new ArrayList<>();
         mDropdownFields = new ArrayList<>();
@@ -360,6 +363,16 @@ public class EditorDialog
                 ApiCompatibilityUtils.setMarginEnd(firstParams, mHalfRowMargin);
                 lastParams.width = 0;
                 lastParams.weight = 1;
+
+                // Align the text field and the dropdown field.
+                if ((fieldModel.isTextField() && nextFieldModel.isDropdownField())
+                        || (nextFieldModel.isTextField() && fieldModel.isDropdownField())) {
+                    LinearLayout.LayoutParams dropdownParams =
+                            fieldModel.isDropdownField() ? firstParams : lastParams;
+                    dropdownParams.topMargin = mDropdownTopPadding;
+                    dropdownParams.bottomMargin = 0;
+                }
+
                 i = i + 1;
             }
         }