diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index b7eaa80e..95f59bff 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -201,7 +201,6 @@ Enable-PermuteTLSExtensions-by-default.patch Enable-third-party-storage-partitioning.patch Restore-adaptive-button-in-top-toolbar-customization.patch Add-kill-switch-for-unsupported-clangd-flags.patch - 00OpenSearch--miscellaneous--fixup-.patch 00Eyeo-Adblock.patch 00Eyeo-Adblock-Remove-Privacy-Issues.patch diff --git a/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch b/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch index 025eab80..185a33e7 100644 --- a/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch +++ b/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch @@ -3,10 +3,10 @@ Date: Tue, 27 Dec 2022 16:58:28 +0000 Subject: Move navigation bar to bottom (add fixup) --- - .../TabListContainerViewBinder.java | 4 -- - .../tab_management/TabListCoordinator.java | 69 ++++++++++++++++++- + .../TabListContainerViewBinder.java | 4 - + .../tab_management/TabListCoordinator.java | 77 ++++++++++++++++++- .../tab_management/TabSwitcherMediator.java | 3 + - 3 files changed, 69 insertions(+), 7 deletions(-) + 3 files changed, 77 insertions(+), 7 deletions(-) diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java @@ -40,7 +40,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -@@ -98,6 +99,62 @@ public class TabListCoordinator +@@ -98,6 +99,70 @@ public class TabListCoordinator private boolean mLayoutListenerRegistered; private @Nullable TabStripSnapshotter mTabStripSnapshotter; @@ -49,7 +49,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser + + TabListRecyclerView mRecyclerView; + -+ int mTopPadding = -1; ++ int mTopPadding = 99999; + int mLastPosition = -1; + boolean mIsFirstLayout = true; + @@ -68,25 +68,33 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser + + @Override + public int getPaddingTop() { -+ if (mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) ++ if (mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { ++ mTopPadding = 99999; + return 0; -+ if (mTopPadding == -1) return super.getPaddingTop(); ++ } ++ if (mTopPadding == 99999) return super.getPaddingTop(); + return mTopPadding; + } + + @Override ++ public int getPaddingBottom() { ++ return 1; ++ } ++ ++ @Override + public void scrollToPositionWithOffset(int position, int offset) { + mLastPosition = position; -+ super.scrollToPositionWithOffset(position, -1); ++ super.scrollToPositionWithOffset(position, getPaddingBottom()); + } + + @Override + public void onLayoutCompleted(RecyclerView.State state) { + super.onLayoutCompleted(state); + ++ if (state.isPreLayout()) return; + View lastView = findViewByPosition(findFirstVisibleItemPosition()); + if (lastView != null) { -+ mTopPadding = mRecyclerView.getHeight() - lastView.getHeight(); ++ mTopPadding = Math.min(mTopPadding, mRecyclerView.getHeight() - lastView.getHeight()); + if (mIsFirstLayout) { + mIsFirstLayout = false; + scrollToPositionWithOffset(mLastPosition, 0); @@ -103,7 +111,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * Construct a coordinator for UI that shows a list of tabs. * @param mode Modes of showing the list of tabs. Can be used in GRID or STRIP. -@@ -258,9 +315,12 @@ public class TabListCoordinator +@@ -258,9 +323,12 @@ public class TabListCoordinator if (mMode == TabListMode.GRID) { GridLayoutManager gridLayoutManager = new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT); @@ -119,7 +127,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mRecyclerView.setLayoutManager(gridLayoutManager); mMediator.registerOrientationListener(gridLayoutManager); mMediator.updateSpanCount(gridLayoutManager, -@@ -440,6 +500,9 @@ public class TabListCoordinator +@@ -440,6 +508,9 @@ public class TabListCoordinator } registerLayoutChangeListener(); mRecyclerView.prepareTabSwitcherView(); diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index af7f7460..d301f25c 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -818,7 +818,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java -@@ -376,7 +376,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate +@@ -375,7 +375,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate // position 0 is on the left. Account for that in the offset calculation. boolean isRtl = LocalizationUtils.isLayoutRtl(); boolean useUnadjustedScrollOffset = isRtl != isLeft; diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index 89f31d2d..54fc7782 100644 --- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -4,15 +4,15 @@ Subject: Reduce HTTP headers in DoH requests to bare minimum License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - net/base/load_flags_list.h | 5 +++++ + net/base/load_flags_list.h | 6 ++++++ net/dns/dns_transaction.cc | 2 +- net/url_request/url_request_http_job.cc | 8 ++++++-- - 3 files changed, 12 insertions(+), 3 deletions(-) + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h --- a/net/base/load_flags_list.h +++ b/net/base/load_flags_list.h -@@ -101,3 +101,8 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15) +@@ -101,3 +101,9 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15) // is considered privileged, and therefore this flag must only be set from a // trusted process. LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 16) @@ -21,6 +21,7 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h +// Used to comply with IETF (draft) DNS-over-HTTPS: +// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests." +LOAD_FLAG(MINIMAL_HEADERS, 1 << 19) ++ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc