Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarCompactLayout.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarCompactLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarCompactLayout.java |
index 285ef4f5b0106bd75eb9466d3a9979af999d0ae3..8eed799b8c129cec0055836a98226e28cf00951b 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarCompactLayout.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarCompactLayout.java |
@@ -22,6 +22,7 @@ import org.chromium.chrome.R; |
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( |
@@ -30,6 +31,8 @@ public class InfoBarCompactLayout extends LinearLayout implements View.OnClickLi |
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); |
@@ -57,9 +60,10 @@ public class InfoBarCompactLayout extends LinearLayout implements View.OnClickLi |
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 c
wychen
2017/06/27 20:38:57
If the text fits in one line, the infobar is tall
|
+ view.setMinimumHeight(mCompactInfoBarSize); |
params.gravity = Gravity.BOTTOM; |
addView(view, indexOfChild(mCloseButton), params); |
} |