Skip to content

GitLab

T
tangled
Commit 12318119 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot
Browse files
Options

[Android] Rename About and Developer Settings fragments 

Bug: 1030446
Change-Id: Id022b1d43b7359df768671fbb5562f53a8b21f0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947549
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721696}
parent 03823759
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 71 deletions
chrome/android/chrome_java_sources.gni
View file @ 12318119
......@@ -1357,9 +1357,9 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/settings/TextMessagePreference.java",
"java/src/org/chromium/chrome/browser/settings/TextScalePreference.java",
"java/src/org/chromium/chrome/browser/settings/about/AboutChromePreferenceOSVersion.java",
"java/src/org/chromium/chrome/browser/settings/about/AboutChromePreferences.java",
"java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java",
"java/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridge.java",
"java/src/org/chromium/chrome/browser/settings/about/LegalInformationPreferences.java",
"java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.java",
"java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppPreference.java",
"java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.java",
"java/src/org/chromium/chrome/browser/settings/autofill/AutofillCreditCardEditor.java",
......@@ -1377,9 +1377,9 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java",
"java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionSiteBreakdownView.java",
"java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionStatsPreference.java",
"java/src/org/chromium/chrome/browser/settings/developer/DeveloperPreferences.java",
"java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesPreferences.java",
"java/src/org/chromium/chrome/browser/settings/developer/TracingPreferences.java",
"java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java",
"java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java",
"java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java",
"java/src/org/chromium/chrome/browser/settings/download/DownloadDirectoryAdapter.java",
"java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreference.java",
"java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceAdapter.java",
......
chrome/android/chrome_test_java_sources.gni
View file @ 12318119
......@@ -413,7 +413,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragmentTest.java",
"javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillTestRule.java",
"javatests/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferencesTest.java",
"javatests/src/org/chromium/chrome/browser/settings/developer/TracingPreferencesTest.java",
"javatests/src/org/chromium/chrome/browser/settings/developer/TracingSettingsTest.java",
"javatests/src/org/chromium/chrome/browser/settings/password/SavePasswordsPreferencesTest.java",
"javatests/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataBridgeTest.java",
"javatests/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataTest.java",
......
chrome/android/java/res/xml/about_chrome_preferences.xml
View file @ 12318119
......@@ -11,7 +11,7 @@
android:key="os_version"
android:title="@string/os_version_title" />
<Preference
android:fragment="org.chromium.chrome.browser.settings.about.LegalInformationPreferences"
android:fragment="org.chromium.chrome.browser.settings.about.LegalInformationSettings"
android:key="legal_information"
android:title="@string/legal_information_title" />
</PreferenceScreen>
chrome/android/java/res/xml/developer_preferences.xml
View file @ 12318119
......@@ -7,7 +7,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orderingFromXml="true">
<Preference
android:fragment="org.chromium.chrome.browser.settings.developer.TracingPreferences"
android:fragment="org.chromium.chrome.browser.settings.developer.TracingSettings"
android:key="tracing"
android:title="Tracing" />
<org.chromium.chrome.browser.settings.TextMessagePreference
......
chrome/android/java/res/xml/main_preferences.xml
View file @ 12318119
......@@ -101,12 +101,12 @@
android:order="18"
android:title="@string/menu_downloads"/>
<Preference
android:fragment="org.chromium.chrome.browser.settings.developer.DeveloperPreferences"
android:fragment="org.chromium.chrome.browser.settings.developer.DeveloperSettings"
android:key="developer"
android:order="19"
android:title="Developer options"/>
<Preference
android:fragment="org.chromium.chrome.browser.settings.about.AboutChromePreferences"
android:fragment="org.chromium.chrome.browser.settings.about.AboutChromeSettings"
android:key="about_chrome"
android:order="20"
android:title="@string/prefs_about_chrome"/>
......
chrome/android/java/res/xml/tracing_preferences.xml
View file @ 12318119
......@@ -7,11 +7,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orderingFromXml="true">
<Preference
android:fragment="org.chromium.chrome.browser.settings.developer.TracingCategoriesPreferences"
android:fragment="org.chromium.chrome.browser.settings.developer.TracingCategoriesSettings"
android:key="default_categories"
android:title="Default categories"/><!-- developer strings are not translated -->
<Preference
android:fragment="org.chromium.chrome.browser.settings.developer.TracingCategoriesPreferences"
android:fragment="org.chromium.chrome.browser.settings.developer.TracingCategoriesSettings"
android:key="non_default_categories"
android:title="Disabled-by-default categories"/>
<ListPreference
......
chrome/android/java/src/org/chromium/chrome/browser/settings/MainPreferences.java
View file @ 12318119
......@@ -28,7 +28,7 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.chrome.browser.settings.autofill_assistant.AutofillAssistantPreferences;
import org.chromium.chrome.browser.settings.datareduction.DataReductionPreferenceFragment;
import org.chromium.chrome.browser.settings.developer.DeveloperPreferences;
import org.chromium.chrome.browser.settings.developer.DeveloperSettings;
import org.chromium.chrome.browser.settings.sync.SignInPreference;
import org.chromium.chrome.browser.settings.sync.SyncPreferenceUtils;
import org.chromium.chrome.browser.signin.IdentityServicesProvider;
......@@ -217,7 +217,7 @@ public class MainPreferences extends PreferenceFragmentCompat
removePreferenceIfPresent(PREF_UI_THEME);
}
if (DeveloperPreferences.shouldShowDeveloperPreferences()) {
if (DeveloperSettings.shouldShowDeveloperSettings()) {
addPreferenceIfAbsent(PREF_DEVELOPER);
} else {
removePreferenceIfPresent(PREF_DEVELOPER);
......
chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromePreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java
View file @ 12318119
......@@ -15,7 +15,7 @@ import android.text.format.DateUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeVersionInfo;
import org.chromium.chrome.browser.settings.SettingsUtils;
import org.chromium.chrome.browser.settings.developer.DeveloperPreferences;
import org.chromium.chrome.browser.settings.developer.DeveloperSettings;
import org.chromium.ui.widget.Toast;
import java.util.Calendar;
......@@ -23,9 +23,9 @@ import java.util.Calendar;
/**
* Settings fragment that displays information about Chrome.
*/
public class AboutChromePreferences
public class AboutChromeSettings
extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
private static final int TAPS_FOR_DEVELOPER_PREFERENCES = 7;
private static final int TAPS_FOR_DEVELOPER_SETTINGS = 7;
private static final String PREF_APPLICATION_VERSION = "application_version";
private static final String PREF_OS_VERSION = "os_version";
......@@ -40,9 +40,8 @@ public class AboutChromePreferences
private static final String MSG_DEVELOPER_ALREADY_ENABLED =
"Developer options are already enabled.";
private int mDeveloperHitCountdown = DeveloperPreferences.shouldShowDeveloperPreferences()
? -1
: TAPS_FOR_DEVELOPER_PREFERENCES;
private int mDeveloperHitCountdown =
DeveloperSettings.shouldShowDeveloperSettings() ? -1 : TAPS_FOR_DEVELOPER_SETTINGS;
private Toast mToast;
@Override
......@@ -88,16 +87,16 @@ public class AboutChromePreferences
mDeveloperHitCountdown--;
if (mDeveloperHitCountdown == 0) {
DeveloperPreferences.setDeveloperPreferencesEnabled();
DeveloperSettings.setDeveloperSettingsEnabled();
// Show a toast that the developer preferences were enabled.
// Show a toast that the developer settings were enabled.
if (mToast != null) {
mToast.cancel();
}
mToast = Toast.makeText(getActivity(), MSG_DEVELOPER_ENABLED, Toast.LENGTH_LONG);
mToast.show();
} else if (mDeveloperHitCountdown > 0
&& mDeveloperHitCountdown < (TAPS_FOR_DEVELOPER_PREFERENCES - 2)) {
&& mDeveloperHitCountdown < (TAPS_FOR_DEVELOPER_SETTINGS - 2)) {
// Show a countdown toast.
if (mToast != null) {
mToast.cancel();
......@@ -112,7 +111,7 @@ public class AboutChromePreferences
mToast.show();
}
} else if (mDeveloperHitCountdown < 0) {
// Show a toast that the developer preferences are already enabled.
// Show a toast that the developer settings are already enabled.
if (mToast != null) {
mToast.cancel();
}
......
chrome/android/java/src/org/chromium/chrome/browser/settings/about/LegalInformationPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.java
View file @ 12318119
......@@ -13,7 +13,7 @@ import org.chromium.chrome.browser.settings.SettingsUtils;
/**
* Fragment to display legal information about Chrome.
*/
public class LegalInformationPreferences extends PreferenceFragmentCompat {
public class LegalInformationSettings extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String s) {
SettingsUtils.addPreferencesFromResource(this, R.xml.legal_information_preferences);
......
chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java
View file @ 12318119
......@@ -17,21 +17,21 @@ import org.chromium.components.version_info.VersionConstants;
/**
* Settings fragment containing preferences aimed at Chrome and web developers.
*/
public class DeveloperPreferences extends PreferenceFragmentCompat {
public class DeveloperSettings extends PreferenceFragmentCompat {
private static final String UI_PREF_BETA_STABLE_HINT = "beta_stable_hint";
private static final String PREF_DEVELOPER_ENABLED = "developer";
// Non-translated strings:
private static final String MSG_DEVELOPER_OPTIONS_TITLE = "Developer options";
public static boolean shouldShowDeveloperPreferences() {
public static boolean shouldShowDeveloperSettings() {
// Always enabled on canary, dev and local builds, otherwise can be enabled by tapping the
// Chrome version in Settings>About multiple times.
if (VersionConstants.CHANNEL <= Channel.DEV) return true;
return ContextUtils.getAppSharedPreferences().getBoolean(PREF_DEVELOPER_ENABLED, false);
}
public static void setDeveloperPreferencesEnabled() {
public static void setDeveloperSettingsEnabled() {
ContextUtils.getAppSharedPreferences()
.edit()
.putBoolean(PREF_DEVELOPER_ENABLED, true)
......
chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java
View file @ 12318119
......@@ -25,7 +25,7 @@ import java.util.Set;
* Settings fragment that configures chrome tracing categories of a specific type. The type is
* passed to the fragment via an extra (EXTRA_CATEGORY_TYPE).
*/
public class TracingCategoriesPreferences
public class TracingCategoriesSettings
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
public static final String EXTRA_CATEGORY_TYPE = "type";
......@@ -35,7 +35,7 @@ public class TracingCategoriesPreferences
private static final String SELECT_ALL_KEY = "select-all";
private static final String SELECT_ALL_TITLE = "Select all";
private @TracingPreferences.CategoryType int mType;
private @TracingSettings.CategoryType int mType;
private Set<String> mEnabledCategories;
private List<CheckBoxPreference> mAllPreferences;
private CheckBoxPreference mSelectAllPreference;
......@@ -48,7 +48,7 @@ public class TracingCategoriesPreferences
preferenceScreen.setOrderingAsAdded(true);
mType = getArguments().getInt(EXTRA_CATEGORY_TYPE);
mEnabledCategories = new HashSet<>(TracingPreferences.getEnabledCategories(mType));
mEnabledCategories = new HashSet<>(TracingSettings.getEnabledCategories(mType));
mAllPreferences = new ArrayList<>();
List<String> sortedCategories =
......@@ -64,7 +64,7 @@ public class TracingCategoriesPreferences
preferenceScreen.addPreference(mSelectAllPreference);
for (String category : sortedCategories) {
if (TracingPreferences.getCategoryType(category) == mType) {
if (TracingSettings.getCategoryType(category) == mType) {
CheckBoxPreference pref = createPreference(category);
mAllPreferences.add(pref);
preferenceScreen.addPreference(pref);
......@@ -77,9 +77,8 @@ public class TracingCategoriesPreferences
private CheckBoxPreference createPreference(String category) {
CheckBoxPreference preference = new ChromeBaseCheckBoxPreference(getStyledContext(), null);
preference.setKey(category);
preference.setTitle(category.startsWith(TracingPreferences.NON_DEFAULT_CATEGORY_PREFIX)
? category.substring(
TracingPreferences.NON_DEFAULT_CATEGORY_PREFIX.length())
preference.setTitle(category.startsWith(TracingSettings.NON_DEFAULT_CATEGORY_PREFIX)
? category.substring(TracingSettings.NON_DEFAULT_CATEGORY_PREFIX.length())
: category);
preference.setChecked(mEnabledCategories.contains(category));
preference.setPersistent(false); // We persist the preference value ourselves.
......@@ -101,7 +100,7 @@ public class TracingCategoriesPreferences
mEnabledCategories.remove(preference.getKey());
}
mSelectAllPreference.setChecked(mEnabledCategories.size() == mAllPreferences.size());
TracingPreferences.setEnabledCategories(mType, mEnabledCategories);
TracingSettings.setEnabledCategories(mType, mEnabledCategories);
return true;
}
......
chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java
View file @ 12318119
......@@ -28,7 +28,7 @@ import java.util.Set;
/**
* Settings fragment that shows options for recording a performance trace.
*/
public class TracingPreferences
public class TracingSettings
extends PreferenceFragmentCompat implements TracingController.Observer {
static final String NON_DEFAULT_CATEGORY_PREFIX = "disabled-by-default-";
......@@ -190,10 +190,10 @@ public class TracingPreferences
mPrefTracingStatus = findPreference(UI_PREF_TRACING_STATUS);
mPrefDefaultCategories.getExtras().putInt(
TracingCategoriesPreferences.EXTRA_CATEGORY_TYPE, CategoryType.DEFAULT);
TracingCategoriesSettings.EXTRA_CATEGORY_TYPE, CategoryType.DEFAULT);
mPrefNondefaultCategories.getExtras().putInt(
TracingCategoriesPreferences.EXTRA_CATEGORY_TYPE, CategoryType.NON_DEFAULT);
TracingCategoriesSettings.EXTRA_CATEGORY_TYPE, CategoryType.NON_DEFAULT);
mPrefMode.setEntryValues(TRACING_MODES.keySet().toArray(new String[TRACING_MODES.size()]));
String[] descriptions =
......
chrome/android/java/src/org/chromium/chrome/browser/settings/website/ManageSpaceActivity.java
View file @ 12318119
......@@ -38,7 +38,7 @@ import org.chromium.chrome.browser.init.EmptyBrowserParts;
import org.chromium.chrome.browser.notifications.channels.SiteChannelsManager;
import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
import org.chromium.chrome.browser.settings.PreferencesLauncher;
import org.chromium.chrome.browser.settings.about.AboutChromePreferences;
import org.chromium.chrome.browser.settings.about.AboutChromeSettings;
import org.chromium.chrome.browser.settings.website.Website.StoredDataClearedCallback;
import org.chromium.chrome.browser.util.ConversionUtils;
......@@ -124,7 +124,7 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli
// kicking off the browser process initialization.
StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
try {
String productVersion = AboutChromePreferences.getApplicationVersion(
String productVersion = AboutChromeSettings.getApplicationVersion(
this, ChromeVersionInfo.getProductVersion());
String failedVersion = ContextUtils.getAppSharedPreferences().getString(
PREF_FAILED_BUILD_VERSION, null);
......
chrome/android/java/src/org/chromium/chrome/browser/tracing/TracingController.java
View file @ 12318119
......@@ -20,7 +20,7 @@ import org.chromium.base.ObserverList;
import org.chromium.base.task.AsyncTask;
import org.chromium.base.task.PostTask;
import org.chromium.base.task.TaskTraits;
import org.chromium.chrome.browser.settings.developer.TracingPreferences;
import org.chromium.chrome.browser.settings.developer.TracingSettings;
import org.chromium.content_public.browser.TracingControllerAndroid;
import org.chromium.content_public.browser.UiThreadTaskTraits;
import org.chromium.ui.widget.Toast;
......@@ -239,8 +239,8 @@ public class TracingController {
assert mState == State.STARTING;
// TODO(eseckler): TracingControllerAndroid currently doesn't support a json trace config.
String categories = TextUtils.join(",", TracingPreferences.getEnabledCategories());
String options = TracingPreferences.getSelectedTracingMode();
String categories = TextUtils.join(",", TracingSettings.getEnabledCategories());
String options = TracingSettings.getSelectedTracingMode();
if (!mNativeController.startTracing(
mTracingTempFile.getPath(), false, categories, options, true)) {
......
chrome/android/javatests/src/org/chromium/chrome/browser/settings/developer/TracingPreferencesTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/settings/developer/TracingSettingsTest.java
View file @ 12318119
......@@ -56,7 +56,7 @@ import java.util.concurrent.TimeUnit;
*/
@RunWith(ChromeJUnit4ClassRunner.class)
@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
public class TracingPreferencesTest {
public class TracingSettingsTest {
@Rule
public final ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
new ChromeActivityTestRule<>(ChromeActivity.class);
......@@ -104,12 +104,12 @@ public class TracingPreferencesTest {
private void waitForTracingControllerInitialization(PreferenceFragmentCompat fragment)
throws Exception {
final Preference defaultCategoriesPref =
fragment.findPreference(TracingPreferences.UI_PREF_DEFAULT_CATEGORIES);
fragment.findPreference(TracingSettings.UI_PREF_DEFAULT_CATEGORIES);
final Preference nonDefaultCategoriesPref =
fragment.findPreference(TracingPreferences.UI_PREF_NON_DEFAULT_CATEGORIES);
final Preference modePref = fragment.findPreference(TracingPreferences.UI_PREF_MODE);
fragment.findPreference(TracingSettings.UI_PREF_NON_DEFAULT_CATEGORIES);
final Preference modePref = fragment.findPreference(TracingSettings.UI_PREF_MODE);
final Preference startTracingButton =
fragment.findPreference(TracingPreferences.UI_PREF_START_RECORDING);
fragment.findPreference(TracingSettings.UI_PREF_START_RECORDING);
CallbackHelper callbackHelper = new CallbackHelper();
TestThreadUtils.runOnUiThreadBlocking(() -> {
......@@ -143,11 +143,11 @@ public class TracingPreferencesTest {
public void testRecordTrace() throws Exception {
mActivityTestRule.startMainActivityOnBlankPage();
SettingsActivity activity =
mActivityTestRule.startSettingsActivity(TracingPreferences.class.getName());
mActivityTestRule.startSettingsActivity(TracingSettings.class.getName());
final PreferenceFragmentCompat fragment =
(PreferenceFragmentCompat) activity.getMainFragment();
final ButtonPreference startTracingButton = (ButtonPreference) fragment.findPreference(
TracingPreferences.UI_PREF_START_RECORDING);
final ButtonPreference startTracingButton =
(ButtonPreference) fragment.findPreference(TracingSettings.UI_PREF_START_RECORDING);
waitForTracingControllerInitialization(fragment);
......@@ -160,7 +160,7 @@ public class TracingPreferencesTest {
Assert.assertEquals(
TracingController.State.IDLE, TracingController.getInstance().getState());
Assert.assertTrue(startTracingButton.isEnabled());
Assert.assertEquals(TracingPreferences.MSG_START, startTracingButton.getTitle());
Assert.assertEquals(TracingSettings.MSG_START, startTracingButton.getTitle());
// Tap the button to start recording a trace.
startTracingButton.performClick();
......@@ -168,7 +168,7 @@ public class TracingPreferencesTest {
Assert.assertEquals(
TracingController.State.STARTING, TracingController.getInstance().getState());
Assert.assertFalse(startTracingButton.isEnabled());
Assert.assertEquals(TracingPreferences.MSG_ACTIVE, startTracingButton.getTitle());
Assert.assertEquals(TracingSettings.MSG_ACTIVE, startTracingButton.getTitle());
// Observe state changes to RECORDING, STOPPING, STOPPED, and IDLE.
TracingController.getInstance().addObserver(new TracingController.Observer() {
......@@ -243,20 +243,20 @@ public class TracingPreferencesTest {
mMockNotificationManager.setNotificationsEnabled(false);
SettingsActivity activity =
mActivityTestRule.startSettingsActivity(TracingPreferences.class.getName());
mActivityTestRule.startSettingsActivity(TracingSettings.class.getName());
final PreferenceFragmentCompat fragment =
(PreferenceFragmentCompat) activity.getMainFragment();
final ButtonPreference startTracingButton = (ButtonPreference) fragment.findPreference(
TracingPreferences.UI_PREF_START_RECORDING);
final ButtonPreference startTracingButton =
(ButtonPreference) fragment.findPreference(TracingSettings.UI_PREF_START_RECORDING);
final TextMessagePreference statusPreference =
(TextMessagePreference) fragment.findPreference(
TracingPreferences.UI_PREF_TRACING_STATUS);
TracingSettings.UI_PREF_TRACING_STATUS);
waitForTracingControllerInitialization(fragment);
Assert.assertFalse(startTracingButton.isEnabled());
Assert.assertEquals(
TracingPreferences.MSG_NOTIFICATIONS_DISABLED, statusPreference.getTitle());
TracingSettings.MSG_NOTIFICATIONS_DISABLED, statusPreference.getTitle());
mMockNotificationManager.setNotificationsEnabled(true);
}
......@@ -268,13 +268,13 @@ public class TracingPreferencesTest {
// We need a renderer so that its tracing categories will be populated.
mActivityTestRule.startMainActivityOnBlankPage();
SettingsActivity activity =
mActivityTestRule.startSettingsActivity(TracingPreferences.class.getName());
mActivityTestRule.startSettingsActivity(TracingSettings.class.getName());
final PreferenceFragmentCompat fragment =
(PreferenceFragmentCompat) activity.getMainFragment();
final Preference defaultCategoriesPref =
fragment.findPreference(TracingPreferences.UI_PREF_DEFAULT_CATEGORIES);
fragment.findPreference(TracingSettings.UI_PREF_DEFAULT_CATEGORIES);
final Preference nonDefaultCategoriesPref =
fragment.findPreference(TracingPreferences.UI_PREF_NON_DEFAULT_CATEGORIES);
fragment.findPreference(TracingSettings.UI_PREF_NON_DEFAULT_CATEGORIES);
waitForTracingControllerInitialization(fragment);
......@@ -296,29 +296,29 @@ public class TracingPreferencesTest {
Context context = InstrumentationRegistry.getTargetContext();
Assert.assertNotNull(categoriesPref.getExtras());
Assert.assertFalse(categoriesPref.getExtras().isEmpty());
Intent intent = PreferencesLauncher.createIntentForSettingsPage(context,
TracingCategoriesPreferences.class.getName(), categoriesPref.getExtras());
Intent intent = PreferencesLauncher.createIntentForSettingsPage(
context, TracingCategoriesSettings.class.getName(), categoriesPref.getExtras());
SettingsActivity categoriesActivity =
(SettingsActivity) InstrumentationRegistry.getInstrumentation()
.startActivitySync(intent);
PreferenceFragmentCompat categoriesFragment =
(PreferenceFragmentCompat) categoriesActivity.getMainFragment();
Assert.assertEquals(TracingCategoriesPreferences.class, categoriesFragment.getClass());
Assert.assertEquals(TracingCategoriesSettings.class, categoriesFragment.getClass());
CheckBoxPreference sampleCategoryPref =
(CheckBoxPreference) categoriesFragment.findPreference(sampleCategoryName);
Assert.assertNotNull(sampleCategoryPref);
boolean originallyEnabled =
TracingPreferences.getEnabledCategories().contains(sampleCategoryName);
TracingSettings.getEnabledCategories().contains(sampleCategoryName);
Assert.assertEquals(originallyEnabled, sampleCategoryPref.isChecked());
// Simulate selecting / deselecting the category.
TestThreadUtils.runOnUiThreadBlocking(sampleCategoryPref::performClick);
Assert.assertNotEquals(originallyEnabled, sampleCategoryPref.isChecked());
boolean finallyEnabled =
TracingPreferences.getEnabledCategories().contains(sampleCategoryName);
TracingSettings.getEnabledCategories().contains(sampleCategoryName);
Assert.assertNotEquals(originallyEnabled, finallyEnabled);
}
}
......@@ -328,11 +328,11 @@ public class TracingPreferencesTest {
@Feature({"Preferences"})
public void testSelectMode() throws Exception {
SettingsActivity activity =
mActivityTestRule.startSettingsActivity(TracingPreferences.class.getName());
mActivityTestRule.startSettingsActivity(TracingSettings.class.getName());
final PreferenceFragmentCompat fragment =
(PreferenceFragmentCompat) activity.getMainFragment();
final ListPreference modePref =
(ListPreference) fragment.findPreference(TracingPreferences.UI_PREF_MODE);
(ListPreference) fragment.findPreference(TracingSettings.UI_PREF_MODE);
waitForTracingControllerInitialization(fragment);
......@@ -340,7 +340,7 @@ public class TracingPreferencesTest {
Assert.assertTrue(modePref.isEnabled());
// By default, the "record-until-full" mode is selected.
Assert.assertEquals("record-until-full", TracingPreferences.getSelectedTracingMode());
Assert.assertEquals("record-until-full", TracingSettings.getSelectedTracingMode());
// Dialog should contain 3 entries.
Assert.assertEquals(3, modePref.getEntries().length);
......@@ -348,7 +348,7 @@ public class TracingPreferencesTest {
// Simulate changing the mode.
modePref.getOnPreferenceChangeListener().onPreferenceChange(
modePref, "record-continuously");
Assert.assertEquals("record-continuously", TracingPreferences.getSelectedTracingMode());
Assert.assertEquals("record-continuously", TracingSettings.getSelectedTracingMode());
});
}
}
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