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

Commit db9c342c authored by Scott Mertz's avatar Scott Mertz
Browse files

Revert "Settings: Remove "advanced mode" toggle if its defaulted to enabled." 

This reverts commit cccc093c.

Change-Id: Ia3f54620026bb02547edaee27b769b4928ce80b5
parent 3aa60466

res/values/config.xml

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ 
    <string name="ic_code" translatable="false"></string>

    <string name="ic_model" translatable="false"></string>



    <bool name="config_default_advanced_mode_enabled">false</bool>



    <!-- This is use to determine whether to hide the performance settings-->

    <bool name="config_hidePerformanceSettings" translatable="false">false</bool>

src/com/android/settings/DeviceInfoSettings.java

+3 −7
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 


        // Read platform settings for additional system update setting

        removePreferenceIfBoolFalse(KEY_UPDATE_SETTING,

                getResources().getBoolean(R.bool.config_additional_system_update_setting_enable));

                R.bool.config_additional_system_update_setting_enable);



        // Remove regulatory information if none present.

        final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
@@ -198,11 +198,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
                getPreferenceScreen().removePreference(pref);

            }

        }



        mAdvancedSettings = (SecureSettingSwitchPreference) findPreference(KEY_ADVANCED_MODE);

        // If enabled by default, just remove the setting, because it's confusing.

        removePreferenceIfBoolFalse(KEY_ADVANCED_MODE, !getResources().getBoolean(

                com.android.internal.R.bool.config_advancedSettingsMode));

    }



    @Override
@@ -305,8 +301,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        }

    }



    private void removePreferenceIfBoolFalse(String preference, boolean bool) {

        if (!bool) {

    private void removePreferenceIfBoolFalse(String preference, int resId) {

        if (!getResources().getBoolean(resId)) {

            Preference pref = findPreference(preference);

            if (pref != null) {

                getPreferenceScreen().removePreference(pref);

src/com/android/settings/SettingsActivity.java

+5 −9
Original line number Diff line number Diff line
@@ -1411,15 +1411,11 @@ public class SettingsActivity extends Activity 
        super.onNewIntent(intent);

    }



    /**

     * Showing "advanced options" on a retail build involves a toggle,

     * however, it should always show all advanced options if the option is enabled

     * by default in an overlay.

     */

    public static boolean showAdvancedPreferences(Context context) {

        return (android.provider.Settings.Secure.getInt(context.getContentResolver(),

                android.provider.Settings.Secure.ADVANCED_MODE, 1) == 1)

                && context.getResources().getBoolean(

                com.android.internal.R.bool.config_advancedSettingsMode);

        return android.provider.Settings.Secure.getInt(

                context.getContentResolver(),

                android.provider.Settings.Secure.ADVANCED_MODE, 1) == 1;

    }





}