94 lines
5.5 KiB
Diff
94 lines
5.5 KiB
Diff
From: uazo <uazo@users.noreply.github.com>
|
|
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 | 4 ++--
|
|
.../chrome/browser/bookmarks/BookmarkManagerOpenerImpl.java | 4 ++--
|
|
.../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java | 2 ++
|
|
.../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java | 2 +-
|
|
components/bookmarks/browser/bookmark_node.cc | 3 +--
|
|
5 files changed, 8 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
|
|
@@ -36,8 +36,8 @@ found in the LICENSE file.
|
|
<!-- Bookmarks also needs an area for chips. -->
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
- android:layout_height="48dp"
|
|
- android:layout_marginTop="6dp"
|
|
+ android:layout_height="wrap_content"
|
|
+ android:layout_marginTop="0dp"
|
|
android:orientation="horizontal">
|
|
<org.chromium.components.browser_ui.widget.chips.ChipView
|
|
android:id="@+id/shopping_filter_chip"
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerOpenerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerOpenerImpl.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerOpenerImpl.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerOpenerImpl.java
|
|
@@ -55,7 +55,7 @@ public class BookmarkManagerOpenerImpl implements BookmarkManagerOpener {
|
|
RecordUserAction.record("MobileBookmarkManagerReopenBookmarksInSameSession");
|
|
}
|
|
|
|
- if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(activity)) {
|
|
+ if ((true)) {
|
|
showBookmarkManagerOnTablet(
|
|
activity, tab, activity.getComponentName(), url, isIncognito);
|
|
} else {
|
|
@@ -128,7 +128,7 @@ public class BookmarkManagerOpenerImpl implements BookmarkManagerOpener {
|
|
Browser.EXTRA_APPLICATION_ID, context.getApplicationContext().getPackageName());
|
|
IntentHandler.setTabLaunchType(intent, TabLaunchType.FROM_CHROME_UI);
|
|
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
- intent.putExtra(Browser.EXTRA_CREATE_NEW_TAB, true);
|
|
+ intent.putExtra(Browser.EXTRA_CREATE_NEW_TAB, false);
|
|
intent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, isIncognito);
|
|
intent.putExtra(IntentHandler.EXTRA_PARENT_TAB_ID, tab != null ? tab.getId() : 0);
|
|
|
|
diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java
|
|
--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSearchBoxRowViewBinder.java
|
|
+++ b/chrome/browser/bookmarks/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;
|
|
@@ -35,6 +36,7 @@ class BookmarkSearchBoxRowViewBinder {
|
|
private void bindInternal(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.SEARCH_TEXT_CHANGE_CALLBACK) {
|
|
Callback<String> callback =
|
|
wrapCallback(model, BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK);
|
|
diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
|
|
--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
|
|
+++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java
|
|
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
|
|
@NullMarked
|
|
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.MANUAL;
|
|
|
|
diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc
|
|
--- a/components/bookmarks/browser/bookmark_node.cc
|
|
+++ b/components/bookmarks/browser/bookmark_node.cc
|
|
@@ -171,8 +171,7 @@ bool BookmarkPermanentNode::IsTypeVisibleWhenEmpty(Type type) {
|
|
case BookmarkNode::BOOKMARK_BAR:
|
|
return is_desktop;
|
|
case BookmarkNode::OTHER_NODE:
|
|
- return is_desktop || base::FeatureList::IsEnabled(
|
|
- kAllBookmarksBaselineFolderVisibility);
|
|
+ return true;
|
|
case BookmarkNode::MOBILE:
|
|
// Either MOBILE or OTHER_NODE is visible when empty, but never both.
|
|
return !IsTypeVisibleWhenEmpty(BookmarkNode::OTHER_NODE);
|
|
--
|