From d18b5c52df11243338341713f51f8dcf8dc67abf Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 10 Oct 2024 19:08:06 -0400 Subject: [PATCH] [Android] Rename SettingsLauncher to SettingsNavigation Chromium change: https://source.chromium.org/chromium/chromium/src/+/79741f6bd5052dbfb30025c44f4b6851cb664e38 [Settings] Rename SettingsLauncher to SettingsNavigation Now that SettingsLauncher provides a method to go back to the previous page, it makes more sense to replace "launcher" in its name to something more generic. This patch renames SettingsLauncher and its friends to SettingsNavigation. Also, methods in the interface are renamed to drop mentions of "activity" since they don't necessarily start a new activity in the single-activity mode. Summary of changes: - SettingsLauncher -> SettingsNavigation (w/ variants) - launchSettingsActivity -> startSettings - createSettingsActivityIntent -> createSettingsIntent - finishCurrentFragment -> finishCurrentSettings Bug: b/356743945 --- .../chrome/browser/app/BraveActivity.java | 24 +++++++++---------- .../BraveLeoSettingsLauncherHelper.java | 12 +++++----- .../activities/BraveWalletActivity.java | 9 +++---- .../activities/NetworkSelectorActivity.java | 6 ++--- .../BraveSyncAccountDeletedInformer.java | 10 ++++---- .../browser/ntp/BraveNewTabPageLayout.java | 11 ++++----- .../omnibox/BraveLocationBarCoordinator.java | 7 ++++-- .../settings/BraveNewsPreferencesV2.java | 17 ++++++------- .../settings/BraveSettingsLauncherImpl.java | 14 ++++++----- .../settings/BraveSyncScreensPreference.java | 7 +++--- ...BraveWalletNetworksPreferenceFragment.java | 14 +++++------ .../shields/ContentFilteringFragment.java | 18 +++++++------- ...BraveSettingsLauncherImplClassAdapter.java | 6 ++--- 13 files changed, 82 insertions(+), 73 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 578d5ddb28b..dd52ef9b3d3 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -166,7 +166,7 @@ import org.chromium.chrome.browser.set_default_browser.OnBraveSetDefaultBrowserL import org.chromium.chrome.browser.settings.BraveNewsPreferencesV2; import org.chromium.chrome.browser.settings.BraveSearchEngineUtils; import org.chromium.chrome.browser.settings.BraveWalletPreferences; -import org.chromium.chrome.browser.settings.SettingsLauncherFactory; +import org.chromium.chrome.browser.settings.SettingsNavigationFactory; import org.chromium.chrome.browser.settings.developer.BraveQAPreferences; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin; @@ -204,7 +204,7 @@ import org.chromium.chrome.browser.vpn.utils.BraveVpnPrefUtils; import org.chromium.chrome.browser.vpn.utils.BraveVpnProfileUtils; import org.chromium.chrome.browser.vpn.utils.BraveVpnUtils; import org.chromium.chrome.browser.vpn.wireguard.WireguardConfigUtils; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.embedder_support.util.UrlUtilities; import org.chromium.components.safe_browsing.BraveSafeBrowsingApiHandler; @@ -1537,28 +1537,28 @@ public abstract class BraveActivity extends ChromeActivity } public void openBravePlaylistSettings() { - SettingsLauncher settingsLauncher = SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity(this, BravePlaylistPreferences.class); + SettingsNavigation settingsLauncher = SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(this, BravePlaylistPreferences.class); } public void openBraveNewsSettings() { - SettingsLauncher settingsLauncher = SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity(this, BraveNewsPreferencesV2.class); + SettingsNavigation settingsLauncher = SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(this, BraveNewsPreferencesV2.class); } public void openBraveContentFilteringSettings() { - SettingsLauncher settingsLauncher = SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity(this, ContentFilteringFragment.class); + SettingsNavigation settingsLauncher = SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(this, ContentFilteringFragment.class); } public void openBraveWalletSettings() { - SettingsLauncher settingsLauncher = SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity(this, BraveWalletPreferences.class); + SettingsNavigation settingsLauncher = SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(this, BraveWalletPreferences.class); } public void openBraveConnectedSitesSettings() { - SettingsLauncher settingsLauncher = SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity(this, BraveWalletEthereumConnectedSites.class); + SettingsNavigation settingsLauncher = SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(this, BraveWalletEthereumConnectedSites.class); } public void openBraveWallet(boolean fromDapp, boolean setupAction, boolean restoreAction) { diff --git a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java index 73a9342fd9a..31fffb822c9 100644 --- a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java +++ b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java @@ -12,16 +12,16 @@ import org.jni_zero.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.BraveLeoPreferences; -import org.chromium.chrome.browser.settings.SettingsLauncherFactory; +import org.chromium.chrome.browser.settings.SettingsNavigationFactory; import org.chromium.chrome.browser.util.TabUtils; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; /** Launches Brave Leo settings page or subscription. */ public class BraveLeoSettingsLauncherHelper { private static final String ACCOUNT_PAGE_URL = "https://account.brave.com/"; - private static SettingsLauncher sLauncher; + private static SettingsNavigation sLauncher; @CalledByNative private static void showBraveLeoSettings(WebContents webContents) { @@ -29,7 +29,7 @@ public class BraveLeoSettingsLauncherHelper { if (context == null) { return; } - getLauncher().launchSettingsActivity(context, BraveLeoPreferences.class); + getLauncher().startSettings(context, BraveLeoPreferences.class); } @CalledByNative @@ -71,7 +71,7 @@ public class BraveLeoSettingsLauncherHelper { activity.finish(); } - private static SettingsLauncher getLauncher() { - return sLauncher != null ? sLauncher : SettingsLauncherFactory.createSettingsLauncher(); + private static SettingsNavigation getLauncher() { + return sLauncher != null ? sLauncher : SettingsNavigationFactory.createSettingsNavigation(); } } diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java index b69d43e0db8..c92fc40cca8 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java @@ -30,9 +30,9 @@ import org.chromium.chrome.browser.crypto_wallet.listeners.OnNextPage; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.crypto_wallet.util.WalletUtils; import org.chromium.chrome.browser.settings.BraveWalletPreferences; -import org.chromium.chrome.browser.settings.SettingsLauncherFactory; +import org.chromium.chrome.browser.settings.SettingsNavigationFactory; import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.modaldialog.ModalDialogManager; @@ -74,8 +74,9 @@ public class BraveWalletActivity extends BraveWalletBaseActivity implements OnNe @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { if (item.getItemId() == R.id.settings) { - SettingsLauncher settingsLauncher = SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity(this, BraveWalletPreferences.class); + SettingsNavigation settingsLauncher = + SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(this, BraveWalletPreferences.class); return true; } else if (item.getItemId() == R.id.lock) { if (mKeyringService != null) { diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java index 65279da5eba..6c749b9eeeb 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java @@ -30,7 +30,7 @@ import org.chromium.chrome.browser.crypto_wallet.adapters.NetworkSelectorAdapter import org.chromium.chrome.browser.crypto_wallet.util.WalletConstants; import org.chromium.chrome.browser.settings.BraveSettingsLauncherImpl; import org.chromium.chrome.browser.settings.BraveWalletAddNetworksFragment; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import java.util.List; import java.util.function.Predicate; @@ -42,7 +42,7 @@ public class NetworkSelectorActivity extends BraveWalletBaseActivity private RecyclerView mRVNetworkSelector; private NetworkSelectorAdapter mNetworkSelectorAdapter; private MaterialToolbar mToolbar; - private SettingsLauncher mSettingsLauncher; + private SettingsNavigation mSettingsLauncher; private WalletModel mWalletModel; private NetworkModel mNetworkModel; @@ -142,7 +142,7 @@ public class NetworkSelectorActivity extends BraveWalletBaseActivity fragmentArgs.putString(ADD_NETWORK_FRAGMENT_ARG_CHAIN_ID, ""); fragmentArgs.putBoolean(ADD_NETWORK_FRAGMENT_ARG_ACTIVE_NETWORK, false); Intent intent = - mSettingsLauncher.createSettingsActivityIntent( + mSettingsLauncher.createSettingsIntent( this, BraveWalletAddNetworksFragment.class, fragmentArgs); startActivity(intent); } diff --git a/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java b/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java index b1bc7ca9ad4..1fbd0074c07 100644 --- a/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java +++ b/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java @@ -14,11 +14,11 @@ import org.chromium.chrome.browser.BraveSyncWorker; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.infobar.BraveInfoBarIdentifier; import org.chromium.chrome.browser.settings.BraveSyncScreensPreference; -import org.chromium.chrome.browser.settings.SettingsLauncherFactory; +import org.chromium.chrome.browser.settings.SettingsNavigationFactory; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.messages.infobar.BraveSimpleConfirmInfoBarBuilder; import org.chromium.chrome.browser.ui.messages.infobar.SimpleConfirmInfoBarBuilder; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsNavigation; public class BraveSyncAccountDeletedInformer { private static final String TAG = "SyncAccountDeleted"; @@ -59,9 +59,9 @@ public class BraveSyncAccountDeletedInformer { // Pressing link `re-create the account` // Don't show the informer again disableInformer(); - SettingsLauncher settingsLauncher = - SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity( + SettingsNavigation settingsLauncher = + SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings( ContextUtils.getApplicationContext(), BraveSyncScreensPreference.class); return false; diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index 2e21df0707b..ab8cd6ccf3f 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -96,14 +96,14 @@ import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.rate.RateUtils; import org.chromium.chrome.browser.settings.BackgroundImagesPreferences; import org.chromium.chrome.browser.settings.BraveNewsPreferencesV2; -import org.chromium.chrome.browser.settings.SettingsLauncherFactory; +import org.chromium.chrome.browser.settings.SettingsNavigationFactory; import org.chromium.chrome.browser.suggestions.tile.BraveMostVisitedTilesLayoutBase; import org.chromium.chrome.browser.suggestions.tile.TileGroup.Delegate; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabAttributes; import org.chromium.chrome.browser.ui.native_page.TouchEnabledDelegate; import org.chromium.chrome.browser.util.TabUtils; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.user_prefs.UserPrefs; import org.chromium.mojo.bindings.ConnectionErrorHandler; @@ -351,10 +351,9 @@ public class BraveNewTabPageLayout ImageView ivNewsSettings = findViewById(R.id.news_settings_button); ivNewsSettings.setOnClickListener( view -> { - SettingsLauncher settingsLauncher = - SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity( - getContext(), BraveNewsPreferencesV2.class); + SettingsNavigation settingsLauncher = + SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(getContext(), BraveNewsPreferencesV2.class); }); mRecyclerView = findViewById(R.id.recyclerview); diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java index cc882e8b459..e69affdf964 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java @@ -7,6 +7,7 @@ package org.chromium.chrome.browser.omnibox; import android.view.ActionMode; import android.view.View; +import android.view.View.OnLongClickListener; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -88,7 +89,8 @@ public class BraveLocationBarCoordinator extends LocationBarCoordinator { @Nullable ObservableSupplier tabModelSelectorSupplier, LocationBarEmbedderUiOverrides uiOverrides, @Nullable View baseChromeLayout, - Supplier bottomWindowPaddingSupplier) { + Supplier bottomWindowPaddingSupplier, + @Nullable OnLongClickListener onLongClickListener) { super( locationBarLayout, autocompleteAnchorView, @@ -120,7 +122,8 @@ public class BraveLocationBarCoordinator extends LocationBarCoordinator { tabModelSelectorSupplier, uiOverrides, baseChromeLayout, - bottomWindowPaddingSupplier); + bottomWindowPaddingSupplier, + onLongClickListener); if (mUrlBar != null) { ((UrlBar) mUrlBar).setSelectAllOnFocus(true); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesV2.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesV2.java index 30656d4c446..1923a8e3166 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesV2.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesV2.java @@ -43,16 +43,17 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; import org.chromium.chrome.browser.util.BraveConstants; import org.chromium.chrome.browser.util.BraveTouchUtils; -import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.mojo.bindings.ConnectionErrorHandler; import org.chromium.mojo.system.MojoException; import java.util.List; public class BraveNewsPreferencesV2 extends BravePreferenceFragment - implements BraveNewsPreferencesDataListener, ConnectionErrorHandler, - FragmentSettingsLauncher { + implements BraveNewsPreferencesDataListener, + ConnectionErrorHandler, + FragmentSettingsNavigation { public static final String PREF_SHOW_OPTIN = "show_optin"; private LinearLayout mParentLayout; @@ -74,8 +75,8 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment private boolean mIsPublisherAvailable; private BraveNewsController mBraveNewsController; - // SettingsLauncher injected from main Settings Activity. - private SettingsLauncher mSettingsLauncher; + // SettingsNavigation injected from main Settings Activity. + private SettingsNavigation mSettingsLauncher; private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @@ -258,7 +259,7 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment Bundle fragmentArgs = new Bundle(); fragmentArgs.putString( BraveConstants.BRAVE_NEWS_PREFERENCES_TYPE, braveNewsPreferencesType.toString()); - mSettingsLauncher.launchSettingsActivity( + mSettingsLauncher.startSettings( getActivity(), BraveNewsPreferencesDetails.class, fragmentArgs); } @@ -328,7 +329,7 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment } @Override - public void setSettingsLauncher(SettingsLauncher settingsLauncher) { + public void setSettingsNavigation(SettingsNavigation settingsLauncher) { mSettingsLauncher = settingsLauncher; } diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java b/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java index b37704a097e..ca858baf4ee 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java @@ -20,14 +20,16 @@ import org.chromium.chrome.browser.download.settings.DownloadSettings; import org.chromium.chrome.browser.safe_browsing.settings.BraveStandardProtectionSettingsFragment; import org.chromium.chrome.browser.safe_browsing.settings.StandardProtectionSettingsFragment; -public class BraveSettingsLauncherImpl extends SettingsLauncherImpl { +public class BraveSettingsLauncherImpl extends SettingsNavigationImpl { public BraveSettingsLauncherImpl() { super(); } @Override - public void launchSettingsActivity(Context context, - @Nullable Class fragment, @Nullable Bundle fragmentArgs) { + public void startSettings( + Context context, + @Nullable Class fragment, + @Nullable Bundle fragmentArgs) { if (fragment != null) { // Substitute with our version of class if (fragment.equals(StandardProtectionSettingsFragment.class)) { @@ -38,15 +40,15 @@ public class BraveSettingsLauncherImpl extends SettingsLauncherImpl { fragment = BraveClearBrowsingDataFragmentAdvanced.class; } } - super.launchSettingsActivity(context, fragment, fragmentArgs); + super.startSettings(context, fragment, fragmentArgs); } @Override - public Intent createSettingsActivityIntent( + public Intent createSettingsIntent( Context context, @Nullable Class fragment, @Nullable Bundle fragmentArgs) { - Intent intent = super.createSettingsActivityIntent(context, fragment, fragmentArgs); + Intent intent = super.createSettingsIntent(context, fragment, fragmentArgs); intent.setClass(context, BraveSettingsActivity.class); if (!(context instanceof Activity)) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java index 48098314747..7b627ea6c06 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java @@ -75,7 +75,7 @@ import org.chromium.chrome.browser.share.qrcode.QRCodeGenerator; import org.chromium.chrome.browser.sync.BraveSyncDevices; import org.chromium.chrome.browser.sync.SyncServiceFactory; import org.chromium.chrome.browser.sync.settings.BraveManageSyncSettings; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.components.sync.SyncService; import org.chromium.ui.base.DeviceFormFactor; @@ -742,8 +742,9 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment }); } } else if (mShowCategoriesButton == v) { - SettingsLauncher settingsLauncher = SettingsLauncherFactory.createSettingsLauncher(); - settingsLauncher.launchSettingsActivity(getContext(), BraveManageSyncSettings.class); + SettingsNavigation settingsLauncher = + SettingsNavigationFactory.createSettingsNavigation(); + settingsLauncher.startSettings(getContext(), BraveManageSyncSettings.class); } else if (mAddDeviceButton == v) { setNewChainLayout(); } else if (mDeleteAccountButton == v) { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java index b389ec73319..8a2322bca0e 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java @@ -25,17 +25,17 @@ import androidx.recyclerview.widget.RecyclerView; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.chrome.R; -import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.components.browser_ui.settings.SettingsUtils; public class BraveWalletNetworksPreferenceFragment extends BravePreferenceFragment - implements FragmentSettingsLauncher, BraveWalletAddNetworksFragment.Listener { + implements FragmentSettingsNavigation, BraveWalletAddNetworksFragment.Listener { // Preference key from R.xml.brave_wallet_networks_preference. private static final String PREF_BRAVE_WALLET_NETWORKS_ADD = "pref_brave_wallet_networks_add"; - // SettingsLauncher injected from main Settings Activity. - private SettingsLauncher mSettingsLauncher; + // SettingsNavigation injected from main Settings Activity. + private SettingsNavigation mSettingsLauncher; private ActivityResultLauncher mAddNetworkActivityResultLauncher; private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @@ -115,7 +115,7 @@ public class BraveWalletNetworksPreferenceFragment extends BravePreferenceFragme } @Override - public void setSettingsLauncher(SettingsLauncher settingsLauncher) { + public void setSettingsNavigation(SettingsNavigation settingsLauncher) { mSettingsLauncher = settingsLauncher; } @@ -139,7 +139,7 @@ public class BraveWalletNetworksPreferenceFragment extends BravePreferenceFragme fragmentArgs = null; } Intent intent = - mSettingsLauncher.createSettingsActivityIntent( + mSettingsLauncher.createSettingsIntent( requireContext(), BraveWalletAddNetworksFragment.class, fragmentArgs); mAddNetworkActivityResultLauncher.launch(intent); } diff --git a/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java b/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java index 88fffa461aa..4019b64b282 100644 --- a/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java +++ b/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java @@ -29,8 +29,8 @@ import org.chromium.brave_shields.mojom.SubscriptionInfo; import org.chromium.chrome.R; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.browser.settings.BraveSettingsActivity; -import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; -import org.chromium.components.browser_ui.settings.SettingsLauncher; +import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation; +import org.chromium.components.browser_ui.settings.SettingsNavigation; import org.chromium.mojo.bindings.ConnectionErrorHandler; import org.chromium.mojo.system.MojoException; import org.chromium.mojo_base.mojom.Value; @@ -40,7 +40,9 @@ import java.util.ArrayList; import java.util.Arrays; public class ContentFilteringFragment extends BravePreferenceFragment - implements FragmentSettingsLauncher, BraveContentFilteringListener, ConnectionErrorHandler { + implements FragmentSettingsNavigation, + BraveContentFilteringListener, + ConnectionErrorHandler { private RecyclerView mRecyclerView; private ContentFilteringAdapter mAdapter; @@ -53,8 +55,8 @@ public class ContentFilteringFragment extends BravePreferenceFragment private boolean mIsMenuLoaded; private boolean mIsGetSubscriptionsLoaded; - // SettingsLauncher injected from main Settings Activity. - private SettingsLauncher mSettingsLauncher; + // SettingsNavigation injected from main Settings Activity. + private SettingsNavigation mSettingsLauncher; private ActivityResultLauncher mAddCustomFilterResultLauncher; private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @@ -141,7 +143,7 @@ public class ContentFilteringFragment extends BravePreferenceFragment isEditSelected(false); } Intent intent = - mSettingsLauncher.createSettingsActivityIntent( + mSettingsLauncher.createSettingsIntent( getActivity(), AddCustomFilterListsFragment.class, null); mAddCustomFilterResultLauncher.launch(intent); } @@ -164,7 +166,7 @@ public class ContentFilteringFragment extends BravePreferenceFragment isEditSelected(false); } Intent intent = - mSettingsLauncher.createSettingsActivityIntent( + mSettingsLauncher.createSettingsIntent( getActivity(), CreateCustomFiltersFragment.class, null); getActivity().startActivity(intent); } @@ -186,7 +188,7 @@ public class ContentFilteringFragment extends BravePreferenceFragment } @Override - public void setSettingsLauncher(SettingsLauncher settingsLauncher) { + public void setSettingsNavigation(SettingsNavigation settingsLauncher) { mSettingsLauncher = settingsLauncher; } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveSettingsLauncherImplClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveSettingsLauncherImplClassAdapter.java index 982b6e0ad6c..e9b89dcbe14 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveSettingsLauncherImplClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveSettingsLauncherImplClassAdapter.java @@ -8,14 +8,14 @@ package org.brave.bytecode; import org.objectweb.asm.ClassVisitor; public class BraveSettingsLauncherImplClassAdapter extends BraveClassVisitor { - static String sSettingsLauncherImplClassName = - "org/chromium/chrome/browser/settings/SettingsLauncherImpl"; + static String sSettingsNavigationImplClassName = + "org/chromium/chrome/browser/settings/SettingsNavigationImpl"; static String sBraveSettingsLauncherImplClassName = "org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl"; public BraveSettingsLauncherImplClassAdapter(ClassVisitor visitor) { super(visitor); - redirectConstructor(sSettingsLauncherImplClassName, sBraveSettingsLauncherImplClassName); + redirectConstructor(sSettingsNavigationImplClassName, sBraveSettingsLauncherImplClassName); } }