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

Commit 997f0479 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

update patchs with wiggle

parent a8848ed4

build/patches/Add-a-proxy-configuration-page.patch

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Offer auto-complete for the proxy page URL. 
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml

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

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

@@ -38,6 +38,9 @@

@@ -32,6 +32,9 @@

     <integer name="reload_button_level_reload">0</integer>

     <integer name="reload_button_level_stop">1</integer>

build/patches/Add-history-support-in-incognito-mode.patch

+11 −17
Original line number Diff line number Diff line
@@ -3,16 +3,15 @@ Date: Fri, 7 Aug 2020 16:33:47 +0000 
Subject: Add history support in incognito mode



---

 .../java/res/xml/privacy_preferences.xml      |  5 ++++

 .../privacy/settings/PrivacySettings.java     | 23 +++++++++++++++++--

 chrome/browser/history/history_tab_helper.cc  | 16 +++++++++++++

 .../java/res/xml/privacy_preferences.xml      |  5 +++++

 .../privacy/settings/PrivacySettings.java     | 19 +++++++++++++++++++

 chrome/browser/history/history_tab_helper.cc  | 16 ++++++++++++++++

 chrome/browser/history/history_tab_helper.h   |  4 ++++

 chrome/browser/prefs/browser_prefs.cc         |  3 +++

 .../strings/android_chrome_strings.grd        |  6 +++++

 .../android_chrome_strings_it.xtb             |  4 +++-

 chrome/common/pref_names.cc                   |  5 ++++

 .../strings/android_chrome_strings.grd        |  6 ++++++

 chrome/common/pref_names.cc                   |  5 +++++

 chrome/common/pref_names.h                    |  4 ++++

 9 files changed, 67 insertions(+), 3 deletions(-)

 8 files changed, 62 insertions(+)



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

--- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -41,13 +40,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
 /**

  * Fragment to keep track of the all the privacy related preferences.

  */

@@ -50,14 +52,16 @@ public class PrivacySettings

@@ -50,11 +52,13 @@ public class PrivacySettings

     private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";

     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";

     private static final String PREF_PROXY_OPTIONS = "proxy";

-    

+public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled";

+

 

     private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,

             PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,

             PREF_SECURE_DNS, PREF_DO_NOT_TRACK,
@@ -55,11 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
+            PREF_INCOGNITO_TAB_HISTORY_ENABLED,

             PREF_ALLOW_CUSTOM_TAB_INTENTS,

             PREF_CLOSE_TABS_ON_EXIT,

-            PREF_PROXY_OPTIONS            

+            PREF_PROXY_OPTIONS

         };

 

     private ManagedPreferenceDelegate mManagedPreferenceDelegate;

             PREF_PROXY_OPTIONS

@@ -97,6 +101,11 @@ public class PrivacySettings

         Preference secureDnsPref = findPreference(PREF_SECURE_DNS);

         secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
@@ -83,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
 

         return true;

@@ -160,6 +172,13 @@ public class PrivacySettings

                 (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);

                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);

         closeTabsOnExitPref.setOnPreferenceChangeListener(this);

         closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);

+