Use-4-tile-rows-never-show-logo.patch
This commit is contained in:
parent
927f2321dc
commit
8a9b3aaa1a
1 changed files with 40 additions and 22 deletions
|
@ -3,12 +3,12 @@ Date: Wed, 21 Feb 2018 00:32:09 +0100
|
|||
Subject: Use 4 tile rows, never show logo
|
||||
|
||||
---
|
||||
.../org/chromium/chrome/browser/ntp/NewTabPageLayout.java | 6 +++---
|
||||
.../suggestions/mostvisited/MostVisitedSitesBridge.java | 2 +-
|
||||
.../chrome/browser/suggestions/tile/SiteSection.java | 2 +-
|
||||
chrome/browser/engagement/important_sites_util.cc | 2 +-
|
||||
components/history/core/browser/top_sites_impl.h | 2 +-
|
||||
5 files changed, 7 insertions(+), 7 deletions(-)
|
||||
.../org/chromium/chrome/browser/ntp/NewTabPageLayout.java | 6 +++---
|
||||
.../suggestions/mostvisited/MostVisitedSitesBridge.java | 2 +-
|
||||
.../chrome/browser/suggestions/tile/SiteSection.java | 8 ++++++--
|
||||
chrome/browser/engagement/important_sites_util.cc | 2 +-
|
||||
components/history/core/browser/top_sites_impl.h | 2 +-
|
||||
5 files changed, 12 insertions(+), 8 deletions(-)
|
||||
|
||||
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
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
|
||||
|
@ -22,7 +22,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
|||
private boolean mSearchProviderIsGoogle;
|
||||
private boolean mShowingNonStandardLogo;
|
||||
|
||||
@@ -533,7 +533,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
@@ -243,7 +243,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
mTileGroup = new TileGroup(tileRenderer, mManager, contextMenuManager, tileGroupDelegate,
|
||||
/* observer = */ this, offlinePageBridge);
|
||||
|
||||
- int maxRows = 2;
|
||||
+ int maxRows = 4;
|
||||
if (searchProviderIsGoogle && QueryTileUtils.isQueryTilesEnabledOnNTP()) {
|
||||
maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext());
|
||||
}
|
||||
@@ -538,7 +538,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
&& mInitialized) {
|
||||
return;
|
||||
}
|
||||
|
@ -31,15 +40,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
|||
mSearchProviderIsGoogle = isGoogle;
|
||||
|
||||
updateTileGridPadding();
|
||||
@@ -805,7 +805,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
Integer maxRows = mQueryTileSection == null
|
||||
? null
|
||||
: mQueryTileSection.getMaxRowsForMostVisitedTiles();
|
||||
- return maxRows == null ? 2 : maxRows.intValue();
|
||||
+ return maxRows == null ? 4 : maxRows.intValue();
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
|
||||
|
@ -55,19 +55,37 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mos
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
|
||||
@@ -109,7 +109,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
|
||||
@@ -45,7 +45,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
|
||||
|
||||
public static SiteSectionViewHolder createViewHolder(
|
||||
ViewGroup view, UiConfig uiConfig, int maxRows) {
|
||||
- return new TileGridViewHolder(view, maxRows, MAX_TILE_COLUMNS);
|
||||
+ return new TileGridViewHolder(view, getMaxTileRows(maxRows), MAX_TILE_COLUMNS);
|
||||
}
|
||||
|
||||
private static int getMaxTileRows() {
|
||||
- return 2;
|
||||
+ return 4;
|
||||
public SiteSection(SuggestionsUiDelegate uiDelegate, ContextMenuManager contextMenuManager,
|
||||
@@ -56,7 +56,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
|
||||
uiDelegate.getImageFetcher());
|
||||
mTileGroup = new TileGroup(mTileRenderer, uiDelegate, contextMenuManager, tileGroupDelegate,
|
||||
/* observer = */ this, offlinePageBridge);
|
||||
- mTileGroup.startObserving(MAX_TILE_COLUMNS * maxRows);
|
||||
+ mTileGroup.startObserving(MAX_TILE_COLUMNS * getMaxTileRows(maxRows));
|
||||
}
|
||||
|
||||
@LayoutRes
|
||||
@Override
|
||||
@@ -113,4 +113,8 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
|
||||
private static int getLayout() {
|
||||
return R.layout.suggestions_site_tile_grid_modern;
|
||||
}
|
||||
+
|
||||
+ private static int getMaxTileRows(int currentMax) {
|
||||
+ return Math.max(currentMax, 4);
|
||||
+ }
|
||||
}
|
||||
diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc
|
||||
--- a/chrome/browser/engagement/important_sites_util.cc
|
||||
+++ b/chrome/browser/engagement/important_sites_util.cc
|
||||
@@ -63,7 +63,7 @@ static const int kTimesIgnoredForBlacklist = 3;
|
||||
@@ -66,7 +66,7 @@ static const int kTimesIgnoredForSuppression = 3;
|
||||
// These are the maximum # of bookmarks we can use as signals. If the user has
|
||||
// <= kMaxBookmarks, then we just use those bookmarks. Otherwise we filter all
|
||||
// bookmarks on site engagement > 0, sort, and trim to kMaxBookmarks.
|
||||
|
|
Loading…
Add table
Reference in a new issue