Merge pull request #12182 from brave/resolve_rewards_icon_issue

Resolve rewards icon issue

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

@@ -33,6 +33,9 @@ import org.chromium.ui.base.DeviceFormFactor;
 public class AppearancePreferences extends BravePreferenceFragment
         implements Preference.OnPreferenceChangeListener, BraveRewardsObserver {
     public static final String PREF_HIDE_BRAVE_REWARDS_ICON = "hide_brave_rewards_icon";
+    public static final String PREF_HIDE_BRAVE_REWARDS_ICON_MIGRATION =
+            "hide_brave_rewards_icon_migration";
+    public static final String PREF_SHOW_BRAVE_REWARDS_ICON = "show_brave_rewards_icon";
     public static final String PREF_BRAVE_NIGHT_MODE_ENABLED = "brave_night_mode_enabled_key";
     public static final String PREF_BRAVE_ENABLE_TAB_GROUPS = "brave_enable_tab_groups";
     public static final String PREF_BRAVE_DISABLE_SHARING_HUB = "brave_disable_sharing_hub";
@@ -56,7 +59,7 @@ public class AppearancePreferences extends BravePreferenceFragment
         }
 
         if (!ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)) {
-            removePreferenceIfPresent(PREF_HIDE_BRAVE_REWARDS_ICON);
+            removePreferenceIfPresent(PREF_SHOW_BRAVE_REWARDS_ICON);
         }
     }
 
@@ -72,13 +75,13 @@ public class AppearancePreferences extends BravePreferenceFragment
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        ChromeSwitchPreference hideBraveRewardsIconPref =
-                (ChromeSwitchPreference) findPreference(PREF_HIDE_BRAVE_REWARDS_ICON);
-        if (hideBraveRewardsIconPref != null) {
+        ChromeSwitchPreference showBraveRewardsIconPref =
+                (ChromeSwitchPreference) findPreference(PREF_SHOW_BRAVE_REWARDS_ICON);
+        if (showBraveRewardsIconPref != null) {
             SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
-            hideBraveRewardsIconPref.setChecked(
-                    !sharedPreferences.getBoolean(PREF_HIDE_BRAVE_REWARDS_ICON, false));
-            hideBraveRewardsIconPref.setOnPreferenceChangeListener(this);
+            showBraveRewardsIconPref.setChecked(
+                    sharedPreferences.getBoolean(PREF_SHOW_BRAVE_REWARDS_ICON, true));
+            showBraveRewardsIconPref.setOnPreferenceChangeListener(this);
         }
 
         Preference nightModeEnabled = findPreference(PREF_BRAVE_NIGHT_MODE_ENABLED);
@@ -150,10 +153,10 @@ public class AppearancePreferences extends BravePreferenceFragment
                             BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, !originalStatus)
                     .apply();
             BraveRelaunchUtils.askForRelaunch(getActivity());
-        } else if (PREF_HIDE_BRAVE_REWARDS_ICON.equals(key)) {
+        } else if (PREF_SHOW_BRAVE_REWARDS_ICON.equals(key)) {
             SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
             SharedPreferences.Editor sharedPreferencesEditor = sharedPreferences.edit();
-            sharedPreferencesEditor.putBoolean(PREF_HIDE_BRAVE_REWARDS_ICON, !(boolean) newValue);
+            sharedPreferencesEditor.putBoolean(PREF_SHOW_BRAVE_REWARDS_ICON, !(boolean) newValue);
             sharedPreferencesEditor.apply();
             BraveRelaunchUtils.askForRelaunch(getActivity());
         } else if (PREF_BRAVE_NIGHT_MODE_ENABLED.equals(key)) {

android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java

@@ -134,7 +134,6 @@ import java.util.Locale;
 public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
         implements BraveToolbarLayout, OnClickListener, View.OnLongClickListener,
                    BraveRewardsObserver, BraveRewardsNativeWorker.PublisherObserver {
-    public static final String PREF_HIDE_BRAVE_REWARDS_ICON = "hide_brave_rewards_icon";
     private static final String JAPAN_COUNTRY_CODE = "JP";
     private static final List<String> mBraveSearchEngineDefaultRegions =
             Arrays.asList("CA", "DE", "FR", "GB", "US");
@@ -300,10 +299,24 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
         mBraveShieldsContentSettings.addObserver(mBraveShieldsContentSettingsObserver);
 
         SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
+        // On update check for hide rewards icon pref and update it with new show rewards icon pref
+        if (!PackageUtils.isFirstInstall(getContext())
+                && !sharedPreferences.getBoolean(
+                        AppearancePreferences.PREF_HIDE_BRAVE_REWARDS_ICON_MIGRATION, false)) {
+            boolean value = sharedPreferences.getBoolean(
+                    AppearancePreferences.PREF_HIDE_BRAVE_REWARDS_ICON, false);
+            SharedPreferences.Editor sharedPreferencesEditor = sharedPreferences.edit();
+            sharedPreferencesEditor.putBoolean(
+                    AppearancePreferences.PREF_SHOW_BRAVE_REWARDS_ICON, !value);
+            sharedPreferencesEditor.putBoolean(
+                    AppearancePreferences.PREF_HIDE_BRAVE_REWARDS_ICON_MIGRATION, true);
+            sharedPreferencesEditor.apply();
+        }
+
         if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)
                 && !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()
-                && !sharedPreferences.getBoolean(
-                        AppearancePreferences.PREF_HIDE_BRAVE_REWARDS_ICON, false)
+                && sharedPreferences.getBoolean(
+                        AppearancePreferences.PREF_SHOW_BRAVE_REWARDS_ICON, true)
                 && mRewardsLayout != null) {
             mRewardsLayout.setVisibility(View.VISIBLE);
         }
@@ -1050,8 +1063,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
         } else if (isNativeLibraryReady()
                 && ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)
                 && !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()
-                && !sharedPreferences.getBoolean(
-                        AppearancePreferences.PREF_HIDE_BRAVE_REWARDS_ICON, false)) {
+                && sharedPreferences.getBoolean(
+                        AppearancePreferences.PREF_SHOW_BRAVE_REWARDS_ICON, true)) {
             mRewardsLayout.setVisibility(View.VISIBLE);
             updateShieldsLayoutBackground(false);
         }

android/java/res/xml/appearance_preferences.xml

@@ -6,7 +6,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
-      android:key="hide_brave_rewards_icon"
+      android:key="show_brave_rewards_icon"
       android:title="@string/show_brave_rewards_icon_title"
       android:summaryOn="@string/text_on"
       android:summaryOff="@string/text_off" />