From 2da33554f70f377709a30c9b63a443cf01d55321 Mon Sep 17 00:00:00 2001 From: Deep Date: Thu, 5 Nov 2020 03:06:36 -0500 Subject: [PATCH] Address PR comment --- android/java/res/values/brave_dimens.xml | 1 - ...suggestions-tile-TileGridLayout.java.patch | 20 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/android/java/res/values/brave_dimens.xml b/android/java/res/values/brave_dimens.xml index 00d9b8abad6..39ab637bcee 100644 --- a/android/java/res/values/brave_dimens.xml +++ b/android/java/res/values/brave_dimens.xml @@ -45,5 +45,4 @@ 36dp 6dp 4dp - 0dp diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-TileGridLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-TileGridLayout.java.patch index 2c00cc4b5ca..d8291e5235b 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-TileGridLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-TileGridLayout.java.patch @@ -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));