Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5e2fd30 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Rename dev options xml file 

Bug: 34203528
Test: Builds and tests still pass
Change-Id: I7990555244c57f526b8609ae11154683aed889be
parent bbdc72c9

src/com/android/settings/development/DevelopmentSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

                }

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

                }

tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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