diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index e4e6792b42a..2eb590bb6f0 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -97,9 +97,11 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.query_tiles.BraveQueryTileSection; import org.chromium.chrome.browser.settings.BackgroundImagesPreferences; import org.chromium.chrome.browser.settings.BraveNewsPreferences; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; +import org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesGridLayout; import org.chromium.chrome.browser.suggestions.tile.TileGroup; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabAttributes; @@ -1059,6 +1061,22 @@ public class BraveNewTabPageLayout searchProviderIsGoogle, scrollDelegate, touchEnabledDelegate, uiConfig, lifecycleDispatcher, uma, isIncognito, windowAndroid); + assert mMvTilesContainerLayout != null : "Something has changed in the upstream!"; + + if (mMvTilesContainerLayout != null && !isScrollableMvtEnabled()) { + ViewGroup tilesLayout = mMvTilesContainerLayout.findViewById(R.id.mv_tiles_layout); + + assert tilesLayout + instanceof MostVisitedTilesGridLayout + : "Something has changed in the upstream!"; + + if (tilesLayout instanceof MostVisitedTilesGridLayout) { + ((MostVisitedTilesGridLayout) tilesLayout) + .setMaxRows( + BraveQueryTileSection.getMaxRowsForMostVisitedTiles(getContext())); + } + } + assert (activity instanceof BraveActivity); mActivity = activity; ((BraveActivity) mActivity).dismissShieldsTooltip(); diff --git a/android/java/res/values/brave_dimens.xml b/android/java/res/values/brave_dimens.xml index e17aba112a8..a99ccffe4bd 100644 --- a/android/java/res/values/brave_dimens.xml +++ b/android/java/res/values/brave_dimens.xml @@ -54,4 +54,7 @@ 15dp 0dp + + + 0dp diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch deleted file mode 100644 index 42cdcbe5216..00000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -index c20e3848e3283ffd215003a233890987217cd911..54488a96edd4d1e3b03937ec18778db1cba64790 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -329,6 +329,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { - assert mMvTilesContainerLayout != null; - - int maxRows = 2; -+ maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext()); - if (searchProviderIsGoogle && QueryTileUtils.isQueryTilesEnabledOnNTP()) { - maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext()); - } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-MostVisitedTilesGridLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-MostVisitedTilesGridLayout.java.patch deleted file mode 100644 index 9289d76af86..00000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-MostVisitedTilesGridLayout.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java -index 3a38f2432a943dafdfaaaeb9b06fdc08aefd534c..ca095a1adf4fc5d6904cda5ccdf6eb8725cb1144 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java -@@ -164,7 +164,7 @@ public class MostVisitedTilesGridLayout extends FrameLayout { - } - } - -- assert horizontalSpacing >= mMinHorizontalSpacing; -+ if(false)assert horizontalSpacing >= mMinHorizontalSpacing; - assert horizontalSpacing <= mMaxHorizontalSpacing; - - return Pair.create(gridStart, Math.round(horizontalSpacing));