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

Commit e6f635ff authored by Doris Ling's avatar Doris Ling
Browse files

Moved network settings reset away from Backup & reset. 

Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.

Bug: 28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
parent d4e31320

res/xml/privacy_settings.xml

+0 −9
Original line number Diff line number Diff line
@@ -50,15 +50,6 @@ 
        android:enabled="false"

        android:selectable="false" />



    <!-- Network reset -->

    <com.android.settingslib.RestrictedPreference

        android:key="network_reset"

        android:title="@string/reset_network_title"

        settings:keywords="@string/keywords_network_reset"

        settings:userRestriction="no_network_reset"

        settings:useAdminDisabledSummary="true"

        android:fragment="com.android.settings.ResetNetwork" />



    <!-- Factory reset -->

    <com.android.settingslib.RestrictedPreference

        android:key="factory_reset"

res/xml/wireless_settings.xml

+9 −0
Original line number Diff line number Diff line
@@ -89,4 +89,13 @@ 
        android:key="proxy_settings"

        android:title="@string/proxy_settings_title" />



    <!-- Network reset -->

    <com.android.settingslib.RestrictedPreference

        android:key="network_reset"

        android:title="@string/reset_network_title"

        settings:keywords="@string/keywords_network_reset"

        settings:userRestriction="no_network_reset"

        settings:useAdminDisabledSummary="true"

        android:fragment="com.android.settings.ResetNetwork" />



</PreferenceScreen>

src/com/android/settings/PrivacySettings.java

+0 −5
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index 
    private static final String CONFIGURE_ACCOUNT = "configure_account";

    private static final String DATA_MANAGEMENT = "data_management";

    private static final String BACKUP_INACTIVE = "backup_inactive";

    private static final String NETWORK_RESET = "network_reset";

    private static final String FACTORY_RESET = "factory_reset";

    private static final String TAG = "PrivacySettings";

    private IBackupManager mBackupManager;
@@ -331,9 +330,5 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index 
                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {

            nonVisibleKeys.add(FACTORY_RESET);

        }

        if (RestrictedLockUtils.hasBaseUserRestriction(context,

                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {

            nonVisibleKeys.add(NETWORK_RESET);

        }

    }

}

src/com/android/settings/WirelessSettings.java

+12 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde 
    private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";

    private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";

    private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";

    private static final String KEY_NETWORK_RESET = "network_reset";



    public static final String EXIT_ECM_RESULT = "exit_ecm_result";

    public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -336,6 +337,12 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde 
            p.setEnabled(!TetherSettings

                    .isProvisioningNeededButUnavailable(getActivity()));

        }



        // Remove network reset if not allowed

        if (RestrictedLockUtils.hasBaseUserRestriction(activity,

                UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {

            removePreference(KEY_NETWORK_RESET);

        }

    }



    @Override
@@ -470,6 +477,11 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde 
                    result.add(KEY_WFC_SETTINGS);

                }



                if (RestrictedLockUtils.hasBaseUserRestriction(context,

                        UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {

                    result.add(KEY_NETWORK_RESET);

                }



                return result;

            }

        };