Add support for images with descriptions to infobars

chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarControlLayout.java

 // Copyright 2015 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.infobar;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.support.v7.widget.SwitchCompat;
 import android.text.method.LinkMovementMethod;
@@ skipping 18 matching lines @@
  * This class works with the {@link InfoBarLayout} to define a standard set of controls with
  * standardized spacings and text styling that gets laid out in grid form: https://crbug.com/543205
  *
  * Manually specified margins on the children managed by this layout are EXPLICITLY ignored to
  * enforce a uniform margin between controls across all InfoBar types.  Do NOT circumvent this
  * restriction with creative layout definitions.  If the layout algorithm doesn't work for your new
  * InfoBar, convince Chrome for Android's UX team to amend the master spec and then change the
  * layout algorithm to match.
  *
  * TODO(dfalcantara): Standardize all the possible control types.
+ * TODO(dfalcantara): The line spacing multiplier is applied to all lines in JB & KK, even if the
+ *                    TextView has only one line.  This throws off vertical alignment.  Find a
+ *                    solution that hopefully doesn't involve subclassing the TextView.
  */
 public final class InfoBarControlLayout extends ViewGroup {
 
     /**
      * Extends the regular LayoutParams by determining where a control should be located.
      */
     @VisibleForTesting
     static final class ControlLayoutParams extends LayoutParams {
         public int start;
         public int top;
@@ skipping 129 matching lines @@
             if (isRtl) childLeft = width - childLeft - child.getMeasuredWidth();
 
             int childTop = getControlLayoutParams(child).top;
             int childRight = childLeft + child.getMeasuredWidth();
             int childBottom = childTop + child.getMeasuredHeight();
             child.layout(childLeft, childTop, childRight, childBottom);
         }
     }
 
     /**
+     * Adds an icon with a descriptive message to the layout.
+     *
+     * -----------------------------------------------------
+     * | ICON | PRIMARY MESSAGE SECONDARY MESSAGE          |
+     * -----------------------------------------------------
+     * If an icon is not provided, the ImageView that would normally show it is hidden.
+     *
+     * @param iconResourceId   ID of the drawable to use for the icon, or 0 to hide the ImageView.

[newt (away), 2016/01/05 21:20:53]

Do we need to allow 0 here? I'd prefer not to, unless there's an actual use
case.

In any case, it'll be strange to read code that says:

   controlLayout.addIcon(0, "some text", "some other text");

addIcon() doesn't seem like the right method name for a method that adds two
text views.

[gone, 2016/01/05 21:43:54]

Nope, carryover from a rebase.  Nuked it.

+     * @param primaryMessage   Message to display for the toggle.
+     * @param secondaryMessage Additional descriptive text for the toggle.  May be null.
+     */
+    public View addIcon(
+            int iconResourceId, CharSequence primaryMessage, CharSequence secondaryMessage) {
+        LinearLayout layout = (LinearLayout) LayoutInflater.from(getContext()).inflate(
+                R.layout.infobar_control_icon_with_description, this, false);
+        addView(layout, new ControlLayoutParams());
+
+        ImageView iconView = (ImageView) layout.findViewById(R.id.control_icon);
+        if (iconResourceId == 0) {
+            layout.removeView(iconView);
+        } else {
+            iconView.setImageResource(iconResourceId);
+        }
+
+        // The primary message text is always displayed.
+        TextView primaryView = (TextView) layout.findViewById(R.id.control_message);
+        primaryView.setText(primaryMessage);
+
+        // The secondary message text is optional.
+        TextView secondaryView =
+                (TextView) layout.findViewById(R.id.control_secondary_message);
+        if (secondaryMessage == null) {
+            layout.removeView(secondaryView);
+        } else {
+            secondaryView.setText(secondaryMessage);
+        }
+
+        return layout;
+    }
+
+    /**
      * Creates a standard toggle switch and adds it to the layout.
      *
      * -------------------------------------------------
      * | ICON | MESSAGE                       | TOGGLE |
      * -------------------------------------------------
      * If an icon is not provided, the ImageView that would normally show it is hidden.
      *
      * @param iconResourceId ID of the drawable to use for the icon, or 0 to hide the ImageView.
      * @param toggleMessage  Message to display for the toggle.
      * @param toggleId       ID to use for the toggle.
      * @param isChecked      Whether the toggle should start off checked.
      */
     public View addSwitch(
             int iconResourceId, CharSequence toggleMessage, int toggleId, boolean isChecked) {
         LinearLayout switchLayout = (LinearLayout) LayoutInflater.from(getContext()).inflate(
                 R.layout.infobar_control_toggle, this, false);
         addView(switchLayout, new ControlLayoutParams());
 
-        ImageView iconView = (ImageView) switchLayout.findViewById(R.id.control_toggle_icon);
+        ImageView iconView = (ImageView) switchLayout.findViewById(R.id.control_icon);
         if (iconResourceId == 0) {
             switchLayout.removeView(iconView);
         } else {
             iconView.setImageResource(iconResourceId);
         }
 
-        TextView messageView = (TextView) switchLayout.findViewById(R.id.control_toggle_message);
+        TextView messageView = (TextView) switchLayout.findViewById(R.id.control_message);
         messageView.setText(toggleMessage);
 
         SwitchCompat switchView =
                 (SwitchCompat) switchLayout.findViewById(R.id.control_toggle_switch);
         switchView.setId(toggleId);
         switchView.setChecked(isChecked);
 
         return switchLayout;
     }
 
@@ skipping 66 matching lines @@
 
     /**
      * @return The {@link ControlLayoutParams} for the given child.
      */
     @VisibleForTesting
     static ControlLayoutParams getControlLayoutParams(View child) {
         return (ControlLayoutParams) child.getLayoutParams();
     }
 
 }