Revert of A drop-down should take a line to be always aligned with text-fields.

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

 // Copyright 2016 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.chrome.browser.payments.ui;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 303 matching lines @@
         mFieldViews.clear();
         mEditableTextFields.clear();
         mDropdownFields.clear();
 
         // Add Views for each of the {@link EditorFields}.
         for (int i = 0; i < mEditorModel.getFields().size(); i++) {
             EditorFieldModel fieldModel = mEditorModel.getFields().get(i);
             EditorFieldModel nextFieldModel = null;
 
             boolean isLastField = i == mEditorModel.getFields().size() - 1;
-            // Dropdown fields will take a full line
-            boolean useFullLine = fieldModel.isFullLine() || isLastField
-                    || (fieldModel.getInputTypeHint() == EditorFieldModel.INPUT_TYPE_HINT_DROPDOWN);
-
-            if (!useFullLine) {
+            boolean useFullLine = fieldModel.isFullLine();
+            if (!isLastField && !useFullLine) {
                 // If the next field isn't full, stretch it out.
                 nextFieldModel = mEditorModel.getFields().get(i + 1);
-                useFullLine = useFullLine || nextFieldModel.isFullLine()
-                        || (nextFieldModel.getInputTypeHint()
-                                   == EditorFieldModel.INPUT_TYPE_HINT_DROPDOWN);
+                if (nextFieldModel.isFullLine()) useFullLine = true;
             }
 
-            if (useFullLine) {
+            if (useFullLine || isLastField) {
                 addFieldViewToEditor(mDataView, fieldModel);
             } else {
                 // Create a LinearLayout to put it and the next view side by side.
                 LinearLayout rowLayout = new LinearLayout(mContext);
                 mDataView.addView(rowLayout);
 
                 View firstView = addFieldViewToEditor(rowLayout, fieldModel);
                 View lastView = addFieldViewToEditor(rowLayout, nextFieldModel);
 
                 LinearLayout.LayoutParams firstParams =
@@ skipping 196 matching lines @@
     public List<EditText> getEditableTextFieldsForTest() {
         return mEditableTextFields;
     }
 
     /** @return All dropdown fields in the editor. Used only for tests. */
     @VisibleForTesting
     public List<Spinner> getDropdownFieldsForTest() {
         return mDropdownFields;
     }
 }