commit 2993781d5011ee12a40a4d5f57fbaac2ca1d9465
author Antoan Angelov <arangelov@google.com> Wed Jan 06 14:45:59 2021 +0000
committer arangelov <arangelov@google.com> Mon Jan 11 15:25:39 2021 +0000
tree 49d77512af34a780c7fe662cc1fb1301bbb94288
parent 06fac9d9cc05b5a4111e5e1d597407c7cfe5d718

Revert "Revert "Temporarily show a generic title in the ownershi..."

Revert submission 13236640-revertMP

Reason for revert: Now that the other components are fixed, this change should be safe to merge again
Reverted Changes:
I754fef216:Revert "Make sync auth use the admin-integrated fl...
Ic42cabc95:Revert "Revert "Revert "Add tests for managed acco...
Ided2ddbf0:Revert "Revert "Revert "Update extras affected by ...
Ic3ee14242:Revert "Temporarily show a generic title in the ow...

Change-Id: Iec0fcbd24a4e707b6b180de144d45acadf86958b

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 71d2299..a800038 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -343,6 +343,10 @@
   <string name="brand_screen_header">This device belongs to your organization</string>
   <!-- Subtext on a screen. This is letting the user know that their organization (e.g. company) will manage their device, and it's introducing the management app that their IT admin will use. [CHAR LIMIT=NONE]-->
   <string name="brand_screen_subheader">The following app will be used to manage and monitor this phone</string>
+  <!-- Screen title. This is letting the user know that the user's account will be managed on their new device. [CHAR LIMIT=NONE]-->
+  <string name="account_management_disclaimer_header">Your account is managed</string>
+  <!-- Subtext on a screen. This is letting the user know that their account will be managed on their new device. [CHAR LIMIT=NONE]-->
+  <string name="account_management_disclaimer_subheader">Your IT admin uses mobile device management to enforce security policies</string>
 
   <!-- Downloading screen -->
   <!-- Screen title. This is letting the user know that they're about to set up their device for work. [CHAR LIMIT=NONE]-->

src/com/android/managedprovisioning/provisioning/LandingActivity.java

diff --git a/src/com/android/managedprovisioning/provisioning/LandingActivity.java b/src/com/android/managedprovisioning/provisioning/LandingActivity.java
index 2f40b36..d555d8c 100644
--- a/src/com/android/managedprovisioning/provisioning/LandingActivity.java
+++ b/src/com/android/managedprovisioning/provisioning/LandingActivity.java
@@ -15,6 +15,9 @@
  */
 package com.android.managedprovisioning.provisioning;
 
+import static android.app.admin.DevicePolicyManager.PROVISIONING_TRIGGER_MANAGED_ACCOUNT;
+import static android.app.admin.DevicePolicyManager.PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -59,8 +62,15 @@
     }
 
     private void initializeUi(ProvisioningParams params) {
-        final int headerResId = R.string.brand_screen_header;
-        final int titleResId = R.string.setup_device_progress;
+        int headerResId = R.string.brand_screen_header;
+        int titleResId = R.string.setup_device_progress;
+
+        // TODO(b/175622930): Remove references to managed account provisioning
+        if (params.provisioningTrigger == PROVISIONING_TRIGGER_MANAGED_ACCOUNT
+                || params.provisioningTrigger == PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER) {
+            headerResId = R.string.account_management_disclaimer_header;
+            titleResId = R.string.account_management_disclaimer_subheader;
+        }
 
         final CustomizationParams customizationParams =
                 CustomizationParams.createInstance(params, this, mUtils);