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

Commit 0ac64490 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '000-master-147' into 'master' 

Enable Autofill, change icon and update browser

See merge request !129
parents bfbb5ef5 0ac52b07

cromite @ 79b95d83

Compare 1468382f to 79b95d83
Original line number Diff line number Diff line 
Subproject commit 1468382f54169aba5f75f1c775ac233b05ae3456
 
Subproject commit 79b95d83fe4e37211f5a44a524a05753ff8fed22

build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
From f8bf29e61ad3cfe2e1561d8c55313443ee1ee1ef Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 22 Aug 2023 06:16:40 +0000

Subject: Browser: Disable Android native autofill by default



Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 components/autofill/core/common/autofill_prefs.cc | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc

index 210c7118c0eaf..7d525d637f400 100644

--- a/components/autofill/core/common/autofill_prefs.cc

+++ b/components/autofill/core/common/autofill_prefs.cc

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

   registry->RegisterBooleanPref(kAutofillCreditCardFidoAuthOfferCheckboxState,

                                 true);

 #endif

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

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

   registry->RegisterBooleanPref(prefs::kAutofillAndroidIncognitoEnabled, false);

   registry->RegisterIntegerPref(kAutocompleteLastVersionRetentionPolicy, 0);

   registry->RegisterStringPref(kAutofillUploadEncodingSeed, "");

-- 

2.53.0

build/e_patches/Disable-AGSA-by-default.patch

+7 −7
Original line number Diff line number Diff line 
From 891f57c45c5793cce009890c4e6e744ca05ccd06 Mon Sep 17 00:00:00 2001

From 4f2f84ca064c06e922a108c322fa9ac96d9da3ef Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sun, 26 Sep 2021 11:17:53 +0200

Subject: Disable AGSA by default
@@ -29,7 +29,7 @@ index e12f25685d880..959599aba2e62 100644 
       "//chrome/browser/history_clusters:java",

       "//chrome/browser/hub:factory_java",

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

index de2748857a34a..31210ed6096cd 100644

index 323b167af7de7..df24a09be8664 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
@@ -189,10 +189,10 @@ index fdc425a2ff1b0..a405c667be8dc 100644 
 

     public static boolean isGoogleLensFeatureEnabled(boolean isIncognito) {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

index aa17e890fdd55..afe1739fa4af0 100644

index 445c9db57d5ef..a8532998a4d6d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

@@ -1187,22 +1187,6 @@ public class RootUiCoordinator

@@ -1182,22 +1182,6 @@ public class RootUiCoordinator

                         mLayoutStateProviderOneShotSupplier,

                         mFullscreenManager);

         mReadAloudControllerSupplier.set(controller);
@@ -216,11 +216,11 @@ index aa17e890fdd55..afe1739fa4af0 100644 
             mReaderModeBottomSheetManager =

                     new ReaderModeBottomSheetManager(

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

index adb92ea3b6298..4a23025a256f0 100644

index 2041a0c81c2f8..ce019d637b757 100644

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -696,7 +696,7 @@ BASE_FEATURE(kEnableSwipeToSwitchPane, base::FEATURE_DISABLED_BY_DEFAULT);

 BASE_FEATURE(kEnableToolbarPositioningInResizeMode, base::FEATURE_ENABLED_BY_DEFAULT);

@@ -698,7 +698,7 @@ BASE_FEATURE(kEnableToolbarPositioningInResizeMode, base::FEATURE_ENABLED_BY_DEF

 BASE_FEATURE(kEnableToolbarSwipeOnNonDesktopLff, base::FEATURE_ENABLED_BY_DEFAULT);

 BASE_FEATURE(kEnableXAxisActivityTransition, base::FEATURE_DISABLED_BY_DEFAULT);

 BASE_FEATURE(kEscCancelDrag, base::FEATURE_DISABLED_BY_DEFAULT);

-BASE_FEATURE(kExperimentsForAgsa, base::FEATURE_ENABLED_BY_DEFAULT);

build/e_patches/Enable-local-backup-support.patch

+10 −10
Original line number Diff line number Diff line 
From 2075ee8948cf6e53e9beff8a8c505a30051fd8f9 Mon Sep 17 00:00:00 2001

From b300a1c3650e00646b5587f976a9054f4f9a3580 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 10 Apr 2026 10:35:54 +0530

Subject: Enable local backup support
@@ -11,10 +11,10 @@ Subject: Enable local backup support 
 create mode 100644 chrome/android/java/res_template/xml/chromebackupscheme.xml



diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index 0c9682392de8..0c7f17b169a1 100644

index 959599aba2e62..e449502ac1cb3 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -1712,6 +1712,7 @@ if (_is_default_toolchain) {

@@ -1773,6 +1773,7 @@ if (_is_default_toolchain) {

 

   jinja_template_resources("chrome_public_apk_template_resources") {

     resources = [
@@ -22,7 +22,7 @@ index 0c9682392de8..0c7f17b169a1 100644 
       "java/res_template/xml/file_paths.xml",

       "java/res_template/xml/launchershortcuts.xml",

       "java/res_template/xml/searchable.xml",

@@ -1723,6 +1724,7 @@ if (_is_default_toolchain) {

@@ -1784,6 +1785,7 @@ if (_is_default_toolchain) {

   jinja_template_resources("chrome_test_apk_template_resources") {

     resource_overlay = true

     resources = [
@@ -31,10 +31,10 @@ index 0c9682392de8..0c7f17b169a1 100644 
       "java/res_template/xml/launchershortcuts.xml",

       "java/res_template/xml/searchable.xml",

diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index d20a6a1aff7b..d315d62a410f 100644

index 5224e4037ad5b..c832f2c07be33 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -206,14 +206,12 @@ by a child template that "extends" this file.

@@ -212,14 +212,12 @@ by a child template that "extends" this file.

         android:manageSpaceActivity="@string/manage_space_activity"

         android:supportsRtl="true"

         android:zygotePreloadName="{{ zygote_preload_class }}"
@@ -50,9 +50,9 @@ index d20a6a1aff7b..d315d62a410f 100644 
-        android:allowBackup="false"

-        {% endif %}

         android:networkSecurityConfig="@xml/network_security_config"

         android:allowAudioPlaybackCapture="false"

         android:appComponentFactory="org.chromium.chrome.browser.base.SplitCompatAppComponentFactory"

@@ -1316,12 +1314,6 @@ by a child template that "extends" this file.

         android:enableOnBackInvokedCallback="true"

@@ -1336,12 +1334,6 @@ by a child template that "extends" this file.

       <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable"

           android:value="true"/>
@@ -67,7 +67,7 @@ index d20a6a1aff7b..d315d62a410f 100644 
       {% endif %}

diff --git a/chrome/android/java/res_template/xml/chromebackupscheme.xml b/chrome/android/java/res_template/xml/chromebackupscheme.xml

new file mode 100644

index 000000000000..3ed5163a9ee5

index 0000000000000..3ed5163a9ee57

--- /dev/null

+++ b/chrome/android/java/res_template/xml/chromebackupscheme.xml

@@ -0,0 +1,39 @@
@@ -111,5 +111,5 @@ index 000000000000..3ed5163a9ee5 
+    <exclude domain="root" path="app_textures"/>

+</full-backup-content>

-- 

2.47.3

2.53.0

build/e_patches/Migrate-users-who-had-native-autofill-disabled.patch

0 → 100644
+49 −0
Original line number Diff line number Diff line 
From 5265fd69f9f1c73db4d20a07812b33733bcaec16 Mon Sep 17 00:00:00 2001

From: Nishith Khanna <nishith.khanna@gmail.com>

Date: Fri, 24 Apr 2026 14:50:55 +0530

Subject: Migrate users who had native autofill disabled



---

 components/autofill/core/common/autofill_prefs.cc | 12 ++++++++++++

 1 file changed, 12 insertions(+)



diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc

index 210c7118c0eaf..43bcecc079815 100644

--- a/components/autofill/core/common/autofill_prefs.cc

+++ b/components/autofill/core/common/autofill_prefs.cc

@@ -26,6 +26,9 @@ namespace {

 #if BUILDFLAG(IS_ANDROID)

 inline constexpr char kFacilitatedPaymentsPixAccountLinkingDeprecated[] =

     "facilitated_payments.pix_account_linking";

+

+inline constexpr char kAutofillAndroidEnabledMigrationDone[] =

+    "autofill.android_autofill_enabled_migration_done";

 #endif

 constexpr char kAutofillRanExtraDeduplication[] =

     "autofill.ran_extra_deduplication";

@@ -172,6 +175,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

 #if BUILDFLAG(IS_ANDROID)

   registry->RegisterBooleanPref(kFacilitatedPaymentsPixAccountLinkingDeprecated,

                                 /*default_value=*/true);

+  registry->RegisterBooleanPref(kAutofillAndroidEnabledMigrationDone, false);

 #endif  // BUILDFLAG(IS_ANDROID)

   registry->RegisterBooleanPref(kAutofillRanExtraDeduplication, false);

   // Don't add new prefs here. Add them before any deprecated prefs instead.

@@ -183,6 +187,14 @@ void MigrateDeprecatedAutofillPrefs(PrefService* pref_service) {

 #if BUILDFLAG(IS_ANDROID)

   // Added 08/2025

   pref_service->ClearPref(kFacilitatedPaymentsPixAccountLinkingDeprecated);

+  // Added 04/2026 - Re-enable autofill for users affected by the temporary

+  // default=false patch. Runs once; respects subsequent user changes.

+  if (!pref_service->GetBoolean(kAutofillAndroidEnabledMigrationDone)) {

+    if (!pref_service->GetBoolean(prefs::kAutofillAndroidEnabled)) {

+      pref_service->SetBoolean(prefs::kAutofillAndroidEnabled, true);

+    }

+    pref_service->SetBoolean(kAutofillAndroidEnabledMigrationDone, true);

+  }

 #endif  // BUILDFLAG(IS_ANDROID)

   // Added 01/2026

   pref_service->ClearPref(kAutofillRanExtraDeduplication);

-- 

2.53.0