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

Merge "Device management info: Refer to current user, not primary user" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-01 05:12:38 +00:00
committed by Android (Google) Code Review
parent ef64404f44 1fca17ce2e
commit 57a0771bf5
20 changed files with 89 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/enterprise_privacy_settings.xml
View File

@@ -100,7 +100,7 @@
android:title="@string/enterprise_privacy_wipe_device"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="failed_password_wipe_primary_user"
android:key="failed_password_wipe_current_user"
android:title="@string/enterprise_privacy_failed_password_wipe_device"
settings:multiLine="true"/>
<com.android.settings.DividerPreference