PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename dev options xml file

Browse Source 
Bug: 34203528
Test: Builds and tests still pass
Change-Id: I7990555244c57f526b8609ae11154683aed889be
This commit is contained in:
jeffreyhuang
2017-11-13 16:58:55 -08:00
parent bbdc72c95a
commit d5e2fd30a9
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/xml/development_prefs.xml → res/xml/development_settings.xml
View File

4
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -394,7 +394,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
return; return;
} }
addPreferencesFromResource(R.xml.development_prefs); addPreferencesFromResource(R.xml.development_settings);
final PreferenceScreen preferenceScreen = getPreferenceScreen(); final PreferenceScreen preferenceScreen = getPreferenceScreen();
final PreferenceGroup debugDebuggingCategory = (PreferenceGroup) final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
@@ -2587,7 +2587,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
Context context, boolean enabled) { Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context); final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.development_prefs; sir.xmlResId = R.xml.development_settings;
return Arrays.asList(sir); return Arrays.asList(sir);
} }

4
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -299,7 +299,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
@Override @Override
protected int getPreferenceScreenResId() { protected int getPreferenceScreenResId() {
Log.d(TAG, "Creating pref screen"); Log.d(TAG, "Creating pref screen");
return R.xml.development_prefs; return R.xml.development_settings;
} }
@Override @Override
@@ -460,7 +460,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
Context context, boolean enabled) { Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context); final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.development_prefs; sir.xmlResId = R.xml.development_settings;
return Arrays.asList(sir); return Arrays.asList(sir);
} }

2
tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
View File

@@ -93,7 +93,7 @@ public class DevelopmentSettingsDashboardFragmentTest {
.getXmlResourcesToIndex(RuntimeEnvironment.application, true); .getXmlResourcesToIndex(RuntimeEnvironment.application, true);
assertThat(index.size()).isEqualTo(1); 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 @Test

2
tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
View File

@@ -108,7 +108,7 @@ public class DevelopmentSettingsTest {
RuntimeEnvironment.application, true); RuntimeEnvironment.application, true);
assertThat(index.size()).isEqualTo(1); 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 @Test