Merge "Don't hide network reset even if it's disabled by admin." into oc-dev

This commit is contained in:
TreeHugger Robot
2017-04-29 06:53:26 +00:00
committed by Android (Google) Code Review
4 changed files with 79 additions and 4 deletions

View File

@@ -21,9 +21,11 @@
android:title="@string/reset_dashboard_title">
<!-- Network reset -->
<Preference
<com.android.settingslib.RestrictedPreference
android:key="network_reset_pref"
android:title="@string/reset_network_title"
settings:userRestriction="no_network_reset"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.ResetNetwork" />
<!-- Reset app preferences -->