Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8307 from brave/cr91

Browse Source 
Upgrade from Chromium 90 to Chromium 91.
This commit is contained in:
Max
2021-05-06 11:30:18 -04:00
committed by GitHub
parent 7586eba7dc cb586a0dcc
commit cb022ac5c4
657 changed files with 4593 additions and 3623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/apk_for_test.flags
+5
View File
@@ -70,6 +70,11 @@
*** sortAndFilterUnnecessaryTemplateUrl(...);
}
-keep class org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings {
*** mSearchEngineAdapter;
*** createAdapterIfNecessary(...);
}
-keep class org.chromium.base.CommandLineInitUtil {
*** initCommandLine(...);
}
android/java/org/chromium/chrome/browser/BraveHelper.java
+16 -19
View File
@@ -7,30 +7,27 @@ package org.chromium.chrome.browser;
import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.firstrun.FirstRunStatus;
import org.chromium.chrome.browser.flags.ChromeSwitches;
public class BraveHelper {
public static final String SHARED_PREF_DISPLAYED_INFOBAR_PROMO =
public static final String SHARED_PREF_DISPLAYED_INFOBAR_PROMO =
"displayed_data_reduction_infobar_promo";
// Used to indicate were the settings migrated to the new
// brave-core based version
public static final String PREF_TABS_SETTINGS_MIGRATED =
// Used to indicate were the settings migrated to the new
// brave-core based version
public static final String PREF_TABS_SETTINGS_MIGRATED =
"android_tabs_settings_to_core_migrated";
// New search engines settings
public static final String PRIVATE_DSE_SHORTNAME = "private_dse_shortname";
public static final String STANDARD_DSE_SHORTNAME = "standard_dse_shortname";
public BraveHelper() {}
public BraveHelper() {}
public static void DisableFREDRP() {
CommandLine.getInstance().appendSwitch(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE);
FirstRunStatus.setFirstRunFlowComplete(true);
// Disables data reduction promo dialog
ContextUtils.getAppSharedPreferences()
.edit()
.putBoolean(SHARED_PREF_DISPLAYED_INFOBAR_PROMO, true)
.apply();
}
public static void DisableFREDRP() {
CommandLine.getInstance().appendSwitch(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE);
FirstRunStatus.setFirstRunFlowComplete(true);
// Disables data reduction promo dialog
ContextUtils.getAppSharedPreferences()
.edit()
.putBoolean(SHARED_PREF_DISPLAYED_INFOBAR_PROMO, true)
.apply();
}
}
android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java
+2 -4
View File
@@ -32,11 +32,9 @@ public class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegat
MultiWindowModeStateDispatcher multiWindowModeStateDispatcher,
TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
@Nullable OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
ModalDialogManager modalDialogManager, WebFeedBridge webFeedBridge) {
ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier) {
super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
toolbarManager, decorView, overviewModeBehaviorSupplier, bookmarkBridgeSupplier,
modalDialogManager, webFeedBridge);
toolbarManager, decorView, overviewModeBehaviorSupplier, bookmarkBridgeSupplier);
}
@Override
android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
+3 -2
View File
@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator;
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.ui.modaldialog.ModalDialogManager;
public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate {
@@ -48,10 +49,10 @@ public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertie
AppMenuDelegate appMenuDelegate,
OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier,
ModalDialogManager modalDialogManager, WebFeedBridge webFeedBridge) {
SnackbarManager snackbarManager, WebFeedBridge webFeedBridge) {
super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier,
bookmarkBridgeSupplier, modalDialogManager, webFeedBridge);
bookmarkBridgeSupplier, snackbarManager, webFeedBridge);
mAppMenuDelegate = appMenuDelegate;
}
android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java
+1 -6
View File
@@ -61,12 +61,7 @@ public class BraveBookmarkUtils extends BookmarkUtils {
return;
}
boolean isAddToOptionVariation =
CachedFeatureFlags.isEnabled(
ChromeFeatureList.TABBED_APP_OVERFLOW_MENU_THREE_BUTTON_ACTIONBAR)
&& AppMenuPropertiesDelegateImpl.THREE_BUTTON_ACTION_BAR_VARIATION.getValue()
.equals("add_to_option");
if (CachedFeatureFlags.isEnabled(ChromeFeatureList.READ_LATER) && !isAddToOptionVariation) {
if (CachedFeatureFlags.isEnabled(ChromeFeatureList.READ_LATER)) {
// Show a bottom sheet to let the user select target bookmark folder.
showBookmarkBottomSheet(bookmarkModel, tab, snackbarManager, bottomSheetController,
activity, fromCustomTab, callback);
android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java
+1 -1
View File
@@ -12,7 +12,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.night_mode.R;
public class BraveRadioButtonGroupThemePreference extends RadioButtonGroupThemePreference {
public BraveRadioButtonGroupThemePreference(Context context, AttributeSet attrs) {
android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
+9 -8
View File
@@ -49,19 +49,20 @@ public class BraveNewTabPage extends NewTabPage {
@Override
protected void initializeMainView(Activity activity, WindowAndroid windowAndroid,
SnackbarManager snackbarManager, TabModelSelector tabModelSelector, NewTabPageUma uma,
boolean isInNightMode, BottomSheetController bottomSheetController,
SnackbarManager snackbarManager, NewTabPageUma uma, boolean isInNightMode,
BottomSheetController bottomSheetController,
ObservableSupplier<ShareDelegate> shareDelegateSupplier) {
super.initializeMainView(activity, windowAndroid, snackbarManager, tabModelSelector, uma,
isInNightMode, bottomSheetController, shareDelegateSupplier);
super.initializeMainView(activity, windowAndroid, snackbarManager, uma, isInNightMode,
bottomSheetController, shareDelegateSupplier);
// Override surface provider
Profile profile = Profile.fromWebContents(mTab.getWebContents());
assert !FeedFeatures.isFeedEnabled();
mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager,
tabModelSelector, windowAndroid,
new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout,
null, null, isInNightMode, this, mNewTabPageManager.getNavigationDelegate(),
profile, false, bottomSheetController, shareDelegateSupplier, null);
windowAndroid, new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout),
mNewTabPageLayout, null, isInNightMode, this,
mNewTabPageManager.getNavigationDelegate(), profile,
/* isPlaceholderShownInitially= */ false, bottomSheetController,
shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null);
}
}
android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
+2
View File
@@ -930,8 +930,10 @@ public class BraveNewTabPageLayout
countDownTimer = new Timer();
final Handler handler = new Handler();
countDownTimer.scheduleAtFixedRate(new TimerTask() {
@Override
public void run() {
handler.post(new Runnable() {
@Override
public void run() {
if (BinanceWidgetManager.getInstance()
.isUserAuthenticatedForBinance()) {
android/java/org/chromium/chrome/browser/search_engines/settings/BUILD.gn
+32
View File
@@ -0,0 +1,32 @@
# Copyright (c) 2021 The Brave Authors. All rights reserved.
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
import("//build/config/android/rules.gni")
android_library("java") {
sources = [
"BraveBaseSearchEngineAdapter.java",
"BravePrivateSearchEnginePreference.java",
"BraveSearchEngineAdapter.java",
"BraveSearchEnginePreference.java",
"BraveStandardSearchEnginePreference.java",
]
deps = [
":java_resources",
"//base:base_java",
"//chrome/browser/search_engines/android:java",
"//components/search_engines/android:java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
resources_package = "org.chromium.chrome.browser.search_engines"
}
android_resources("java_resources") {
deps = [
"//brave/build/android:android_brave_strings_grd",
"//chrome/browser/search_engines/android:java_resources",
]
}
android/java/org/chromium/chrome/browser/settings/BravePrivateSearchEnginePreference.java → android/java/org/chromium/chrome/browser/search_engines/settings/BravePrivateSearchEnginePreference.java
+1 -1
View File
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.settings;
package org.chromium.chrome.browser.search_engines.settings;
public class BravePrivateSearchEnginePreference extends BraveSearchEnginePreference {
public BravePrivateSearchEnginePreference() {
android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter.java
+100
View File
@@ -0,0 +1,100 @@
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.search_engines.settings;
import android.content.Context;
import android.content.SharedPreferences;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.browser.search_engines.R;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.components.search_engines.TemplateUrl;
import java.util.List;
public class BraveSearchEngineAdapter extends SearchEngineAdapter {
public static final String PRIVATE_DSE_SHORTNAME = "private_dse_shortname";
public static final String STANDARD_DSE_SHORTNAME = "standard_dse_shortname";
private boolean mIsPrivate;
static public void setDSEPrefs(TemplateUrl templateUrl, boolean isPrivate) {
SharedPreferences.Editor sharedPreferencesEditor =
ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putString(
isPrivate ? PRIVATE_DSE_SHORTNAME : STANDARD_DSE_SHORTNAME,
templateUrl.getShortName());
sharedPreferencesEditor.apply();
}
static public void updateActiveDSE(boolean isPrivate) {
TemplateUrl templateUrl = getTemplateUrlByShortName(getDSEShortName(isPrivate));
if (templateUrl == null) {
return;
}
String keyword = templateUrl.getKeyword();
TemplateUrlServiceFactory.get().setSearchEngine(keyword);
}
static public String getDSEShortName(boolean isPrivate) {
String defaultSearchEngineName = null;
TemplateUrl dseTemplateUrl =
TemplateUrlServiceFactory.get().getDefaultSearchEngineTemplateUrl();
if (dseTemplateUrl != null) defaultSearchEngineName = dseTemplateUrl.getShortName();
return ContextUtils.getAppSharedPreferences().getString(
isPrivate ? PRIVATE_DSE_SHORTNAME : STANDARD_DSE_SHORTNAME,
defaultSearchEngineName);
}
static public TemplateUrl getTemplateUrlByShortName(String name) {
List<TemplateUrl> templateUrls = TemplateUrlServiceFactory.get().getTemplateUrls();
for (int index = 0; index < templateUrls.size(); ++index) {
TemplateUrl templateUrl = templateUrls.get(index);
if (templateUrl.getShortName().equals(name)) {
return templateUrl;
}
}
assert false : "This should not happen!";
return null;
}
public BraveSearchEngineAdapter(Context context, boolean isPrivate) {
super(context);
mIsPrivate = isPrivate;
}
@Override
public void onClick(View view) {
super.onClick(view);
if (view.getTag() == null) {
return;
}
TemplateUrl templateUrl = (TemplateUrl) getItem((int) view.getTag());
setDSEPrefs(templateUrl, mIsPrivate);
}
@Override
public void start() {
updateActiveDSE(mIsPrivate);
super.start();
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = super.getView(position, convertView, parent);
TextView url = (TextView) view.findViewById(R.id.url);
if (url != null) {
url.setVisibility(View.GONE);
}
return view;
}
}
android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java → android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePreference.java
+10 -25
View File
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.settings;
package org.chromium.chrome.browser.search_engines.settings;
import android.os.Bundle;
import android.view.View;
@@ -11,11 +11,13 @@ import android.widget.ListView;
import androidx.fragment.app.ListFragment;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter;
import org.chromium.chrome.browser.search_engines.R;
public class BraveSearchEnginePreference extends ListFragment {
public class BraveSearchEnginePreference extends SearchEngineSettings {
// These members will be deleted in bytecode, member from parent class will be used instead.
private SearchEngineAdapter mSearchEngineAdapter;
// Own members.
private boolean mPrivate;
public BraveSearchEnginePreference(boolean isPrivate) {
@@ -27,27 +29,10 @@ public class BraveSearchEnginePreference extends ListFragment {
super.onCreate(savedInstanceState);
getActivity().setTitle(mPrivate ? R.string.prefs_private_search_engine
: R.string.prefs_standard_search_engine);
}
public void createAdapterIfNecessary() {
if (mSearchEngineAdapter != null) return;
mSearchEngineAdapter = new BraveSearchEngineAdapter(getActivity(), mPrivate);
setListAdapter(mSearchEngineAdapter);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ListView listView = getListView();
listView.setDivider(null);
listView.setItemsCanFocus(true);
}
@Override
public void onStart() {
super.onStart();
mSearchEngineAdapter.start();
}
@Override
public void onStop() {
super.onStop();
mSearchEngineAdapter.stop();
}
}
android/java/org/chromium/chrome/browser/settings/BraveStandardSearchEnginePreference.java → android/java/org/chromium/chrome/browser/search_engines/settings/BraveStandardSearchEnginePreference.java
+1 -1
View File
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.settings;
package org.chromium.chrome.browser.search_engines.settings;
public class BraveStandardSearchEnginePreference extends BraveSearchEnginePreference {
public BraveStandardSearchEnginePreference() {
android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java
-52
View File
@@ -1,52 +0,0 @@
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.settings;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter;
import org.chromium.components.search_engines.TemplateUrl;
public class BraveSearchEngineAdapter extends SearchEngineAdapter {
private boolean mIsPrivate;
public BraveSearchEngineAdapter(Context context, boolean isPrivate) {
super(context);
mIsPrivate = isPrivate;
}
@Override
public void onClick(View view) {
super.onClick(view);
if (view.getTag() == null) {
return;
}
TemplateUrl templateUrl = (TemplateUrl) getItem((int) view.getTag());
BraveSearchEngineUtils.setDSEPrefs(templateUrl, mIsPrivate);
}
@Override
public void start() {
BraveSearchEngineUtils.updateActiveDSE(mIsPrivate);
super.start();
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = super.getView(position, convertView, parent);
TextView url = (TextView) view.findViewById(R.id.url);
if (url != null) {
url.setVisibility(View.GONE);
}
return view;
}
}
android/java/org/chromium/chrome/browser/settings/BraveSearchEngineUtils.java
+23 -53
View File
@@ -8,45 +8,13 @@ package org.chromium.chrome.browser.settings;
import android.content.SharedPreferences;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.browser.BraveHelper;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.chrome.browser.search_engines.settings.BraveSearchEngineAdapter;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.components.search_engines.TemplateUrlService;
import org.chromium.components.search_engines.TemplateUrl;
import java.util.List;
import org.chromium.components.search_engines.TemplateUrlService;
public class BraveSearchEngineUtils {
static public String getDSEShortName(boolean isPrivate) {
String defaultSearchEngineName = null;
TemplateUrl dseTemplateUrl =
TemplateUrlServiceFactory.get().getDefaultSearchEngineTemplateUrl();
if (dseTemplateUrl != null)
defaultSearchEngineName = dseTemplateUrl.getShortName();
return ContextUtils.getAppSharedPreferences().getString(
isPrivate ? BraveHelper.PRIVATE_DSE_SHORTNAME :
BraveHelper.STANDARD_DSE_SHORTNAME, defaultSearchEngineName);
}
static public void updateActiveDSE(boolean isPrivate) {
TemplateUrl templateUrl = getTemplateUrlByShortName(getDSEShortName(isPrivate));
if (templateUrl == null) {
return;
}
String keyword = templateUrl.getKeyword();
TemplateUrlServiceFactory.get().setSearchEngine(keyword);
}
static public void setDSEPrefs(TemplateUrl templateUrl, boolean isPrivate) {
SharedPreferences.Editor sharedPreferencesEditor =
ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putString(
isPrivate ? BraveHelper.PRIVATE_DSE_SHORTNAME :
BraveHelper.STANDARD_DSE_SHORTNAME, templateUrl.getShortName());
sharedPreferencesEditor.apply();
}
static public void initializeBraveSearchEngineStates(TabModelSelector tabModelSelector) {
tabModelSelector.addObserver(new SearchEngineTabModelSelectorObserver(tabModelSelector));
@@ -71,18 +39,17 @@ public class BraveSearchEngineUtils {
// At first run, we should set initial default prefs to each standard/private DSE prefs.
// Those pref values will be used until user change DES options explicitly.
final String notInitialized = "notInitialized";
if (notInitialized.equals(
ContextUtils.getAppSharedPreferences().getString(
BraveHelper.STANDARD_DSE_SHORTNAME, notInitialized))) {
if (notInitialized.equals(ContextUtils.getAppSharedPreferences().getString(
BraveSearchEngineAdapter.STANDARD_DSE_SHORTNAME, notInitialized))) {
TemplateUrl templateUrl =
TemplateUrlServiceFactory.get().getDefaultSearchEngineTemplateUrl();
TemplateUrlServiceFactory.get().getDefaultSearchEngineTemplateUrl();
SharedPreferences.Editor sharedPreferencesEditor =
ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putString(BraveHelper.STANDARD_DSE_SHORTNAME,
templateUrl.getShortName());
sharedPreferencesEditor.putString(BraveHelper.PRIVATE_DSE_SHORTNAME,
templateUrl.getShortName());
ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putString(
BraveSearchEngineAdapter.STANDARD_DSE_SHORTNAME, templateUrl.getShortName());
sharedPreferencesEditor.putString(
BraveSearchEngineAdapter.PRIVATE_DSE_SHORTNAME, templateUrl.getShortName());
sharedPreferencesEditor.apply();
}
}
@@ -95,16 +62,19 @@ public class BraveSearchEngineUtils {
updateActiveDSE(false);
}
static public void setDSEPrefs(TemplateUrl templateUrl, boolean isPrivate) {
BraveSearchEngineAdapter.setDSEPrefs(templateUrl, isPrivate);
}
static public void updateActiveDSE(boolean isPrivate) {
BraveSearchEngineAdapter.updateActiveDSE(isPrivate);
}
static public String getDSEShortName(boolean isPrivate) {
return BraveSearchEngineAdapter.getDSEShortName(isPrivate);
}
static public TemplateUrl getTemplateUrlByShortName(String name) {
List<TemplateUrl> templateUrls = TemplateUrlServiceFactory.get().getTemplateUrls();
for (int index = 0; index < templateUrls.size(); ++index) {
TemplateUrl templateUrl = templateUrls.get(index);
if (templateUrl.getShortName().equals(name)) {
return templateUrl;
}
}
// This should not happen
assert false;
return null;
return BraveSearchEngineAdapter.getTemplateUrlByShortName(name);
}
}
android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java
+1 -1
View File
@@ -345,7 +345,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
@Override
public void onActivityCreated(Bundle savedInstanceState) {
getActivity().setTitle(R.string.sign_in_sync);
getActivity().setTitle(R.string.sync_category_title);
mScrollViewSyncInitial = (ScrollView) getView().findViewById(R.id.view_sync_initial);
mScrollViewSyncChainCode = (ScrollView) getView().findViewById(R.id.view_sync_chain_code);
android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java
+10 -8
View File
@@ -6,19 +6,20 @@
package org.chromium.chrome.browser.settings.themes;
import android.content.Context;
import androidx.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
import android.widget.RadioGroup;
import org.chromium.chrome.R;
import org.chromium.components.browser_ui.widget.RadioButtonWithDescription;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.preferences.BravePref;
import org.chromium.components.user_prefs.UserPrefs;
import androidx.preference.PreferenceViewHolder;
import org.chromium.chrome.browser.BraveRelaunchUtils;
import org.chromium.chrome.browser.night_mode.R;
import org.chromium.chrome.browser.night_mode.settings.RadioButtonGroupThemePreference;
import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
import org.chromium.chrome.browser.BraveRelaunchUtils;
import org.chromium.chrome.browser.preferences.BravePref;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.components.browser_ui.widget.RadioButtonWithDescription;
import org.chromium.components.user_prefs.UserPrefs;
public class BraveRadioButtonGroupCustomHomepageThemePreference extends RadioButtonGroupThemePreference {
@@ -50,7 +51,8 @@ public class BraveRadioButtonGroupCustomHomepageThemePreference extends RadioBut
braveDefaultView.setChecked(true);
}
}
braveDefaultView.setPrimaryText(getContext().getResources().getString(R.string.brave_default));
braveDefaultView.setPrimaryText(
getContext().getResources().getString(org.chromium.chrome.R.string.brave_default));
}
@Override
android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java
+86 -16
View File
@@ -5,21 +5,28 @@
package org.chromium.chrome.browser.signin;
import android.accounts.Account;
import androidx.annotation.MainThread;
import androidx.annotation.Nullable;
import org.chromium.base.Callback;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.chrome.browser.AppHooks;
import org.chromium.chrome.browser.signin.services.SigninManager;
import org.chromium.chrome.browser.sync.AndroidSyncSettings;
import org.chromium.components.externalauth.ExternalAuthUtils;
import org.chromium.components.signin.AccountTrackerService;
import org.chromium.components.signin.base.CoreAccountInfo;
import org.chromium.components.signin.identitymanager.AccountInfoService;
import org.chromium.components.signin.identitymanager.IdentityManager;
import org.chromium.components.signin.identitymanager.IdentityMutator;
import org.chromium.components.signin.metrics.SigninAccessPoint;
import org.chromium.components.signin.metrics.SignoutReason;
public class BraveSigninManager extends SigninManagerImpl {
BraveSigninManager(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService,
IdentityManager identityManager, IdentityMutator identityMutator,
AndroidSyncSettings androidSyncSettings, ExternalAuthUtils externalAuthUtils) {
super(nativeSigninManagerAndroid, accountTrackerService, identityManager, identityMutator,
androidSyncSettings, externalAuthUtils);
public class BraveSigninManager implements SigninManager {
private final IdentityManager mIdentityManager;
BraveSigninManager(IdentityManager identityManager) {
mIdentityManager = identityManager;
}
@Override
@@ -32,16 +39,79 @@ public class BraveSigninManager extends SigninManagerImpl {
return false;
}
@Override
public void isAccountManaged(String email, final Callback<Boolean> callback) {}
@Override
public String getManagementDomain() {
return "";
}
@Override
public void signOut(@SignoutReason int signoutSource, SignOutCallback signOutCallback,
boolean forceWipeUserData) {}
@Override
@MainThread
public void runAfterOperationInProgress(Runnable runnable) {}
@Override
public void signinAndEnableSync(@SigninAccessPoint int accessPoint, CoreAccountInfo accountInfo,
@Nullable SignInCallback callback) {}
@Override
@Deprecated
public void signinAndEnableSync(@SigninAccessPoint int accessPoint, Account account,
@Nullable SignInCallback callback) {}
@Override
public void signin(CoreAccountInfo accountInfo, @Nullable SignInCallback callback) {}
@Override
public void removeSignInAllowedObserver(SignInAllowedObserver observer) {}
@Override
public void addSignInAllowedObserver(SignInAllowedObserver observer) {}
@Override
public void removeSignInStateObserver(SignInStateObserver observer) {}
@Override
public void addSignInStateObserver(SignInStateObserver observer) {}
@Override
public boolean isForceSigninEnabled() {
return false;
}
@Override
public boolean isSigninDisabledByPolicy() {
return false;
}
@Override
public void onFirstRunCheckDone() {}
@Override
public IdentityManager getIdentityManager() {
return mIdentityManager;
}
@Override
public String extractDomainName(String accountEmail) {
return "";
};
@CalledByNative
private static SigninManager create(long nativeSigninManagerAndroid,
static SigninManager create(long nativeSigninManagerAndroid,
AccountTrackerService accountTrackerService, IdentityManager identityManager,
IdentityMutator identityMutator) {
assert nativeSigninManagerAndroid != 0;
assert accountTrackerService != null;
assert identityManager != null;
assert identityMutator != null;
return new BraveSigninManager(nativeSigninManagerAndroid, accountTrackerService,
identityManager, identityMutator, AndroidSyncSettings.get(),
ExternalAuthUtils.getInstance());
AccountInfoService.init(identityManager);
return new BraveSigninManager(identityManager);
}
@CalledByNative
void destroy() {
AccountInfoService.get().destroy();
}
}
android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java
+10 -4
View File
@@ -5,13 +5,16 @@
package org.chromium.chrome.browser.tabmodel;
import android.app.Activity;
import android.os.Build;
import org.chromium.base.BraveReflectionUtil;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
import org.chromium.chrome.browser.init.StartupTabPreloader;
import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
@@ -25,12 +28,15 @@ import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.ui.base.WindowAndroid;
public class BraveTabCreator extends ChromeTabCreator {
public BraveTabCreator(ChromeActivity activity, WindowAndroid nativeWindow,
public BraveTabCreator(Activity activity, WindowAndroid nativeWindow,
StartupTabPreloader startupTabPreloader,
Supplier<TabDelegateFactory> tabDelegateFactory, boolean incognito,
OverviewNTPCreator overviewNTPCreator, AsyncTabParamsManager asyncTabParamsManager) {
super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito, overviewNTPCreator, asyncTabParamsManager);
OverviewNTPCreator overviewNTPCreator, AsyncTabParamsManager asyncTabParamsManager,
ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
ObservableSupplier<CompositorViewHolder> compositorViewHolderSupplier) {
super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito,
overviewNTPCreator, asyncTabParamsManager, tabModelSelectorSupplier,
compositorViewHolderSupplier);
}
@Override
android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
+3 -4
View File
@@ -130,7 +130,7 @@ public class BraveToolbarManager extends ToolbarManager {
ObservableSupplier<Boolean> omniboxFocusStateSupplier,
OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
OneshotSupplier<Boolean> promoShownOneshotSupplier, WindowAndroid windowAndroid,
Supplier<Boolean> isInOverviewModeSupplier, boolean isCustomTab,
Supplier<Boolean> isInOverviewModeSupplier,
Supplier<ModalDialogManager> modalDialogManagerSupplier,
StatusBarColorController statusBarColorController, AppMenuDelegate appMenuDelegate,
ActivityLifecycleDispatcher activityLifecycleDispatcher,
@@ -143,9 +143,8 @@ public class BraveToolbarManager extends ToolbarManager {
layoutStateProviderSupplier, appMenuCoordinatorSupplier, shouldShowUpdateBadge,
tabModelSelectorSupplier, startSurfaceSupplier, omniboxFocusStateSupplier,
intentMetadataOneshotSupplier, promoShownOneshotSupplier, windowAndroid,
isInOverviewModeSupplier, isCustomTab, modalDialogManagerSupplier,
statusBarColorController, appMenuDelegate, activityLifecycleDispatcher,
startSurfaceParentTabSupplier);
isInOverviewModeSupplier, modalDialogManagerSupplier, statusBarColorController,
appMenuDelegate, activityLifecycleDispatcher, startSurfaceParentTabSupplier);
mOmniboxFocusStateSupplier = omniboxFocusStateSupplier;
mLayoutStateProviderSupplier = layoutStateProviderSupplier;
mActivity = activity;
android/java/res/xml/brave_main_preferences.xml
+2 -2
View File
@@ -12,12 +12,12 @@
android:order="0"
android:title="@string/prefs_section_search_engine"/>
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:fragment="org.chromium.chrome.browser.settings.BraveStandardSearchEnginePreference"
android:fragment="org.chromium.chrome.browser.search_engines.settings.BraveStandardSearchEnginePreference"
android:key="standard_search_engine"
android:order="1"
android:title="@string/prefs_standard_search_engine"/>
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:fragment="org.chromium.chrome.browser.settings.BravePrivateSearchEnginePreference"
android:fragment="org.chromium.chrome.browser.search_engines.settings.BravePrivateSearchEnginePreference"
android:key="private_search_engine"
android:order="2"
android:title="@string/prefs_private_search_engine"/>