Fix instructions for Device Owner Tests.
Test: ctsverifier (follow instructions in bugs)
Fixes: 137649438
Fixes: 137649213
Fixes: 137646156
Change-Id: I6c2534ea638348682e03a34715097ba62bc31d99
(cherry picked from commit 436a9afc92c7e0b94b69f2fb6d467433557e044c)
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 057ac46..69b9116 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -3639,10 +3639,12 @@
<string name="device_owner_disallow_remove_user_info">
Please press \'Create uninitialized user\' to create a user that is not set up. Then press the
\'Set restriction\' button to set the user restriction.
- Then press \'Go\' to open \'Multiple users\' setting. \n\n
+ Then press \'Go\' to open \'Multiple users\' setting. \n
+ Click the Settings icon adjacent to the managed user.\n\n
Mark this test as passed if:\n\n
- - Main switch is disabled and in off position\n
+ - \"Delete User\" is disabled.\n
+ - Tapping \"Delete user\" shows an \"Action not allowed\" dialog.\n
\n
Use the Back button to return to this page.
</string>
@@ -3650,8 +3652,9 @@
Please press the \'Set restriction\' button to set the user restriction.
Then press \'Go\' to open \'Multiple users\' setting. \n\n
- Mark this test as passed if one of the following conditions is met:\n\n
- - Main switch is disabled and in off position\n
+ Mark this test as passed if all of the following conditions are met:\n\n
+ - The \"Delete managed user from this device\" option in the overflow menu is disabled\n
+ - Clicking \"Delete managed user from this device\" in the overflow menu results in an \"Action not allowed\" dialog.\n
\n
Use the Back button to return to this page.
</string>
@@ -3962,7 +3965,7 @@
7) Verify that at the bottom of Quick Settings, you are told the device is managed by \"Foo, Inc.\".\n
8) Tap on the information.\n
9) Verify that a dialog informing you about device monitoring opens.\n
- 10) Tap the \"Learn more\" link.\n
+ 10) Tap the \"View Policies\" button.\n
11) Verify that a screen informing you what your managing organization can do is shown.\n
\n
Use the Back button to return to this page. If this device does not have quick settings, please skip this test and mark it passing.
