update patch with wiggle

This commit is contained in:
Carmelo Messina 2020-11-15 18:20:09 +01:00
parent c6060f0d79
commit a8848ed4f6
3 changed files with 10 additions and 11 deletions

View file

@ -3,12 +3,11 @@ Date: Wed, 29 Aug 2018 11:03:44 +0200
Subject: Add custom tab intents privacy option
---
chrome/android/java/res/values/values.xml | 3 +++
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
.../chrome/browser/LaunchIntentDispatcher.java | 4 ++++
.../browser/privacy/settings/PrivacySettings.java | 13 ++++++++++++-
.../ui/android/strings/android_chrome_strings.grd | 7 +++++++
5 files changed, 31 insertions(+), 1 deletion(-)
4 files changed, 28 insertions(+), 1 deletion(-)
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

View file

@ -3,12 +3,11 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
Subject: Add option to not persist tabs across sessions
---
chrome/android/java/res/values/values.xml | 3 +++
chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++
.../chrome/browser/ChromeTabbedActivity.java | 4 +++-
.../browser/privacy/settings/PrivacySettings.java | 12 ++++++++++--
.../ui/android/strings/android_chrome_strings.grd | 6 ++++++
5 files changed, 27 insertions(+), 3 deletions(-)
4 files changed, 24 insertions(+), 3 deletions(-)
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

View file

@ -4,16 +4,17 @@ Subject: ungoogled-chromium: Disable translate integration
Remove translate offer
---
.../xml/languages_detailed_preferences.xml | 5 ---
.../java/res/xml/languages_preferences.xml | 5 ---
.../language/settings/LanguageSettings.java | 43 -------------------
.../strings/android_chrome_strings.grd | 3 --
.../core/browser/translate_manager.cc | 5 ++-
.../core/browser/translate_script.cc | 16 +------
5 files changed, 5 insertions(+), 67 deletions(-)
6 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
--- a/chrome/android/java/res/xml/languages_preferences.xml
+++ b/chrome/android/java/res/xml/languages_preferences.xml
diff --git a/chrome/android/java/res/xml/languages_detailed_preferences.xml b/chrome/android/java/res/xml/languages_detailed_preferences.xml
--- a/chrome/android/java/res/xml/languages_detailed_preferences.xml
+++ b/chrome/android/java/res/xml/languages_detailed_preferences.xml
@@ -11,9 +11,4 @@
android:layout="@layout/languages_preference"
android:widgetLayout="@layout/accept_languages_list" />
@ -24,9 +25,9 @@ diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/andr
- android:summaryOff="@string/languages_offer_translate_switch" />
-
</PreferenceScreen>
diff --git a/chrome/android/java/res/xml/languages_detailed_preferences.xml b/chrome/android/java/res/xml/languages_detailed_preferences.xml
--- a/chrome/android/java/res/xml/languages_detailed_preferences.xml
+++ b/chrome/android/java/res/xml/languages_detailed_preferences.xml
diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
--- a/chrome/android/java/res/xml/languages_preferences.xml
+++ b/chrome/android/java/res/xml/languages_preferences.xml
@@ -11,9 +11,4 @@
android:layout="@layout/languages_preference"
android:widgetLayout="@layout/accept_languages_list" />