Pull request #29: AP9-5181 Hide Chromium Bookmark functionality and Settings

Merge in AP/chromiumpatches from AP9-5181 to master

* commit '5acbe6c0188bf744759290fc0d68d02387fc7de7':
  AP9-5181 Hide Chromium Bookmark functionality and Settings
This commit is contained in:
wuyifeng 2022-05-05 10:00:49 +00:00
commit 1573b37a69
2 changed files with 53 additions and 1 deletions

View file

@ -194,4 +194,5 @@ Fix-google-web-apps-show-unsupported-message.patch
Update-telemetry-lib-implementation.patch
Fix-uncheck-desktop-site-no-effect.patch
Fix-not-current-site-when-tab-opened-blank-target.patch
Modify-default-url-AP9-5158.patch
Modify-default-url-AP9-5158.patch
Hide-bookmark-and-settings.patch

View file

@ -0,0 +1,51 @@
From: Yifeng <wuyifeng@nd.com.cn>
Date: Mon, 25 Apr 2022 07:00:00 +0000
Subject: AP9-5181 Hide Chromium Bookmark functionality and Settings
Fix version: 1.1.0
Hide the bookmark from the toolbar and the menu.
Hide the Settings from the menu.
---
chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java | 5 +++++
chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java | 2 +-
2 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
@@ -524,5 +524,10 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
// Only display the Enter VR button if VR Shell Dev environment is enabled.
menu.findItem(R.id.enter_vr_id).setVisible(isCurrentTabNotNull && shouldShowEnterVr());
+ // AP9-5181 Hide Bookmark functionality and Settings
+ menu.findItem(R.id.all_bookmarks_menu_id).setVisible(false);
+ menu.findItem(R.id.bookmark_all_tabs_menu_id).setVisible(false);
+ menu.findItem(R.id.preferences_id).setVisible(false);
+
updateManagedByMenuItem(menu, currentTab);
}
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java
@@ -54,6 +54,7 @@ class LocationBarTablet extends LocationBarLayout {
mBookmarkButton = findViewById(R.id.bookmark_button);
mSaveOfflineButton = findViewById(R.id.save_offline_button);
+ mBookmarkButton.setVisibility(View.GONE);
mTargets = new View[] {mUrlBar, mDeleteButton};
}
@@ -213,8 +214,10 @@ class LocationBarTablet extends LocationBarLayout {
}
}
+ @Deprecated
/* package */ void setBookmarkButtonVisibility(boolean showBookmarkButton) {
- mBookmarkButton.setVisibility(showBookmarkButton ? View.VISIBLE : View.GONE);
+ // From AP9-5181, we will hide the bookmark button.
+ // so this method won't do anything.
}
/* package */ void setSaveOfflineButtonVisibility(
2.17.1