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

Merge \"Merge \\"Moved network settings reset away from Backup & reset.\\" into nyc-mr1-dev am: ab595b8a98\" into nyc-mr1-dev-plus-aosp

Browse Source 
am: a8272ec495

Change-Id: I338d909e0fc8c48265b0d0ff60a72e803363ff81
This commit is contained in:
Doris Ling
2016-06-08 21:42:37 +00:00
committed by android-build-merger
parent eabc5d297c a8272ec495
commit 49f9e9828d
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/xml/privacy_settings.xml
View File

@@ -50,15 +50,6 @@
android:enabled="false" android:enabled="false"
android:selectable="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 --> <!-- Factory reset -->
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="factory_reset" android:key="factory_reset"

9
res/xml/wireless_settings.xml
View File

@@ -89,4 +89,13 @@
android:key="proxy_settings" android:key="proxy_settings"
android:title="@string/proxy_settings_title" /> 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> </PreferenceScreen>

5
src/com/android/settings/PrivacySettings.java
View File

@@ -61,7 +61,6 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
private static final String CONFIGURE_ACCOUNT = "configure_account"; private static final String CONFIGURE_ACCOUNT = "configure_account";
private static final String DATA_MANAGEMENT = "data_management"; private static final String DATA_MANAGEMENT = "data_management";
private static final String BACKUP_INACTIVE = "backup_inactive"; 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 FACTORY_RESET = "factory_reset";
private static final String TAG = "PrivacySettings"; private static final String TAG = "PrivacySettings";
private IBackupManager mBackupManager; private IBackupManager mBackupManager;
@@ -331,9 +330,5 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) { UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
nonVisibleKeys.add(FACTORY_RESET); nonVisibleKeys.add(FACTORY_RESET);
} }
if (RestrictedLockUtils.hasBaseUserRestriction(context,
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
nonVisibleKeys.add(NETWORK_RESET);
}
} }
} }

12
src/com/android/settings/WirelessSettings.java
View File

@@ -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_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan"; 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_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 String EXIT_ECM_RESULT = "exit_ecm_result";
public static final int REQUEST_CODE_EXIT_ECM = 1; public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -336,6 +337,12 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
p.setEnabled(!TetherSettings p.setEnabled(!TetherSettings
.isProvisioningNeededButUnavailable(getActivity())); .isProvisioningNeededButUnavailable(getActivity()));
} }
// Remove network reset if not allowed
if (RestrictedLockUtils.hasBaseUserRestriction(activity,
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
removePreference(KEY_NETWORK_RESET);
}
} }
@Override @Override
@@ -470,6 +477,11 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
result.add(KEY_WFC_SETTINGS); result.add(KEY_WFC_SETTINGS);
} }
if (RestrictedLockUtils.hasBaseUserRestriction(context,
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
result.add(KEY_NETWORK_RESET);
}
return result; return result;
} }
}; };