From d5e2fd30a908b20275c1f55580e3ddde4535813c Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 13 Nov 2017 16:58:55 -0800 Subject: [PATCH] Rename dev options xml file Bug: 34203528 Test: Builds and tests still pass Change-Id: I7990555244c57f526b8609ae11154683aed889be --- res/xml/{development_prefs.xml => development_settings.xml} | 0 src/com/android/settings/development/DevelopmentSettings.java | 4 ++-- .../development/DevelopmentSettingsDashboardFragment.java | 4 ++-- .../development/DevelopmentSettingsDashboardFragmentTest.java | 2 +- .../android/settings/development/DevelopmentSettingsTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename res/xml/{development_prefs.xml => development_settings.xml} (100%) diff --git a/res/xml/development_prefs.xml b/res/xml/development_settings.xml similarity index 100% rename from res/xml/development_prefs.xml rename to res/xml/development_settings.xml diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java index 37296cff9ef..474502378dc 100644 --- a/src/com/android/settings/development/DevelopmentSettings.java +++ b/src/com/android/settings/development/DevelopmentSettings.java @@ -394,7 +394,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment return; } - addPreferencesFromResource(R.xml.development_prefs); + addPreferencesFromResource(R.xml.development_settings); final PreferenceScreen preferenceScreen = getPreferenceScreen(); final PreferenceGroup debugDebuggingCategory = (PreferenceGroup) @@ -2587,7 +2587,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment Context context, boolean enabled) { final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.development_prefs; + sir.xmlResId = R.xml.development_settings; return Arrays.asList(sir); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 50dfefff8cc..025e35edc3e 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -299,7 +299,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra @Override protected int getPreferenceScreenResId() { Log.d(TAG, "Creating pref screen"); - return R.xml.development_prefs; + return R.xml.development_settings; } @Override @@ -460,7 +460,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra Context context, boolean enabled) { final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.development_prefs; + sir.xmlResId = R.xml.development_settings; return Arrays.asList(sir); } diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index ac09418a2f4..5449353babe 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -93,7 +93,7 @@ public class DevelopmentSettingsDashboardFragmentTest { .getXmlResourcesToIndex(RuntimeEnvironment.application, true); assertThat(index.size()).isEqualTo(1); - assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_prefs); + assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_settings); } @Test diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java index b1943a55993..87dc5d08710 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java @@ -108,7 +108,7 @@ public class DevelopmentSettingsTest { RuntimeEnvironment.application, true); assertThat(index.size()).isEqualTo(1); - assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_prefs); + assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_settings); } @Test