Browser: fix browser signin feature

From aa14345a4d4bc61411bce59fd4587ac7f04772e7 Mon Sep 17 00:00:00 2001

From a9815704bb9e3a02c74a5268fdb68167aab9176b Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Sun, 29 Aug 2021 19:31:00 +0000

Subject: [PATCH 01/17] disable browser sign in feature by default

---

 .../android/java/res/xml/main_preferences.xml | 24 -------------------

 .../settings/PasswordSettings.java            |  4 ++++

 .../chrome/browser/settings/MainSettings.java |  2 ++

 .../chrome/browser/settings/MainSettings.java |  8 ++-----

 .../sync/settings/SignInPreference.java       |  1 +

 .../account_consistency_mode_manager.cc       |  2 +-

 5 files changed, 8 insertions(+), 25 deletions(-)

 5 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

index 49b562b49eebc..99e231e3f0bc6 100644

             return; // Don't add the Manage Account link if it's present.

         }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

index 8d35eeda1ba21..ee4bd26f4fc5a 100644

index 8d35eeda1ba21..1dd32e4bb001b 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

@@ -229,6 +229,7 @@ public class MainSettings extends PreferenceFragmentCompat

@@ -229,12 +229,7 @@ public class MainSettings extends PreferenceFragmentCompat

     }

     private void updatePreferences() {

+        if (true) return;

         if (IdentityServicesProvider.get().getSigninManager(mProfile).isSigninSupported(

                     /*requireUpdatedPlayServices=*/false)) {

             addPreferenceIfAbsent(PREF_SIGN_IN);

@@ -279,6 +280,7 @@ public class MainSettings extends PreferenceFragmentCompat

-        if (IdentityServicesProvider.get().getSigninManager(mProfile).isSigninSupported(

-                    /*requireUpdatedPlayServices=*/false)) {

-            addPreferenceIfAbsent(PREF_SIGN_IN);

-        } else {

-            removePreferenceIfPresent(PREF_SIGN_IN);

-        }

+        removePreferenceIfPresent(PREF_SIGN_IN);

         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O

                 && ChromeFeatureList.isEnabled(

@@ -279,6 +274,7 @@ public class MainSettings extends PreferenceFragmentCompat

     }

     private void updateManageSyncPreference() {