Line-wrap Reader Mode infobar if the text is too long

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

 // Copyright 2017 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.graphics.Bitmap;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import org.chromium.chrome.R;
 
 /**
  * Lays out controls along a line, sandwiched between an (optional) icon and close button.
  * This should only be used by the {@link InfoBar} class, and is created when the InfoBar subclass
  * declares itself to be using a compact layout via {@link InfoBar#usesCompactLayout}.
  */
 public class InfoBarCompactLayout extends LinearLayout implements View.OnClickListener {
     private final InfoBarView mInfoBarView;
     private final int mCompactInfoBarSize;
+    private final int mMessagePadding;
     private final View mCloseButton;
 
     InfoBarCompactLayout(
             Context context, InfoBarView infoBarView, int iconResourceId, Bitmap iconBitmap) {
         super(context);
         mInfoBarView = infoBarView;
         mCompactInfoBarSize =
                 context.getResources().getDimensionPixelOffset(R.dimen.infobar_compact_size);
+        mMessagePadding =
+                context.getResources().getDimensionPixelOffset(R.dimen.infobar_text_padding);
 
         setOrientation(LinearLayout.HORIZONTAL);
         setGravity(Gravity.CENTER_VERTICAL);
 
         prepareIcon(iconResourceId, iconBitmap);
         mCloseButton = prepareCloseButton();
     }
 
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.infobar_close_button) {
             mInfoBarView.onCloseButtonClicked();
         } else {
             assert false;
         }
     }
 
     /**
      * Inserts a view before the close button.
      * @param view   View to insert.
      * @param weight Weight to assign to it.
      */
     protected void addContent(View view, float weight) {
         LinearLayout.LayoutParams params;
         if (weight <= 0.0f) {
             params = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, mCompactInfoBarSize);
         } else {
-            params = new LinearLayout.LayoutParams(0, mCompactInfoBarSize);
-            params.weight = weight;
+            params = new LinearLayout.LayoutParams(0, LayoutParams.WRAP_CONTENT, weight);
         }
+        view.setPadding(0, mMessagePadding, 0, mMessagePadding);

[mdjones, 2017/06/27 20:17:18]

Why is this now needed? Does it affect the other compact infobars?

[wychen, 2017/06/27 20:38:57]

If the text fits in one line, the infobar is tall enough so that it naturally
has large white space between message and the border of infobars. When it is
wrapped, the space is too small, so padding is needed to make it look good.

This doesn't affect the looks if the text fits in one line, but it does affect
compact translation infobar. Moved to Reader Mode only.

+        view.setMinimumHeight(mCompactInfoBarSize);
         params.gravity = Gravity.BOTTOM;
         addView(view, indexOfChild(mCloseButton), params);
     }
 
     /**
      * Adds an icon to the start of the infobar, if the infobar requires one.
      * @param iconResourceId Resource ID of the icon to use.
      * @param iconBitmap     Raw {@link Bitmap} to use instead of a resource.
      */
     private void prepareIcon(int iconResourceId, Bitmap iconBitmap) {
         ImageView iconView = InfoBarLayout.createIconView(getContext(), iconResourceId, iconBitmap);
         if (iconView != null) {
             LinearLayout.LayoutParams iconParams =
                     new LinearLayout.LayoutParams(mCompactInfoBarSize, mCompactInfoBarSize);
             addView(iconView, iconParams);
         }
     }
 
     /** Adds a close button to the end of the infobar. */
     private View prepareCloseButton() {
         ImageButton closeButton = InfoBarLayout.createCloseButton(getContext());
         closeButton.setOnClickListener(this);
         LinearLayout.LayoutParams closeParams =
                 new LinearLayout.LayoutParams(mCompactInfoBarSize, mCompactInfoBarSize);
         addView(closeButton, closeParams);
         return closeButton;
     }
 }