diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index d5159d45..7367e28d 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -274,6 +274,7 @@ Timezone-customization.patch 00Enable-Android-Dynamic-Performance-Framework.patch 00Remove-GoogleAccountsPrivateApiHost.patch 00Fix-crash-on-customize-profile-ui.patch +00Enable-ImprovedBookmarks-by-default.patch 00Temp-Disable-kAutomaticLazyFrameLoadingToEmbeds.patch 00Temp-disable-predictive-back-gesture.patch diff --git a/build/patches/00Enable-ImprovedBookmarks-by-default.patch b/build/patches/00Enable-ImprovedBookmarks-by-default.patch new file mode 100644 index 00000000..3e068a90 --- /dev/null +++ b/build/patches/00Enable-ImprovedBookmarks-by-default.patch @@ -0,0 +1,113 @@ +From: uazo +Date: Tue, 12 Sep 2023 12:39:23 +0000 +Subject: Enable ImprovedBookmarks by default + +License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +--- + chrome/android/java/res/layout/bookmark_search_box_row.xml | 6 +++--- + .../chromium/chrome/browser/bookmarks/BookmarkFeatures.java | 2 +- + .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java | 2 ++ + .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java | 2 +- + .../chromium/chrome/browser/bookmarks/BookmarkUtils.java | 3 ++- + chrome/browser/flags/android/chrome_feature_list.cc | 2 +- + 6 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/chrome/android/java/res/layout/bookmark_search_box_row.xml b/chrome/android/java/res/layout/bookmark_search_box_row.xml +--- a/chrome/android/java/res/layout/bookmark_search_box_row.xml ++++ b/chrome/android/java/res/layout/bookmark_search_box_row.xml +@@ -31,9 +31,9 @@ found in the LICENSE file. + android:textAppearance="@style/TextAppearance.TextLarge.Primary" /> + + + + + +- +\ No newline at end of file ++ +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java +@@ -14,7 +14,7 @@ import org.chromium.chrome.browser.flags.MutableFlagWithSafeDefault; + */ + public class BookmarkFeatures { + private static final MutableFlagWithSafeDefault sAndroidImprovedBookmarksFlag = +- new MutableFlagWithSafeDefault(ChromeFeatureList.ANDROID_IMPROVED_BOOKMARKS, false); ++ new MutableFlagWithSafeDefault(ChromeFeatureList.ANDROID_IMPROVED_BOOKMARKS, true); + + /** Returns whether an additional "add bookmark" item should be in the overflow menu. */ + public static boolean isBookmarkMenuItemAsDedicatedRowEnabled() { +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java +@@ -5,6 +5,7 @@ + package org.chromium.chrome.browser.bookmarks; + + import android.view.View; ++import android.view.ViewGroup; + + import androidx.annotation.DrawableRes; + import androidx.annotation.StringRes; +@@ -20,6 +21,7 @@ class BookmarkSearchBoxRowViewBinder { + static void bind(PropertyModel model, View view, PropertyKey key) { + BookmarkSearchBoxRow row = (BookmarkSearchBoxRow) view; + ChipView shoppingChip = view.findViewById(R.id.shopping_filter_chip); ++ shoppingChip.setVisibility(ViewGroup.GONE); + if (key == BookmarkSearchBoxRowProperties.QUERY_CALLBACK) { + row.setQueryCallback(model.get(BookmarkSearchBoxRowProperties.QUERY_CALLBACK)); + } else if (key == BookmarkSearchBoxRowProperties.SHOPPING_CHIP_VISIBILITY) { +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java +@@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; + */ + public class BookmarkUiPrefs { + private static final @BookmarkRowDisplayPref int INITIAL_BOOKMARK_ROW_DISPLAY_PREF = +- BookmarkRowDisplayPref.VISUAL; ++ BookmarkRowDisplayPref.COMPACT; + private static final @BookmarkRowSortOrder int INITIAL_BOOKMARK_ROW_SORT_ORDER = + BookmarkRowSortOrder.REVERSE_CHRONOLOGICAL; + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.app.bookmarks.BookmarkAddEditFolderActivity; + import org.chromium.chrome.browser.app.bookmarks.BookmarkEditActivity; + import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderPickerActivity; + import org.chromium.chrome.browser.app.bookmarks.BookmarkFolderSelectActivity; ++import org.chromium.chrome.browser.bookmarks.BookmarkFeatures; + import org.chromium.chrome.browser.bookmarks.BookmarkUiPrefs.BookmarkRowDisplayPref; + import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; + import org.chromium.chrome.browser.document.ChromeLauncherActivity; +@@ -405,7 +406,7 @@ public class BookmarkUtils { + RecordUserAction.record("MobileBookmarkManagerReopenBookmarksInSameSession"); + } + +- if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) { ++ if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled() || DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) { + showBookmarkManagerOnTablet(context, + activity == null ? null : activity.getComponentName(), url, isIncognito); + } else { +diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc +--- a/chrome/browser/flags/android/chrome_feature_list.cc ++++ b/chrome/browser/flags/android/chrome_feature_list.cc +@@ -495,7 +495,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification, + + BASE_FEATURE(kAndroidImprovedBookmarks, + "AndroidImprovedBookmarks", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ base::FEATURE_ENABLED_BY_DEFAULT); + + BASE_FEATURE(kAnimatedImageDragShadow, + "AnimatedImageDragShadow", +-- +2.25.1