Address PR comment
This commit is contained in:
@@ -45,5 +45,4 @@
|
||||
<dimen name="search_accelerator_height">36dp</dimen>
|
||||
<dimen name="search_accelerator_height_padding">6dp</dimen>
|
||||
<dimen name="search_accelerator_width_margin">4dp</dimen>
|
||||
<dimen name="zero_margin">0dp</dimen>
|
||||
</resources>
|
||||
|
||||
+10
-10
@@ -1,13 +1,13 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java
|
||||
index 71ee0a73800d7764d79ce01b6958d9baf54eae26..731fb502e2aa01de6b08b271a907405c9d96e58b 100644
|
||||
index 71ee0a73800d7764d79ce01b6958d9baf54eae26..162d8c3657aaf3e956072ee636b1a1ee530b1485 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java
|
||||
@@ -45,7 +45,7 @@ public class TileGridLayout extends FrameLayout {
|
||||
TypedArray styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.TileGridLayout);
|
||||
mMinHorizontalSpacing = styledAttrs.getDimensionPixelOffset(
|
||||
R.styleable.TileGridLayout_minHorizontalSpacing,
|
||||
- res.getDimensionPixelOffset(R.dimen.tile_grid_layout_min_horizontal_spacing));
|
||||
+ res.getDimensionPixelOffset(R.dimen.zero_margin));
|
||||
styledAttrs.recycle();
|
||||
mMaxHorizontalSpacing = Integer.MAX_VALUE;
|
||||
mMaxWidth = Integer.MAX_VALUE;
|
||||
@@ -159,7 +159,7 @@ public class TileGridLayout extends FrameLayout {
|
||||
}
|
||||
}
|
||||
|
||||
- assert horizontalSpacing >= mMinHorizontalSpacing;
|
||||
+ if(false)assert horizontalSpacing >= mMinHorizontalSpacing;
|
||||
assert horizontalSpacing <= mMaxHorizontalSpacing;
|
||||
|
||||
return Pair.create(gridStart, Math.round(horizontalSpacing));
|
||||
|
||||
Reference in New Issue
Block a user