diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java index d2ee1d5fd868..7c38d192ea6d 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java @@ -83,7 +83,7 @@ import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.browser.settings.SettingsActivity; import org.chromium.chrome.browser.settings.SettingsLauncher; -import org.chromium.chrome.browser.settings.sync.ManageSyncSettings; +import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; import org.chromium.chrome.browser.sync.BraveSyncService; import org.chromium.ui.KeyboardVisibilityDelegate; import org.chromium.ui.base.DeviceFormFactor; diff --git a/android/java/res/xml/manage_sync_preferences.xml b/android/java/res/xml/manage_sync_preferences.xml index 465047b25cea..535f860e61e6 100644 --- a/android/java/res/xml/manage_sync_preferences.xml +++ b/android/java/res/xml/manage_sync_preferences.xml @@ -5,59 +5,78 @@ You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> - + + + - - - - - - - - - - + + + + + + diff --git a/patches/base-android-java-src-org-chromium-base-CommandLine.java.patch b/patches/base-android-java-src-org-chromium-base-CommandLine.java.patch index 73e703091d68..de53442bae88 100644 --- a/patches/base-android-java-src-org-chromium-base-CommandLine.java.patch +++ b/patches/base-android-java-src-org-chromium-base-CommandLine.java.patch @@ -1,8 +1,8 @@ diff --git a/base/android/java/src/org/chromium/base/CommandLine.java b/base/android/java/src/org/chromium/base/CommandLine.java -index 7a8dfd6b001e98660134d4480d5d42e96b9fac30..43c706b6760fb9bfdc4697a3475bb1650dfce848 100644 +index 646a4f6dd560c44237f0e661c21e28df3f559777..c792e2d843810d739d35641b0b7cec1ff823e5eb 100644 --- a/base/android/java/src/org/chromium/base/CommandLine.java +++ b/base/android/java/src/org/chromium/base/CommandLine.java -@@ -142,7 +142,11 @@ public abstract class CommandLine { +@@ -148,7 +148,11 @@ public abstract class CommandLine { * @param file The fully qualified command line file. */ public static void initFromFile(String file) { diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index d3f0c4b198d6..7fe5651231c1 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 6f50b67787561c523330b2eaa6522c517cb13eee..b5248da5b084206b6f15687abf89316c9333bc2c 100644 +index 6f50b67787561c523330b2eaa6522c517cb13eee..7ae754ae2b13b349c2b667b42402d1a7a10a928d 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -34,7 +34,9 @@ by a child template that "extends" this file. @@ -11,7 +11,7 @@ index 6f50b67787561c523330b2eaa6522c517cb13eee..b5248da5b084206b6f15687abf89316c +--> - + @@ -43,23 +45,33 @@ by a child template that "extends" this file. {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %} @@ -49,11 +49,11 @@ index 6f50b67787561c523330b2eaa6522c517cb13eee..b5248da5b084206b6f15687abf89316c @@ -100,7 +112,9 @@ by a child template that "extends" this file. - + + - + {% block extra_uses_permissions %} {% endblock %} @@ -126,6 +140,7 @@ by a child template that "extends" this file. @@ -70,13 +70,13 @@ index 6f50b67787561c523330b2eaa6522c517cb13eee..b5248da5b084206b6f15687abf89316c + {% endif %} - + @@ -1295,6 +1311,7 @@ android:value="true" /> {% endif %} - + + {% include "//brave/android/java/AndroidManifest.xml" %} {% block extra_application_definitions %} - +