Change disallow ambient display test instruction.
Test: manual
Bug: 111337223, 111142747
Change-Id: I1d113b8f0420413803703e79936c36bf78c02318
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index e814d5f..e4c0bda 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -3038,6 +3038,16 @@
\n
Use the Back button to return to this page.
</string>
+ <string name="device_owner_disallow_ambient_display">Disallow ambient display</string>
+ <string name="device_owner_disallow_ambient_display_info">
+ Please press the Set restriction button to set the user restriction.
+ Then press Go to open the Display page in Settings.
+ Mark this test as passed if one of the following:\n\n
+ - There is no ambient display setting in Display Settings.\n
+ - Ambient display setting is disabled with an info icon on it. Clicking on it triggers a support dialog.\n
+ \n
+ Use the Back button to return to this page.
+ </string>
<string name="device_owner_disallow_data_roaming">Disallow data roaming</string>
<string name="device_owner_disallow_data_roaming_info">
Device should have a sim card to perform this test.
@@ -3241,8 +3251,6 @@
<string name="disallow_config_screen_timeout_action">Configuring sleep options in Display or Battery page.</string>
<string name="disallow_config_brightness">Disallow config brightness settings</string>
<string name="disallow_config_brightness_action">Configuring brightness level or adaptive brightness in Display or Battery page, or toggling brightness slider in quick settings</string>
- <string name="disallow_ambient_display">Disallow ambient display</string>
- <string name="disallow_ambient_display_action">Configuring ambient display in Display or Battery page</string>
<string name="disallow_apps_control">Disallow controlling apps</string>
<string name="disallow_apps_control_action">DISABLE/UNINSTALL/FORCE STOP-ing any app in the managed device/profile other than CtsVerifier</string>
<string name="disallow_config_cell_broadcasts">Disallow config cell broadcasts</string>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
index ae9dd03..75d884f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
@@ -76,6 +76,7 @@
private static final String COMP_TEST_ID = "COMP_UI";
private static final String MANAGED_USER_TEST_ID = "MANAGED_USER_UI";
private static final String REMOVE_DEVICE_OWNER_TEST_ID = "REMOVE_DEVICE_OWNER";
+ private static final String DISALLOW_AMBIENT_DISPLAY_ID = "DISALLOW_AMBIENT_DISPLAY";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -183,6 +184,19 @@
new Intent(Settings.ACTION_WIFI_SETTINGS))}));
}
+ // DISALLOW_AMBIENT_DISPLAY.
+ adapter.add(createInteractiveTestItem(this, DISALLOW_AMBIENT_DISPLAY_ID,
+ R.string.device_owner_disallow_ambient_display,
+ R.string.device_owner_disallow_ambient_display_info,
+ new ButtonInfo[] {
+ new ButtonInfo(
+ R.string.device_owner_user_restriction_set,
+ CommandReceiverActivity.createSetUserRestrictionIntent(
+ UserManager.DISALLOW_AMBIENT_DISPLAY, true)),
+ new ButtonInfo(
+ R.string.device_owner_settings_go,
+ new Intent(Settings.ACTION_DISPLAY_SETTINGS))}));
+
// DISALLOW_CONFIG_VPN
adapter.add(createInteractiveTestItem(this, DISALLOW_CONFIG_VPN_ID,
R.string.device_owner_disallow_config_vpn,
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java
index 3d2bbf8..1be781b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java
@@ -56,7 +56,6 @@
UserManager.DISALLOW_AIRPLANE_MODE,
UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT,
UserManager.DISALLOW_CONFIG_BRIGHTNESS,
- UserManager.DISALLOW_AMBIENT_DISPLAY,
};
private static final ArrayMap<String, UserRestrictionItem> USER_RESTRICTION_ITEMS;
@@ -86,8 +85,7 @@
R.string.disallow_config_location,
R.string.disallow_airplane_mode,
R.string.disallow_config_screen_timeout,
- R.string.disallow_config_brightness,
- R.string.disallow_ambient_display
+ R.string.disallow_config_brightness
};
final int[] restrictionActions = new int[] {
@@ -115,8 +113,7 @@
R.string.disallow_config_location_action,
R.string.disallow_airplane_mode_action,
R.string.disallow_config_screen_timeout_action,
- R.string.disallow_config_brightness_action,
- R.string.disallow_ambient_display_action
+ R.string.disallow_config_brightness_action
};
final String[] settingsIntentActions = new String[] {
@@ -145,7 +142,6 @@
Settings.ACTION_AIRPLANE_MODE_SETTINGS,
Settings.ACTION_DISPLAY_SETTINGS,
Settings.ACTION_DISPLAY_SETTINGS,
- Settings.ACTION_DISPLAY_SETTINGS,
};
if (RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY.length != restrictionLabels.length
