Http Bad: Put icon on the left of warning message and make value and label in one line on Android

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 ec3505f48c6cf73cc9930993184030fe16dc0f4d..3bd92b25ab168cbc63d5c36c27ce8e8d95979206 100644
--- a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
+++ b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
@@ -52,11 +52,17 @@ public class DropdownAdapter extends ArrayAdapter<DropdownItem> {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
+        DropdownItem item = getItem(position);
+
         View layout = convertView;
         if (convertView == null) {
             LayoutInflater inflater =
                     (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            layout = inflater.inflate(R.layout.dropdown_item, null);
+            if (item.isIconOnLeft()) {
+                layout = inflater.inflate(R.layout.dropdown_item_left_icon, null);

[Ted C, 2016/11/28 18:29:11]

You can't actually use different layouts.  getView attempts to reuse views via
the passed in convertView.  By using different layouts, we are not going to be
able to distinguish between the two types and then are going to need to create a
new view each time, which is not a good thing.

If you do want to use different layouts (although I don't recommend it in this
case), then you'd need to overwrite getItemViewType and getViewTypeCount on the
adapter to inform them of these different types and have it reuse them
accordingly.

By using the same layout (with potentially two imageviews), you'll need to be
careful to always reset any previous state.

i.e. something like this:

ImageView iconViewStart = (ImageView) layout.findViewById(
        R.id.dropdown_icon_start);
ImageView iconViewEnd = (ImageView) layout.findViewById(
        R.id.dropdown_icon_end);
if (isIconAtStart()) {
    iconViewEnd.setVisibility(GONE);
} else {
    iconViewStart.setVisibility(GONE);
}

ImageView iconView = isIconAtStart() ? iconViewStart : iconViewEnd;

... existing image behavior ...

[lshang, 2016/11/30 10:35:43]

Done.

+            } else {
+                layout = inflater.inflate(R.layout.dropdown_item, null);
+            }
             layout.setBackground(new DropdownDividerDrawable());
         }
 
@@ -78,15 +84,14 @@ public class DropdownAdapter extends ArrayAdapter<DropdownItem> {
             }
         }
 
-        DropdownItem item = getItem(position);
-
         // Note: trying to set the height of the root LinearLayout breaks accessibility,
         // so we have to adjust the height of this LinearLayout that wraps the TextViews instead.
         // If you need to modify this layout, don't forget to test it with TalkBack and make sure
         // it doesn't regress.
         // http://crbug.com/429364
-        View wrapper = layout.findViewById(R.id.dropdown_label_wrapper);
+        LinearLayout wrapper = (LinearLayout) layout.findViewById(R.id.dropdown_label_wrapper);
         if (item.isMultilineLabel()) height = LayoutParams.WRAP_CONTENT;
+        wrapper.setOrientation(item.getLabelSublabelOrientation());
         wrapper.setLayoutParams(new LinearLayout.LayoutParams(0, height, 1));
 
         TextView labelView = (TextView) layout.findViewById(R.id.dropdown_label);