From ebb792e05fef52a682027f9651bb493874192af8 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 8 Mar 2021 11:16:01 -0500 Subject: [PATCH] [Android] LanguageSettings were modularized The only reason we used BravePreferenceFragment is to have a close button in the settings. This will be re-done in the context of this issue https://github.com/brave/brave-browser/issues/10375 Chromium change: https://chromium.googlesource.com/chromium/src.git/+/f3c257e9298faf4da38daa674571c7ad08873106 [Android] Move LanguageSettings to //chrome/browser/language This CL moves LangaugeSettings.java and the associated XML files out of //chrome/android to the //chrome/browser/language module. There are no UI changes from this CL. A follow up CL will move the language related tests to //chrome/browser/language. Bug: 1124096 --- ...er-language-settings-LanguageSettings.java.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch diff --git a/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch b/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch deleted file mode 100644 index 6ac4e186e34d..000000000000 --- a/patches/chrome-browser-language-android-java-src-org-chromium-chrome-browser-language-settings-LanguageSettings.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -index 2de272e8e851996eeb823a09fc650237cd169c02..f81c3c5034b389ba09398c2590786587dd7dd113 100644 ---- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java -@@ -37,7 +37,7 @@ import java.util.Collection; - * Settings fragment that displays information about Chrome languages, which allow users to - * seamlessly find and manage their languages preferences across platforms. - */ --public class LanguageSettings extends PreferenceFragmentCompat -+public class LanguageSettings extends org.chromium.chrome.browser.settings.BravePreferenceFragment - implements AddLanguageFragment.Launcher, FragmentSettingsLauncher { - // Default number of items to list in a collection preference summary. - private static final int COLLECTION_SUMMARY_ITEM_LIMIT = 3;