Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f55e4a12 authored by Romain Hunault's avatar Romain Hunault
Browse files

Disable autofill

parent 1a86eb50
Loading
Loading
Loading
Loading
+69 −0
Original line number Diff line number Diff line
From 96b43d72f58efa70896178ab2c80d311452bd9d8 Mon Sep 17 00:00:00 2001
From: root <root@e-builder.ralfhein.de>
Date: Mon, 11 Feb 2019 11:59:35 +0100
Subject: [PATCH] Disable Google Assistant in Chrome

---
 chrome/android/java/res/xml/main_preferences.xml             | 5 -----
 .../autofill_assistant/AutofillAssistantPreferencesUtil.java | 2 +-
 .../autofill_assistant/AutofillAssistantPreferences.java     | 2 +-
 content/public/common/content_features.cc                    | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
index 12cb57376cbd..2bd5b45b7ae6 100644
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -40,11 +40,6 @@
         android:key="autofill_addresses"
         android:order="7"
         android:title="@string/autofill_addresses_settings_title"/>
-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.preferences.autofill_assistant.AutofillAssistantPreferences"
-        android:key="autofill_assistant"
-        android:order="8"
-        android:title="@string/prefs_autofill_assistant_title"/>
     <Preference
         android:fragment="org.chromium.chrome.browser.preferences.NotificationsPreferences"
         android:key="notifications"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
index ece6690113aa..e73cfd01c280 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
@@ -23,7 +23,7 @@ class AutofillAssistantPreferencesUtil {
     /** Checks whether the Autofill Assistant switch preference in settings is on. */
     static boolean isAutofillAssistantSwitchOn() {
         return ContextUtils.getAppSharedPreferences().getBoolean(
-                AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, true);
+                AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, false);
     }
 
     /** Checks whether the Autofill Assistant onboarding has been accepted. */
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
index 07e93f1badc7..71ba2a7f0da0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java
@@ -50,6 +50,6 @@ public class AutofillAssistantPreferences extends PreferenceFragment {
         // (e.g. the switch will say "On" when it is really turned off), so .setChecked() should be
         // called after .addPreference()
         autofillAssistantSwitch.setChecked(ContextUtils.getAppSharedPreferences().getBoolean(
-                PREF_AUTOFILL_ASSISTANT_SWITCH, true));
+                PREF_AUTOFILL_ASSISTANT_SWITCH, false));
     }
 }
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
index 798222760d17..e8f07cfa93bb 100644
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -649,7 +649,7 @@ const base::Feature kScriptStreamingOnPreload{
 // Autofill Accessibility in Android.
 // crbug.com/627860
 const base::Feature kAndroidAutofillAccessibility{
-    "AndroidAutofillAccessibility", base::FEATURE_ENABLED_BY_DEFAULT};
+    "AndroidAutofillAccessibility", base::FEATURE_DISABLED_BY_DEFAULT};
 
 // Enables developers to use the CSS safe-area-* and viewport-fit APIs which
 // allow them to support devices with a display cutout.
-- 
2.17.1
+1 −0
Original line number Diff line number Diff line
@@ -117,3 +117,4 @@ e-set-popular-sites.patch
e-enable-donottrack.patch
e-set-informations.patch
e-enable-search-suggestion.patch
e-disable-autofill.patch