Cleanup patches

From 887050fed164a632ac9e59c8f366941e09af1acf Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

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

Subject: [PATCH 1/3] disable browser sign in feature by default

---

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

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

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

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

 .../account_consistency_mode_manager.cc       |  2 +-

 5 files changed, 7 insertions(+), 32 deletions(-)

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

index f68ca31ddaa2e..947de77a52ebd 100644

--- a/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -9,30 +9,6 @@ found in the LICENSE file.

     xmlns:app="http://schemas.android.com/apk/res-auto"

     android:orderingFromXml="false">

-    <org.chromium.chrome.browser.sync.settings.SyncPromoPreference

-        android:key="sync_promo"

-        android:order="0"/>

-    <PreferenceCategory

-        android:key="account_and_google_services_section"

-        android:order="1"

-        android:title="@string/prefs_section_account_and_google_services"/>

-    <org.chromium.chrome.browser.sync.settings.SignInPreference

-        android:key="sign_in"

-        android:order="2"

-        android:title="@string/sign_in_to_chrome"/>

-    <org.chromium.components.browser_ui.settings.ChromeBasePreference

-        android:key="manage_sync"

-        android:order="3"

-        android:layout="@layout/account_management_account_row"

-        android:title="@string/sync_category_title"/>

-    <org.chromium.components.browser_ui.settings.ChromeBasePreference

-        android:key="google_services"

-        android:order="4"

-        android:layout="@layout/account_management_account_row"

-        android:title="@string/prefs_google_services"

-        android:icon="@drawable/ic_google_services_48dp"

-        android:fragment="org.chromium.chrome.browser.sync.settings.GoogleServicesSettings"/>

-

     <PreferenceCategory

         android:key="basics_section"

         android:order="5"

diff --git 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

index 34c5de4e017d9..d5e156830547a 100644

--- 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

@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.password_manager.PasswordCheckReferrer;

 import org.chromium.chrome.browser.password_manager.PasswordManagerHelper;

 import org.chromium.chrome.browser.preferences.Pref;

 import org.chromium.chrome.browser.profiles.Profile;

+import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;

 import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;

 import org.chromium.chrome.browser.settings.ProfileDependentSetting;

 import org.chromium.chrome.browser.settings.SettingsLauncherImpl;

@@ -695,6 +696,9 @@ public class PasswordSettings extends PreferenceFragmentCompat

         if (mSearchQuery != null && !mNoPasswords) {

             return; // Don't add the Manage Account link if there is a search going on.

         }

+        if (!IdentityServicesProvider.get().getSigninManager(mProfile).isSigninSupported(false)) {

+            return;

+        }

         if (getPreferenceScreen().findPreference(PREF_KEY_MANAGE_ACCOUNT_LINK) != null) {

             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 e8eaafec93d8c..ea9162f77a771 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

@@ -239,13 +239,6 @@ public class MainSettings extends PreferenceFragmentCompat

     }

     private void updatePreferences() {

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

-                    /*requireUpdatedPlayServices=*/false)) {

-            addPreferenceIfAbsent(PREF_SIGN_IN);

-        } else {

-            removePreferenceIfPresent(PREF_SIGN_IN);

-        }

-

         updateManageSyncPreference();

         updateSearchEnginePreference();

         updatePasswordsPreference();

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

     }

     private void updateManageSyncPreference() {

+        if (true) return;

         String primaryAccountName = CoreAccountInfo.getEmailFrom(

                 IdentityServicesProvider.get().getIdentityManager(mProfile).getPrimaryAccountInfo(

                         ConsentLevel.SIGNIN));

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

index ed9cc63349c6f..573bb262ff51f 100644

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

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

@@ -148,6 +148,7 @@ public class SignInPreference

     }

     private void setupSigninDisallowed() {

+        setViewEnabled(false);

         mWasGenericSigninPromoDisplayed = false;

     }

diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc

index a7853cc014069..67acb94246580 100644

--- a/chrome/browser/signin/account_consistency_mode_manager.cc

+++ b/chrome/browser/signin/account_consistency_mode_manager.cc

@@ -119,7 +119,7 @@ AccountConsistencyModeManager::~AccountConsistencyModeManager() {}

 // static

 void AccountConsistencyModeManager::RegisterProfilePrefs(

     user_prefs::PrefRegistrySyncable* registry) {

-  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);

+  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);

 }

 // static

-- 

2.34.1

From ae7a78635fd9df349eb713d305a5a22efb1f1b74 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 29 Sep 2023 14:10:43 +0530

Subject: [PATCH] fixup Disable Accessibility service by default

Subject: [PATCH 1/5] fixup Disable Accessibility service by default

---

 .../browser/ui/android/strings/android_chrome_strings.grd   | 6 ------

From 59a7e768557b0ccf0e6fd2bd81ed8f4a90019ad0 Mon Sep 17 00:00:00 2001

From: Daniel Micay <danielmicay@gmail.com>

Date: Wed, 23 Nov 2016 09:26:51 -0500

Subject: [PATCH 2/3] disable contextual search by default

---

 .../browser/contextualsearch/ContextualSearchFieldTrial.java    | 2 +-

 chrome/browser/profiles/profile.cc                              | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

index 2dc13948b232d..2eff86dcc43f2 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java

@@ -114,7 +114,7 @@ public class ContextualSearchFieldTrial {

         // Allow disabling the feature remotely.

         if (getBooleanParam(DISABLED_PARAM)) return false;

-        return true;

+        return false;

     }

     /**

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index 6cffe941b26f9..8cb7e0e113203 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -315,7 +315,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

 #if BUILDFLAG(IS_ANDROID)

   registry->RegisterStringPref(

       prefs::kContextualSearchEnabled,

-      std::string(),

+      "false",

       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

   registry->RegisterBooleanPref(

       prefs::kContextualSearchWasFullyPrivacyEnabled, false,

-- 

2.34.1

From a65deb85d82db1cfcab15e77d8a10ff635b68485 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 29 Sep 2023 14:35:06 +0530

Subject: [PATCH 2/5] fixup Add option to force tablet UI

---

 .../browser/ui/android/strings/android_chrome_strings.grd   | 6 ------

 .../browser_ui/strings/android/browser_ui_strings.grd       | 6 ++++++

 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

index d935119f47e46..2e9db5ca4da57 100644

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -1736,12 +1736,6 @@ Your Google account may have other forms of browsing history like searches and a

       <message name="IDS_PRIVACY_GUIDE_SB_ENHANCED_ITEM_SEVEN" desc="Seventh bullet point that describes the details of the Safe Browsing control.">

         Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps

       </message>

-      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">

-       Open chromium in Tablet Mode

-      </message>

-      <message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">

-        Force Tablet Mode

-      </message>

       <message name="IDS_MOVE_TOOLBAR_BOTTOM_TITLE" desc="Title of the preference that allows the user to move toolbar on bottom.">

         Move toolbar to bottom

       </message>

diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd

index 4c721079ca474..a07c17caac0b5 100644

--- a/components/browser_ui/strings/android/browser_ui_strings.grd

+++ b/components/browser_ui/strings/android/browser_ui_strings.grd

@@ -968,6 +968,12 @@

       <message name="IDS_ACCESSIBILITY_CAPTIONS_TITLE" desc="Title of the preference that allows the user to update caption settings.">

         Captions

       </message>

+      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">

+       Open chromium in Tablet Mode

+      </message>

+      <message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">

+        Force Tablet Mode

+      </message>

       <!-- Page Zoom -->

       <message name="IDS_PAGE_ZOOM_TITLE" desc="Title of the preference that allows the user to update the accessibility page zoom feature that applies to the web contents.">

-- 

2.34.1