Browse Source

Fix paths

tags/86.0.4240.111-1
wchen342 10 months ago
parent
commit
b4f185fc6d
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
7 changed files with 85 additions and 61 deletions
  1. +6
    -0
      CHANGELOG.md
  2. +5
    -0
      README.md
  3. +5
    -2
      build.sh
  4. +4
    -6
      bundle_generate_apk.sh
  5. +1
    -1
      keystore_dummy.gn
  6. +13
    -13
      patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch
  7. +51
    -39
      patches/ungoogled-chromium-android/Remove-UI-elements.patch

+ 6
- 0
CHANGELOG.md View File

@ -1,3 +1,9 @@
# 86.0.4240.111-1
* Custom DoH setting is removed since it is supported natively.
* `ChromeModernPublic` is also generated from bundle file now since Google removed the `apk` target.
* Other minor fixes.
* Note: *apk signatures are changed* as I lost access to my `keystore` file during my move, so it is normal to see `Wrong signature` while installing. GPG keys for signing binary releases are still valid.
# 85.0.4183.121-1
* Upstream update


+ 5
- 0
README.md View File

@ -24,6 +24,7 @@ For more information on `ungoogled-chromium`, please visit the original repo: [E
* [TODO List](#todo-list)
* [Credits](#credits)
* [Related Projects](#related-projects)
* [Sponsors](#sponsors)
* [License](#license)
## Differences from ungoogled-chromium
@ -114,6 +115,10 @@ You can use f-Droid client and add [this repository](https://www.droidware.info/
* [Bromite](https://github.com/bromite/bromite) (Another build for Android. Has some own features.)
## Sponsors
* Thanks to [Gandi.net](https://www.gandi.net/) for kindly providing us with building servers.
## License
See [LICENSE](LICENSE.md)

+ 5
- 2
build.sh View File

@ -265,7 +265,7 @@ pushd src
mkdir -p out/Default
if [ "$DEBUG" = n ] ; then
cat ../ungoogled-chromium/flags.gn ../android_flags.gn ../android_flags.release.gn > out/Default/args.gn
cat ../../keystore/keystore.gn >> out/Default/args.gn
cat ../../uc_keystore/keystore.gn >> out/Default/args.gn
else
cat ../android_flags.gn ../android_flags.debug.gn > out/Default/args.gn
fi
@ -283,9 +283,12 @@ export CXX=${CXX:=clang++}
## Build
pushd src
ninja -C out/Default $TARGET
if [[ "$TARGET" == "$trichrome_chrome_bundle_target" ]]; then
ninja -C out/Default "$trichrome_chrome_apk_target"
fi
popd
# Extract apk from aab for Trichrome
pushd src
../trichrome_generate_apk.sh
../bundle_generate_apk.sh -o out/Default -t $TARGET
popd

+ 4
- 6
bundle_generate_apk.sh View File

@ -3,9 +3,9 @@
set -o errexit -o nounset -o pipefail
KEYSTORE=$PWD/../../keystore/ungoogled-chromium-release-key-1.keystore
KEYSTORE_PASS=$PWD/../../keystore/keystore_pass
APKSIGNER=$PWD/third_party/android_sdk/public/build-tools/29.0.2/apksigner
KEYSTORE=$PWD/../../uc_keystore/uc-release-key.keystore
KEYSTORE_PASS=$PWD/../../uc_keystore/keystore_pass
APKSIGNER=$PWD/third_party/android_sdk/public/build-tools/30.0.1/apksigner
BUNDLETOOL=$PWD/build/android/gyp/bundletool.py
AAPT2=$PWD/third_party/android_build_tools/aapt2/aapt2
@ -76,11 +76,9 @@ fi
case "$TARGET" in
"$chrome_modern_target")
FILENAME="ChromeModernPublic"
break
;;
"$trichrome_chrome_bundle_target")
FILENAME="TrichromeChrome"
break
;;
*)
echo "Filename parsing error"
@ -96,7 +94,7 @@ rm -rf release
mkdir release
cd release
$BUNDLETOOL build-apks --aapt2 $AAPT2 --bundle ../"$FILENAME".aab --output "$FILENAME".apks --mode=universal --ks $KEYSTORE --ks-pass file:$KEYSTORE_PASS --ks-key-alias uc_release
$BUNDLETOOL build-apks --aapt2 $AAPT2 --bundle ../"$FILENAME".aab --output "$FILENAME".apks --mode=universal --ks $KEYSTORE --ks-pass file:$KEYSTORE_PASS --ks-key-alias uc
unzip "$FILENAME".apks universal.apk
mv universal.apk "$FILENAME".apk


+ 1
- 1
keystore_dummy.gn View File

@ -1,4 +1,4 @@
android_keystore_name=""
android_keystore_password=""
android_keystore_path="//../../keystore/ungoogled-chromium-release-key.keystore"
android_keystore_path="//../../uc_keystore/ungoogled-chromium-release-key.keystore"
trichrome_certdigest=""

+ 13
- 13
patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch View File

@ -3,11 +3,11 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
Subject: Add option to not persist tabs across sessions
---
chrome/android/java/res/values/values.xml | 3 +++
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
.../chrome/browser/ChromeTabbedActivity.java | 4 +++-
.../browser/privacy/settings/PrivacySettings.java | 12 ++++++++++--
.../ui/android/strings/android_chrome_strings.grd | 6 ++++++
chrome/android/java/res/values/values.xml | 3 ++
chrome/android/java/res/xml/privacy_preferences.xml | 6 +++++
chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java | 4 ++-
chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java | 11 ++++++++--
chrome/browser/ui/android/strings/android_chrome_strings.grd | 6 +++++
5 files changed, 27 insertions(+), 3 deletions(-)
--- a/chrome/android/java/res/values/values.xml
@ -37,7 +37,7 @@ Subject: Add option to not persist tabs across sessions
</PreferenceScreen>
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1044,8 +1044,10 @@
@@ -1044,8 +1044,10 @@ public class ChromeTabbedActivity extend
boolean hadCipherData =
CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
@ -59,7 +59,7 @@ Subject: Add option to not persist tabs across sessions
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
@@ -14,6 +15,7 @@
@@ -14,6 +15,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
@ -67,7 +67,7 @@ Subject: Add option to not persist tabs across sessions
import org.chromium.base.BuildInfo;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -41,6 +43,7 @@
@@ -41,6 +43,7 @@ import org.chromium.ui.text.SpanApplier;
*/
public class PrivacySettings
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
@ -75,16 +75,16 @@ Subject: Add option to not persist tabs across sessions
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
private static final String PREF_SECURE_DNS = "secure_dns";
@@ -51,7 +54,7 @@
@@ -50,7 +53,7 @@ public class PrivacySettings
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,
PREF_SAFE_BROWSING, PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS, PREF_USAGE_STATS,
- PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_SYNC_AND_SERVICES_LINK};
+ PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_SYNC_AND_SERVICES_LINK, PREF_CLOSE_TABS_ON_EXIT};
- PREF_SECURE_DNS, PREF_DO_NOT_TRACK};
+ PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_CLOSE_TABS_ON_EXIT};
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@@ -119,7 +122,11 @@
@@ -118,7 +121,11 @@ public class PrivacySettings
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
@ -99,7 +99,7 @@ Subject: Add option to not persist tabs across sessions
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3522,6 +3522,12 @@
@@ -3522,6 +3522,12 @@ To change this setting, <ph name="BEGIN_
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE
</message>


+ 51
- 39
patches/ungoogled-chromium-android/Remove-UI-elements.patch View File

@ -1,30 +1,29 @@
---
chrome/android/features/start_surface/public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java | 2
chrome/android/java/res/menu/main_menu.xml | 2
chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml | 6 --
chrome/android/java/res/xml/main_preferences.xml | 15 ------
chrome/android/java/res/xml/privacy_preferences.xml | 4 -
chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java | 9 ---
chrome/android/java/res/menu/main_menu.xml | 3
chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml | 6 -
chrome/android/java/res/xml/main_preferences.xml | 15 ---
chrome/android/java/res/xml/privacy_preferences.xml | 5 -
chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java | 1
chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java | 5 --
chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java | 5 -
chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java | 2
chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java | 4 -
chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java | 2
chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java | 2
chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java | 4 -
chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java | 8 ---
chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java | 23 ----------
chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java | 5 --
chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java | 11 --
chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java | 38 ----------
chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java | 5 -
chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsHelpClient.java | 2
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java | 3 -
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java | 3 -
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java | 3 -
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java | 3
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java | 3
chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java | 3
components/feed/core/shared_prefs/pref_names.cc | 4 -
21 files changed, 6 insertions(+), 103 deletions(-)
20 files changed, 7 insertions(+), 113 deletions(-)
--- a/components/feed/core/shared_prefs/pref_names.cc
+++ b/components/feed/core/shared_prefs/pref_names.cc
@@ -19,8 +19,8 @@
@@ -19,8 +19,8 @@ const char kEnableSnippets[] = "ntp_snip
const char kArticlesListVisible[] = "ntp_snippets.list_visible";
void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {
@ -37,7 +36,7 @@
} // namespace prefs
--- a/chrome/android/features/start_surface/public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java
+++ b/chrome/android/features/start_surface/public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java
@@ -119,7 +119,7 @@
@@ -119,7 +119,7 @@ public class StartSurfaceConfiguration {
*/
public static boolean getFeedArticlesVisibility() {
return SharedPreferencesManager.getInstance().readBoolean(
@ -48,7 +47,7 @@
@VisibleForTesting
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -225,11 +225,6 @@
@@ -225,11 +225,6 @@ public class SettingsActivity extends Ch
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
@ -62,7 +61,7 @@
--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsHelpClient.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsHelpClient.java
@@ -17,7 +17,7 @@
@@ -17,7 +17,7 @@ import org.chromium.components.browser_u
public class ChromeSiteSettingsHelpClient implements SiteSettingsHelpClient {
@Override
public boolean isHelpAndFeedbackEnabled() {
@ -73,7 +72,7 @@
@Override
--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
@@ -181,11 +181,6 @@
@@ -181,11 +181,6 @@ public class ClearBrowsingDataTabsFragme
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
@ -87,7 +86,7 @@
@Override
--- a/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java
@@ -119,10 +119,6 @@
@@ -119,10 +119,6 @@ public class DataReductionPreferenceFrag
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
@ -100,7 +99,20 @@
@Override
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -107,15 +107,11 @@
@@ -47,11 +47,10 @@ public class PrivacySettings
private static final String PREF_USAGE_STATS = "usage_stats_reporting";
private static final String PREF_DO_NOT_TRACK = "do_not_track";
private static final String PREF_SAFE_BROWSING = "safe_browsing";
- private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,
PREF_SAFE_BROWSING, PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS, PREF_USAGE_STATS,
- PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_SYNC_AND_SERVICES_LINK};
+ PREF_SECURE_DNS, PREF_DO_NOT_TRACK};
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@@ -107,15 +106,11 @@ public class PrivacySettings
Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
@ -116,7 +128,7 @@
updateSummaries();
}
@@ -202,10 +198,6 @@
@@ -202,10 +197,6 @@ public class PrivacySettings
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
@ -129,7 +141,7 @@
@Override
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java
@@ -147,9 +147,6 @@
@@ -147,9 +147,6 @@ public class GoogleServicesSettings
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
@ -141,7 +153,7 @@
@Override
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
@@ -243,9 +243,6 @@
@@ -243,9 +243,6 @@ public class ManageSyncSettings extends
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
@ -153,7 +165,7 @@
@Override
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java
@@ -288,9 +288,6 @@
@@ -288,9 +288,6 @@ public class SyncAndServicesSettings ext
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
@ -203,7 +215,7 @@
android:order="23"
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
@@ -187,7 +187,6 @@
@@ -187,7 +187,6 @@ public class MainSettings extends Prefer
updatePasswordsPreference();
setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
@ -211,7 +223,7 @@
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// If we are on Android O+ the Notifications preference should lead to the Android
@@ -231,17 +230,6 @@
@@ -231,17 +230,6 @@ public class MainSettings extends Prefer
.setTitle(SafetyCheckSettingsFragment.getSafetyCheckSettingsElementTitle(
getContext()));
}
@ -229,7 +241,7 @@
}
/**
@@ -299,10 +287,6 @@
@@ -299,10 +287,6 @@ public class MainSettings extends Prefer
} else {
removePreferenceIfPresent(PREF_DEVELOPER);
}
@ -240,7 +252,7 @@
}
private Preference addPreferenceIfAbsent(String key) {
@@ -317,12 +301,6 @@
@@ -317,12 +301,6 @@ public class MainSettings extends Prefer
}
private void updateSyncAndServicesPreference() {
@ -253,7 +265,7 @@
}
private void updateSearchEnginePreference() {
@@ -374,14 +352,6 @@
@@ -374,14 +352,6 @@ public class MainSettings extends Prefer
// "You and Google" section header if the personalized sync promo is shown.
boolean isShowingPersonalizedPromo =
mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO;
@ -268,7 +280,7 @@
}
// TemplateUrlService.LoadListener implementation.
@@ -405,9 +375,6 @@
@@ -405,9 +375,6 @@ public class MainSettings extends Prefer
return new ChromeManagedPreferenceDelegate() {
@Override
public boolean isPreferenceControlledByPolicy(Preference preference) {
@ -278,7 +290,7 @@
if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
return TemplateUrlServiceFactory.get().isDefaultSearchManaged();
}
@@ -416,11 +383,6 @@
@@ -416,11 +383,6 @@ public class MainSettings extends Prefer
@Override
public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
@ -292,7 +304,7 @@
}
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
@@ -62,7 +62,7 @@
@@ -62,7 +62,7 @@ public class FirstRunStatus {
*/
public static boolean getFirstRunFlowComplete() {
if (SharedPreferencesManager.getInstance().readBoolean(
@ -315,7 +327,7 @@
android:icon="@drawable/vr_headset" />
--- a/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java
@@ -36,7 +36,6 @@
@@ -36,7 +36,6 @@ class MenuDirectActionHandler implements
map.put(ChromeDirectActionIds.RELOAD, R.id.reload_menu_id);
map.put(ChromeDirectActionIds.BOOKMARK_THIS_PAGE, R.id.bookmark_this_page_id);
map.put(ChromeDirectActionIds.DOWNLOADS, R.id.downloads_menu_id);
@ -323,7 +335,7 @@
map.put(ChromeDirectActionIds.NEW_TAB, R.id.new_tab_menu_id);
map.put(ChromeDirectActionIds.OPEN_HISTORY, R.id.open_history_menu_id);
map.put(ChromeDirectActionIds.PREFERENCES, R.id.preferences_id);
@@ -92,7 +91,6 @@
@@ -92,7 +91,6 @@ class MenuDirectActionHandler implements
}
availableItemIds.add(R.id.downloads_menu_id);
@ -333,7 +345,7 @@
--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
@@ -344,7 +344,6 @@
@@ -344,7 +344,6 @@ public class KeyboardShortcuts {
if (tab != null && tab.canGoForward()) tab.goForward();
return true;
case CTRL | SHIFT | KeyEvent.KEYCODE_SLASH: // i.e. Ctrl+?
@ -343,7 +355,7 @@
}
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
@@ -533,7 +533,7 @@
@@ -533,7 +533,7 @@ public abstract class BaseCustomTabActiv
@Override
public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
// Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
@ -366,7 +378,7 @@
</PreferenceScreen>
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -99,7 +99,6 @@
@@ -99,7 +99,6 @@ public class PasswordSettings
private boolean mNoPasswords;
private boolean mNoPasswordExceptions;
@ -374,7 +386,7 @@
private MenuItem mSearchItem;
private String mSearchQuery;
@@ -195,7 +194,6 @@
@@ -195,7 +194,6 @@ public class PasswordSettings
menu.findItem(R.id.export_passwords).setEnabled(false);
mSearchItem = menu.findItem(R.id.menu_id_search);
mSearchItem.setVisible(true);
@ -382,7 +394,7 @@
SearchUtils.initializeSearchView(
mSearchItem, mSearchQuery, getActivity(), this::filterPasswords);
}
@@ -228,8 +226,6 @@
@@ -228,8 +226,6 @@ public class PasswordSettings
private void filterPasswords(String query) {
mSearchQuery = query;


Loading…
Cancel
Save