Skip to content

GitLab

T
tangled
Commit 5711cb12 authored by Henrique Nakashima's avatar Henrique Nakashima Committed by Commit Bot
Browse files
Options

Remove String methods from ChromePreferenceManager. 

SharedPreferencesManager should be used instead.

Bug: 1017800
Change-Id: I49f8a702e456ce636658b233a620066451b26858
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893502
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711820}
parent a68c29b3
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 44 deletions
chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
View file @ 5711cb12
......@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.device.DeviceClassManager;
import org.chromium.chrome.browser.firstrun.FirstRunUtils;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.tasks.tab_management.TabManagementModuleProvider;
import org.chromium.ui.base.DeviceFormFactor;
......@@ -401,7 +402,7 @@ public class FeatureUtilities {
boolean available = ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_NIGHT_MODE)
|| (BuildInfo.isAtLeastQ()
&& ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_NIGHT_MODE_FOR_Q));
ChromePreferenceManager.getInstance().writeBoolean(NIGHT_MODE_AVAILABLE_KEY, available);
SharedPreferencesManager.getInstance().writeBoolean(NIGHT_MODE_AVAILABLE_KEY, available);
}
/**
......@@ -436,7 +437,7 @@ public class FeatureUtilities {
boolean lightModeAsDefault = ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
ChromeFeatureList.ANDROID_NIGHT_MODE, lightModeDefaultParam, false);
ChromePreferenceManager.getInstance().writeBoolean(
SharedPreferencesManager.getInstance().writeBoolean(
NIGHT_MODE_DEFAULT_TO_LIGHT, lightModeAsDefault);
}
......@@ -514,7 +515,7 @@ public class FeatureUtilities {
}
private static void cacheGridTabSwitcherEnabled() {
ChromePreferenceManager.getInstance().writeBoolean(GRID_TAB_SWITCHER_ENABLED_KEY,
SharedPreferencesManager.getInstance().writeBoolean(GRID_TAB_SWITCHER_ENABLED_KEY,
!DeviceClassManager.enableAccessibilityLayout()
&& ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID)
&& TabManagementModuleProvider.getDelegate() != null);
......@@ -541,7 +542,7 @@ public class FeatureUtilities {
}
private static void cacheTabGroupsAndroidEnabled() {
ChromePreferenceManager.getInstance().writeBoolean(TAB_GROUPS_ANDROID_ENABLED_KEY,
SharedPreferencesManager.getInstance().writeBoolean(TAB_GROUPS_ANDROID_ENABLED_KEY,
!DeviceClassManager.enableAccessibilityLayout()
&& ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GROUPS_ANDROID)
&& TabManagementModuleProvider.getDelegate() != null && isHighEndPhone());
......@@ -617,7 +618,7 @@ public class FeatureUtilities {
* can be made available immediately on next start up.
*/
private static void cacheNetworkServiceWarmUpEnabled() {
ChromePreferenceManager.getInstance().writeBoolean(NETWORK_SERVICE_WARM_UP_ENABLED_KEY,
SharedPreferencesManager.getInstance().writeBoolean(NETWORK_SERVICE_WARM_UP_ENABLED_KEY,
FeatureUtilitiesJni.get().isNetworkServiceWarmUpEnabled());
}
......@@ -644,7 +645,7 @@ public class FeatureUtilities {
* {@link Activity#convertFromTranslucent()}.
*/
public static boolean isSwapPixelFormatToFixConvertFromTranslucentEnabled() {
return ChromePreferenceManager.getInstance().readBoolean(
return SharedPreferencesManager.getInstance().readBoolean(
SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT, true);
}
......@@ -688,7 +689,7 @@ public class FeatureUtilities {
getReachedCodeProfilerTrialGroup();
}
ChromePreferenceManager.getInstance().writeString(
SharedPreferencesManager.getInstance().writeString(
ChromePreferenceManager.REACHED_CODE_PROFILER_GROUP_KEY,
FieldTrialList.findFullName(ChromeFeatureList.REACHED_CODE_PROFILER));
}
......@@ -699,7 +700,7 @@ public class FeatureUtilities {
@CalledByNative
public static String getReachedCodeProfilerTrialGroup() {
if (sReachedCodeProfilerTrialGroup == null) {
sReachedCodeProfilerTrialGroup = ChromePreferenceManager.getInstance().readString(
sReachedCodeProfilerTrialGroup = SharedPreferencesManager.getInstance().readString(
ChromePreferenceManager.REACHED_CODE_PROFILER_GROUP_KEY, "");
}
......@@ -707,14 +708,14 @@ public class FeatureUtilities {
}
private static void cacheFlag(String preferenceName, String featureName) {
ChromePreferenceManager.getInstance().writeBoolean(
SharedPreferencesManager.getInstance().writeBoolean(
preferenceName, ChromeFeatureList.isEnabled(featureName));
}
private static boolean isFlagEnabled(String preferenceName, boolean defaultValue) {
Boolean flag = sFlags.get(preferenceName);
if (flag == null) {
flag = ChromePreferenceManager.getInstance().readBoolean(preferenceName, defaultValue);
flag = SharedPreferencesManager.getInstance().readBoolean(preferenceName, defaultValue);
sFlags.put(preferenceName, flag);
}
return flag;
......
chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
View file @ 5711cb12
......@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.omaha.inline.InlineUpdateControllerFactory;
import org.chromium.chrome.browser.omaha.metrics.UpdateSuccessMetrics;
import org.chromium.chrome.browser.omaha.metrics.UpdateSuccessMetrics.UpdateType;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.util.ConversionUtils;
import org.chromium.content_public.browser.UiThreadTaskTraits;
......@@ -203,7 +204,7 @@ public class UpdateStatusProvider implements ActivityStateListener {
return;
}
ChromePreferenceManager.getInstance().writeString(
SharedPreferencesManager.getInstance().writeString(
ChromePreferenceManager.LATEST_UNSUPPORTED_VERSION, currentlyUsedVersion);
mStatus.latestUnsupportedVersion = currentlyUsedVersion;
pingObservers();
......@@ -407,7 +408,7 @@ public class UpdateStatusProvider implements ActivityStateListener {
break;
case UpdateState.UNSUPPORTED_OS_VERSION:
status.latestUnsupportedVersion =
ChromePreferenceManager.getInstance().readString(
SharedPreferencesManager.getInstance().readString(
ChromePreferenceManager.LATEST_UNSUPPORTED_VERSION, null);
break;
}
......@@ -428,11 +429,11 @@ public class UpdateStatusProvider implements ActivityStateListener {
status.updateState =
allowedToUpdate ? UpdateState.UPDATE_AVAILABLE : UpdateState.NONE;
ChromePreferenceManager.getInstance().removeKey(
SharedPreferencesManager.getInstance().removeKey(
ChromePreferenceManager.LATEST_UNSUPPORTED_VERSION);
} else if (!VersionNumberGetter.isCurrentOsVersionSupported()) {
status.updateState = UpdateState.UNSUPPORTED_OS_VERSION;
status.latestUnsupportedVersion = ChromePreferenceManager.getInstance().readString(
status.latestUnsupportedVersion = SharedPreferencesManager.getInstance().readString(
ChromePreferenceManager.LATEST_UNSUPPORTED_VERSION, null);
} else {
status.updateState = UpdateState.NONE;
......
chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
View file @ 5711cb12
......@@ -4,8 +4,6 @@
package org.chromium.chrome.browser.preferences;
import androidx.annotation.Nullable;
import org.chromium.chrome.browser.crash.MinidumpUploadService.ProcessType;
import java.util.HashSet;
......@@ -587,31 +585,6 @@ public class ChromePreferenceManager {
return mManager.readBoolean(key, defaultValue);
}
/**
* Writes the given string to the named shared preference.
*
* @param key The name of the preference to modify.
* @param value The new value for the preference.
* @deprecated Use {@link SharedPreferencesManager} instead.
*/
@Deprecated
public void writeString(String key, String value) {
mManager.writeString(key, value);
}
/**
* Reads the given String value from the named shared preference.
*
* @param key The name of the preference to return.
* @param defaultValue The default value to return if there's no value stored.
* @return The value of the preference if stored; defaultValue otherwise.
* @deprecated Use {@link SharedPreferencesManager} instead.
*/
@Deprecated
public String readString(String key, @Nullable String defaultValue) {
return mManager.readString(key, defaultValue);
}
/**
* Removes the shared preference entry.
*
......
chrome/android/javatests/src/org/chromium/chrome/browser/ReachedCodeProfilerTest.java
View file @ 5711cb12
......@@ -15,6 +15,7 @@ import org.chromium.base.BaseSwitches;
import org.chromium.base.test.ReachedCodeProfiler;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.test.ChromeActivityTestRule;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
......@@ -103,7 +104,7 @@ public final class ReachedCodeProfilerTest {
public void testSharedPreferenceTrialGroupIsCached() {
mActivityTestRule.startMainActivityFromLauncher();
Assert.assertEquals(FAKE_GROUP_NAME,
ChromePreferenceManager.getInstance().readString(
SharedPreferencesManager.getInstance().readString(
ChromePreferenceManager.REACHED_CODE_PROFILER_GROUP_KEY, null));
}
......@@ -121,12 +122,12 @@ public final class ReachedCodeProfilerTest {
}
private boolean getReachedCodeProfilerSharedPreference() {
return ChromePreferenceManager.getInstance().readBoolean(
return SharedPreferencesManager.getInstance().readBoolean(
REACHED_CODE_PROFILER_ENABLED_KEY, false);
}
private void setReachedCodeProfilerSharedPreference(boolean value) {
ChromePreferenceManager.getInstance().writeBoolean(
SharedPreferencesManager.getInstance().writeBoolean(
REACHED_CODE_PROFILER_ENABLED_KEY, value);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment