Always adds margin at the end of the label to handle case where label

ui/android/java/src/org/chromium/ui/DropdownAdapter.java

Index: ui/android/java/src/org/chromium/ui/DropdownAdapter.java
diff --git a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
index 28483d08125239592a9e418a43fd8b6b7b9728cc..c6ce8dca4d87eb38f052510d57fbb8993e58abc1 100644
--- a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
+++ b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
@@ -190,7 +190,11 @@ public class DropdownAdapter extends ArrayAdapter<DropdownItem> {
         if (TextUtils.isEmpty(sublabel)) {
             sublabelView.setVisibility(View.GONE);
         } else {
-            sublabelView.setLayoutParams(layoutParams);
+            // Use the layout params in |dropdown_item.xml| for the sublabel if it is on the same
+            // line as the label.
+            if (!item.isLabelAndSublabelOnSameLine()) {
+                sublabelView.setLayoutParams(layoutParams);

[Ted C, 2017/02/02 23:19:22]

by conditionally overwriting the layout params, if this view is reused where the
sublabel is on the same line, I think you'll get the wrong layout params.   I
think in the else case, you need to regenerate the default params.

[csashi, 2017/02/03 00:03:37]

Done.

+            }
             sublabelView.setText(sublabel);
             sublabelView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                     mContext.getResources().getDimension(item.getSublabelFontSizeResId()));