android urls, app icon, shields changes, ai rephraser

android/brave_java_resources.gni

@@ -146,7 +146,7 @@ brave_java_resources = [
   "java/res/drawable-night/restore_wallet.xml",
   "java/res/drawable-night/tablet_recent_tab_empty_state_illustration.xml",
   "java/res/drawable-night/tipping_background_success.xml",
-  "java/res/drawable-nodpi/dylan_malval_sea_min.webp",
+  "java/res/drawable-nodpi/dylan_malval_sea_min.jpg",
   "java/res/drawable-nodpi/eth.png",
   "java/res/drawable-nodpi/ic_quick_action_search_and_bookmark_widget_preview.png",
   "java/res/drawable-nodpi/loader0_orange.png",

android/java/org/chromium/chrome/browser/BraveIntentHandler.java

@@ -23,9 +23,9 @@ public class BraveIntentHandler {
     private static final String TAG = "BraveIntentHandler";
 
     public static final String CONNECTION_INFO_HELP_URL =
-            "https://support.google.com/chrome?p=android_connection_info";
+            "https://ping-browser.com/faqs-and-help";
     public static final String BRAVE_CONNECTION_INFO_HELP_URL =
-            "https://support.brave.com/hc/en-us/articles/360018185871-How-do-I-check-if-a-site-s-connection-is-secure-";
+            "https://ping-browser.com/faqs-and-help";
 
     /**
      * Helper method to extract the raw URL from the intent, without further processing.

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -233,23 +233,23 @@ public abstract class BraveActivity extends ChromeActivity
                    MiscAndroidMetricsConnectionErrorHandler
                            .MiscAndroidMetricsConnectionErrorHandlerDelegate {
     public static final String BRAVE_WALLET_HOST = "wallet";
-    public static final String BRAVE_WALLET_URL = "brave://wallet/crypto/portfolio/assets";
-    public static final String BRAVE_BUY_URL = "brave://wallet/crypto/fund-wallet";
-    public static final String BRAVE_SEND_URL = "brave://wallet/send";
-    public static final String BRAVE_SWAP_URL = "brave://wallet/swap";
-    public static final String BRAVE_DEPOSIT_URL = "brave://wallet/crypto/deposit-funds";
-    public static final String BRAVE_REWARDS_SETTINGS_URL = "brave://rewards/";
+    public static final String BRAVE_WALLET_URL = "ping://wallet/crypto/portfolio/assets";
+    public static final String BRAVE_BUY_URL = "ping://wallet/crypto/fund-wallet";
+    public static final String BRAVE_SEND_URL = "ping://wallet/send";
+    public static final String BRAVE_SWAP_URL = "ping://wallet/swap";
+    public static final String BRAVE_DEPOSIT_URL = "ping://wallet/crypto/deposit-funds";
+    public static final String BRAVE_REWARDS_SETTINGS_URL = "ping://rewards/";
     public static final String BRAVE_REWARDS_SETTINGS_WALLET_VERIFICATION_URL =
-            "brave://rewards/#verify";
-    public static final String BRAVE_REWARDS_WALLET_RECONNECT_URL = "brave://rewards/reconnect";
-    public static final String BRAVE_REWARDS_SETTINGS_MONTHLY_URL = "brave://rewards/#monthly";
-    public static final String REWARDS_AC_SETTINGS_URL = "brave://rewards/contribute";
+            "ping://rewards/#verify";
+    public static final String BRAVE_REWARDS_WALLET_RECONNECT_URL = "ping://rewards/reconnect";
+    public static final String BRAVE_REWARDS_SETTINGS_MONTHLY_URL = "ping://rewards/#monthly";
+    public static final String REWARDS_AC_SETTINGS_URL = "ping://rewards/contribute";
     public static final String BRAVE_AI_CHAT_URL = "chrome-untrusted://chat";
     public static final String REWARDS_LEARN_MORE_URL =
-            "https://brave.com/faq-rewards/#unclaimed-funds";
+            "https://ping-browser.com/faqs-and-help";
     public static final String BRAVE_TERMS_PAGE =
-            "https://basicattentiontoken.org/user-terms-of-service/";
-    public static final String BRAVE_PRIVACY_POLICY = "https://brave.com/privacy/browser/#rewards";
+            "https://ping-browser.com/terms-of-use-1";
+    public static final String BRAVE_PRIVACY_POLICY = "https://ping-browser.com/privacy-policy";
     public static final String OPEN_URL = "open_url";
 
     private static final int DAYS_1 = 1;

android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java

@@ -19,7 +19,7 @@
 
 /** Launches Brave Leo settings page or subscription. */
 public class BraveLeoSettingsLauncherHelper {
-    private static final String ACCOUNT_PAGE_URL = "https://account.brave.com/";
+    private static final String ACCOUNT_PAGE_URL = "https://ping-browser.com/faqs-and-help";
     private static SettingsLauncher sLauncher;
 
     @CalledByNative

android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java

@@ -111,7 +111,7 @@ public class CardBuilderFeedCard {
 
     private static final String TAG = "BN";
     private static final int MARGIN_VERTICAL = 10;
-    private static final String BRAVE_OFFERS_URL = "offers.brave.com";
+    private static final String BRAVE_OFFERS_URL = "https://ping-browser.com/faqs-and-help";
 
     public CardBuilderFeedCard(BraveNewsController braveNewsController, RequestManager glide,
             LinearLayout layout, Activity activity, int position, FeedItemsCard newsItem,

android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java

@@ -107,8 +107,8 @@ public class Utils {
     public static final int SOL_DEFAULT_DECIMALS = 9;
 
     private static final String PREF_CRYPTO_ONBOARDING = "crypto_onboarding";
-    public static final String BRAVE_SUPPORT_URL = "https://support.brave.com";
-    public static final String BRAVE_TERMS_OF_USE_URL = "https://brave.com/terms-of-use/";
+    public static final String BRAVE_SUPPORT_URL = "https://ping-browser.com/faqs-and-help";
+    public static final String BRAVE_TERMS_OF_USE_URL = "https://ping-browser.com/terms-of-use-1";
     public static final String NAME = "name";
     public static final String COIN_TYPE = "coinType";
     public static final String SWAP_EXCHANGE_PROXY = "0xdef1c0ded9bec7f1a1670819833240f027b25eff";

android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletConstants.java

@@ -28,14 +28,14 @@ public final class WalletConstants {
 
     // Brave
     public static final String URL_SIGN_TRANSACTION_REQUEST =
-            "https://support.brave.com/hc/en-us/articles/4409513799693";
+            "https://ping-browser.com/faqs-and-help";
 
     // NFT Auto Discovery
     public static final String NFT_DISCOVERY_LEARN_MORE_LINK =
-            "https://github.com/brave/brave-browser/wiki/NFT-Discovery";
+            "https://ping-browser.com/faqs-and-help";
 
     public static final String WALLET_HELP_CENTER =
-            "https://support.brave.com/hc/en-us/categories/360001059151-Brave-Wallet";
+            "https://ping-browser.com/faqs-and-help";
 
     // Regex
     public static final String REGX_ANY_ETH_ADDRESS = ".*(0x[a-fA-F0-9]{40}).*";

android/java/org/chromium/chrome/browser/feedback/BraveHelpAndFeedbackLauncherImpl.java

@@ -19,9 +19,9 @@
 import java.util.Map;
 
 public class BraveHelpAndFeedbackLauncherImpl implements HelpAndFeedbackLauncher {
-    private static final String FALLBACK_SUPPORT_URL = "https://community.brave.com/";
+    private static final String FALLBACK_SUPPORT_URL = "https://ping-browser.com/faqs-and-help";
     private static final String SAFE_BROWSING_URL =
-            "https://support.brave.com/hc/articles/15222663599629-Safe-Browsing-in-Brave";
+            "https://ping-browser.com/faqs-and-help";
 
     public BraveHelpAndFeedbackLauncherImpl(Profile profile) {}
 

android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java

@@ -64,7 +64,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase {
     // mInitializeViewsDone and mInvokePostWorkAtInitializeViews are accessed
     // from the same thread, so no need to use extra locks
     private static final String P3A_URL =
-            "https://support.brave.com/hc/en-us/articles/9140465918093-What-is-P3A-in-Brave";
+            "https://ping-browser.com/faqs-and-help";
 
     private static final String TAG = "WelcomeOnboarding";
 

android/java/org/chromium/chrome/browser/notifications/BraveOnboardingNotification.java

@@ -35,9 +35,9 @@ public class BraveOnboardingNotification extends BroadcastReceiver {
 
     private static final int BRAVE_ONBOARDING_NOTIFICATION_ID = -2;
     public static String BRAVE_ONBOARDING_NOTIFICATION_TAG = "brave_onboarding_notification_tag";
-    private static String BRAVE_ONBOARDING_ORIGIN_EN = "https://brave.com/my-first-ad/";
-    private static String BRAVE_ONBOARDING_ORIGIN_DE = "https://brave.com/de/my-first-ad/";
-    private static String BRAVE_ONBOARDING_ORIGIN_FR = "https://brave.com/fr/my-first-ad/";
+    private static String BRAVE_ONBOARDING_ORIGIN_EN = "https://ping-browser.com/faqs-and-help";
+    private static String BRAVE_ONBOARDING_ORIGIN_DE = "https://ping-browser.com/faqs-and-help";
+    private static String BRAVE_ONBOARDING_ORIGIN_FR = "https://ping-browser.com/faqs-and-help";
     public static final String DEEP_LINK = "deep_link";
     public static final String USE_CUSTOM_NOTIFICATION = "use_custom_notification";
 

android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java

@@ -45,7 +45,7 @@
 
 public class RewardsBottomSheetDialogFragment extends BottomSheetDialogFragment {
     private static final String TAG = "RewardsBottomSheet";
-    private static final String BRAVE_REWARDS_LEARN_MORE = "https://brave.com/faq-rewards";
+    private static final String BRAVE_REWARDS_LEARN_MORE = "https://ping-browser.com/faqs-and-help";
 
     private int ntpType;
     private NewTabPageListener newTabPageListener;

android/java/org/chromium/chrome/browser/onboarding/v2/HighlightDialogFragment.java

@@ -35,7 +35,7 @@
 
 public class HighlightDialogFragment extends DialogFragment {
     final public static String TAG_FRAGMENT = "HIGHLIGHT_FRAG";
-    private final static String NTP_TUTORIAL_PAGE = "https://brave.com/ja/android-ntp-tutorial";
+    private final static String NTP_TUTORIAL_PAGE = "https://ping-browser.com/faqs-and-help";
 
     public interface HighlightDialogListener {
         void onNextPage();

android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java

@@ -35,7 +35,7 @@
 
 public class RateFeedbackUtils {
     private static final String TAG = "Rate_Brave";
-    private static final String RATE_URL = "https://laptop-updates.brave.com/1/feedback";
+    private static final String RATE_URL = "https://ping-browser.com/faqs-and-help";
 
     public interface RateFeedbackCallback {
         void rateFeedbackSubmitted();

android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java

@@ -99,19 +99,19 @@ public class BraveRewardsPanel
         implements BraveRewardsObserver, BraveRewardsHelper.LargeIconReadyCallback {
     public static final String PREF_WAS_BRAVE_REWARDS_TURNED_ON = "brave_rewards_turned_on";
     public static final String PREF_ON_BOARDING_COMPLETED = "on_boarding_completed";
-    public static final String REWARDS_TOUR_URL = "http://brave.com/rewards-tour";
+    public static final String REWARDS_TOUR_URL = "https://ping-browser.com/faqs-and-help";
     public static final String PREF_WAS_TOOLBAR_BAT_LOGO_BUTTON_PRESSED =
             "was_toolbar_bat_logo_button_pressed";
     private static final String UNVERIFIED_USER_UNSUPPORTED_REGION_PAGE =
-            "https://support.brave.com/hc/en-us/articles/6539887971469";
+            "https://ping-browser.com/faqs-and-help";
     public static final String NEW_SIGNUP_DISABLED_URL =
-            "https://support.brave.com/hc/en-us/articles/9312922941069";
+            "https://ping-browser.com/faqs-and-help";
     private static final String ADS_PAYOUT_STATUS_URL =
-            "https://community.brave.com/t/ads-payout-status-update/287895";
-    private static final String SUPPORT_URL = "https://support.brave.com";
-    private static final String BRAVE_REWARDS_PAGE = "https://brave.com/rewards";
-    private static final String BRAVE_REWARDS_CHANGES_PAGE = "https://brave.com/rewards-changes";
-    private static final String BRAVE_REWARDS_RESET_PAGE = "brave://rewards#reset";
+            "https://ping-browser.com/faqs-and-help";
+    private static final String SUPPORT_URL = "https://ping-browser.com/faqs-and-help";
+    private static final String BRAVE_REWARDS_PAGE = "https://ping-browser.com/faqs-and-help";
+    private static final String BRAVE_REWARDS_CHANGES_PAGE = "https://ping-browser.com/faqs-and-help";
+    private static final String BRAVE_REWARDS_RESET_PAGE = "ping://rewards#reset";
 
     private static final String TAG = "BraveRewards";
     private static final int UPDATE_BALANCE_INTERVAL = 60000; // In milliseconds

android/java/org/chromium/chrome/browser/rewards/tipping/TippingVerifiedCreatorToolTip.java

@@ -31,7 +31,7 @@
 
 public class TippingVerifiedCreatorToolTip {
     private static final String NEW_SIGNUP_DISABLED_URL =
-            "https://support.brave.com/hc/en-us/articles/9312922941069";
+            "https://ping-browser.com/faqs-and-help";
 
     private PopupWindow mPopupWindow;
     public TippingVerifiedCreatorToolTip(@NonNull Context context) {

android/java/org/chromium/chrome/browser/set_default_browser/BraveSetDefaultBrowserUtils.java

@@ -35,7 +35,7 @@ public class BraveSetDefaultBrowserUtils {
     private static final String TAG = "BSDBrowserUtils";
     public static final String ANDROID_SETUPWIZARD_PACKAGE_NAME = "com.google.android.setupwizard";
     public static final String ANDROID_PACKAGE_NAME = "android";
-    public static final String BRAVE_BLOG_URL = "https://brave.com/privacy-features/";
+    public static final String BRAVE_BLOG_URL = "https://ping-browser.com/faqs-and-help";
 
     public static boolean isBottomSheetVisible;
 

android/java/org/chromium/chrome/browser/settings/BraveLeoPreferences.java

@@ -34,9 +34,9 @@ public class BraveLeoPreferences extends BravePreferenceFragment
     private static final String PREF_SUBSCRIPTION_CATEGORY = "subscription_category";
     private static final String PREF_DEFAULT_MODEL = "default_model";
     private static final String LINK_SUBSCRIPTION_URL =
-            "https://account.brave.com?intent=link-order&product=leo";
+            "https://ping-browser.com/faqs-and-help";
     private static final String LINK_SUBSCRIPTION_URL_STAGING =
-            "https://account.bravesoftware.com?intent=link-order&product=leo";
+            "https://ping-browser.com/faqs-and-help";
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java

@@ -267,7 +267,7 @@ private void rearrangePreferenceOrders() {
 
         findPreference(PREF_FEATURES_SECTION).setOrder(++firstSectionOrder);
 
-        // findPreference(PREF_SHIELDS_AND_PRIVACY).setOrder(++firstSectionOrder);
+        findPreference(PREF_SHIELDS_AND_PRIVACY).setOrder(++firstSectionOrder);
         // findPreference(PREF_BRAVE_NEWS_V2).setOrder(++firstSectionOrder);
 
         if (ChromeFeatureList.isEnabled(BraveFeatureList.NATIVE_BRAVE_WALLET)) {
@@ -421,7 +421,7 @@ private void updateSummaries() {
 
     private void overrideChromiumPreferences() {
         // Replace fragment.
-        // findPreference(PREF_SHIELDS_AND_PRIVACY).setFragment(BravePrivacySettings.class.getName());
+        findPreference(PREF_SHIELDS_AND_PRIVACY).setFragment(BravePrivacySettings.class.getName());
         Preference preference = findPreference(MainSettings.PREF_HOMEPAGE);
         if (preference != null) {
             preference.setFragment(BraveHomepageSettings.class.getName());

android/java/org/chromium/chrome/browser/settings/BraveWebrtcPolicyPreference.java

@@ -45,7 +45,7 @@ public class BraveWebrtcPolicyPreference
     private TextView mLearnMore;
     private ArrayList<RadioButtonWithDescription> mButtons;
     protected static final String FALLBACK_SUPPORT_URL =
-            "https://support.brave.com/hc/en-us/articles/360017989132-How-do-I-change-my-Privacy-Settings-#webrtc";
+            "https://ping-browser.com/faqs-and-help";
 
     @SuppressLint("WrongConstant")
     public BraveWebrtcPolicyPreference(Context context, AttributeSet attrs) {

android/java/org/chromium/chrome/browser/shields/CreateCustomFiltersFragment.java

@@ -32,7 +32,7 @@
 public class CreateCustomFiltersFragment extends BravePreferenceFragment
         implements ConnectionErrorHandler {
     public static final String BRAVE_ADBLOCK_FILTER_SYNTAX_PAGE =
-            "https://support.brave.com/hc/en-us/articles/6449369961741";
+            "https://ping-browser.com/faqs-and-help";
 
     private FilterListAndroidHandler mFilterListAndroidHandler;
     private EditText mEtCustomFilters;

android/java/org/chromium/chrome/browser/upgrade/NotificationIntent.java

@@ -31,7 +31,7 @@ public class NotificationIntent {
     private static final String TAG = "NotificationIntent";
     private static final String NOTIFICATION_TAG = "16c570a4-da7d-4c4e-8518-d2b7d6e41615";
     private static final String NOTIFICATION_CHANNEL_ID = "a79c3102-4183-4001-a553-ec3041bd0f49";
-    private static final String URL = "https://support.brave.com/hc/en-us/articles/360045401211/";
+    private static final String URL = "https://ping-browser.com/faqs-and-help";
     private static final List<String> mWhitelistedRegionalLocales = Arrays.asList("en", "ru", "uk", "de", "pt", "pl", "ja", "es", "fr");
     private static final int NOTIFICATION_ID = 732;
     //private static final String NOTIFICATION_TITLE = "Brave update";

android/java/org/chromium/chrome/browser/util/BraveConstants.java

@@ -22,9 +22,9 @@ public final class BraveConstants {
     public static final String BRAVE_NIGHTLY_PACKAGE_NAME = "com.brave.browser_nightly";
 
     // used in BraveNtpAdapter
-    public static final String BRAVE_REF_URL = "https://brave.com/r/";
+    public static final String BRAVE_REF_URL = "https://ping-browser.com/faqs-and-help";
     public static final String BRAVE_NEWS_LEARN_MORE_URL =
-            "https://brave.com/privacy/browser/#brave-news";
+            "https://ping-browser.com/faqs-and-help";
 
     public static final String INDIA_COUNTRY_CODE = "IN";
 

android/java/org/chromium/chrome/browser/vpn/settings/BraveVpnPreferences.java

@@ -77,7 +77,7 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
     private static final int INVALIDATE_CREDENTIAL_TIMER_COUNT = 5000;
 
     private static final String VPN_SUPPORT_PAGE =
-            "https://support.brave.com/hc/en-us/articles/4410838268429";
+            "https://ping-browser.com/faqs-and-help";
 
     private static final String DATE_FORMAT = "dd/MM/yyyy";
 

android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java

@@ -52,9 +52,9 @@ public class BraveVpnUtils {
     public static final String DESKTOP_CREDENTIAL = "desktop_credential";
 
     private static final String BRAVE_ACCOUNT_PROD_PAGE_URL =
-            "https://account.brave.com?intent=connect-receipt&product=vpn";
+            "https://ping-browser.com/faqs-and-help";
     private static final String BRAVE_ACCOUNT_STAGING_PAGE_URL =
-            "https://account.bravesoftware.com?intent=connect-receipt&product=vpn";
+            "https://ping-browser.com/faqs-and-help";
 
     public static boolean mUpdateProfileAfterSplitTunnel;
     public static BraveVpnServerRegion selectedServerRegion;