diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 106d0954..b3f4eeca 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../SuggestionsNavigationDelegate.java | 27 +- .../tile/MostVisitedTilesCoordinator.java | 6 +- .../tile/MostVisitedTilesGridLayout.java | 287 ++++++++++++++++++ - .../tile/MostVisitedTilesMediator.java | 11 +- + .../tile/MostVisitedTilesMediator.java | 12 +- .../tile/TileDragDelegateImpl.java | 16 +- .../suggestions/tile/TileRenderer.java | 8 +- .../suggestions/tile/TilesLinearLayout.java | 2 +- @@ -47,7 +47,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../Restore-Simplified-NTP-launch.inc | 12 + .../Restore-Simplified-NTP-launch.inc | 5 + .../Restore-Simplified-NTP-launch.inc | 1 + - 41 files changed, 631 insertions(+), 59 deletions(-) + 41 files changed, 631 insertions(+), 60 deletions(-) create mode 100644 chrome/android/java/res/drawable-hdpi/ic_most_visited_placeholder.png create mode 100644 chrome/android/java/res/drawable-mdpi/ic_most_visited_placeholder.png create mode 100644 chrome/android/java/res/drawable-xhdpi/ic_most_visited_placeholder.png @@ -1318,7 +1318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til TileRenderer renderer, PropertyModel propertyModel, boolean isTablet, -@@ -211,7 +211,6 @@ public class MostVisitedTilesMediator implements TileGroup.Observer { +@@ -211,20 +211,14 @@ public class MostVisitedTilesMediator implements TileGroup.Observer { @Override public void onCustomTileCreation(Tile tile) { @@ -1326,7 +1326,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til } @Override -@@ -221,10 +220,6 @@ public class MostVisitedTilesMediator implements TileGroup.Observer { + public void onCustomTileReorder(int newPos) { +- mMvTilesLayout.ensureTileIsInViewOnNextLayout(newPos); + } @Override public void onCustomTileNonReorderChange() { @@ -1337,7 +1339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til } public void onConfigurationChanged() { -@@ -334,7 +329,5 @@ public class MostVisitedTilesMediator implements TileGroup.Observer { +@@ -334,7 +328,5 @@ public class MostVisitedTilesMediator implements TileGroup.Observer { double firstTileScore = mTileGroup.getSuggestionScore(firstTile.getUrl()); if (firstTileScore < MVT_CUSTOMIZATION_IPH_TILE_SCORE_THRESHOULD) return;