Show AddAccountActivity for admin integrated PO flow.

Show AddAccountActivity, and send the added account back to
ManagedProvisioning.

Bug: 123355836
Test: manual
Change-Id: I3e33cbab2b472f65fa79408133fd9428ce9d31d0

Author: yuemingw

app/src/main/AndroidManifest.xml

@@ -96,7 +96,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".policy.DpcLoginActivity"
+        <activity android:name=".provision.DpcLoginActivity"
                 android:exported="true">
             <intent-filter>
                 <action android:name="android.app.action.GET_PROVISIONING_MODE" />

app/src/main/java/com/afwsamples/testdpc/AddAccountActivity.java

@@ -16,6 +16,9 @@
 
 package com.afwsamples.testdpc;
 
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
+
+import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
@@ -34,9 +37,7 @@
 import android.widget.EditText;
 import android.widget.RadioGroup;
 import android.widget.Toast;
-
 import com.android.setupwizardlib.GlifLayout;
-
 import java.io.IOException;
 
 /**
@@ -106,6 +107,10 @@ private void addAccount(String accountName) {
                         if (mNextActivityIntent != null) {
                             startActivity(mNextActivityIntent);
                         }
+                        final Intent resultIntent = new Intent();
+                        resultIntent.putExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE,
+                            new Account(accountNameAdded, GOOGLE_ACCOUNT_TYPE));
+                        setResult(RESULT_OK, resultIntent);
                         finish();
                     } catch (OperationCanceledException | AuthenticatorException
                             | IOException e) {

app/src/main/java/com/afwsamples/testdpc/policy/DpcLoginActivity.java renamed to app/src/main/java/com/afwsamples/testdpc/provision/DpcLoginActivity.java

@@ -14,13 +14,18 @@
  * limitations under the License.
  */
 
-package com.afwsamples.testdpc.policy;
+package com.afwsamples.testdpc.provision;
 
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
+
+import android.accounts.Account;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.RadioGroup;
+import com.afwsamples.testdpc.AddAccountActivity;
 import com.afwsamples.testdpc.R;
 import com.android.setupwizardlib.GlifLayout;
 
@@ -37,6 +42,9 @@ public class DpcLoginActivity extends Activity {
     public static final int PROVISIONING_MODE_PO = 2;
     public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3;
 
+    private static final String LOG_TAG = "DpcLoginActivity";
+    private static final int ADD_ACCOUNT_REQUEST_CODE = 1;
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -51,22 +59,54 @@ public void onBackPressed() {
         super.onBackPressed();
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case ADD_ACCOUNT_REQUEST_CODE:
+                finishWithIntent(createResultIntentFromData(data));
+                break;
+            default:
+                Log.d(LOG_TAG, "Unknown result code: " + resultCode);
+                break;
+        }
+    }
+
+    private Intent createResultIntentFromData(Intent data) {
+        final Intent resultIntent = new Intent();
+        resultIntent.putExtra(EXTRA_PROVISIONING_MODE, PROVISIONING_MODE_PO);
+        if (data != null && data.hasExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE)) {
+            final Account accountToMigrate = data.getParcelableExtra(
+                EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE);
+            resultIntent.putExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE, accountToMigrate);
+        }
+        return resultIntent;
+    }
+
     private void onNavigateNext(View nextButton) {
-        Intent intent = new Intent();
+        final Intent intent = new Intent();
         RadioGroup dpcLoginOptions = findViewById(R.id.dpc_login_options);
         switch (dpcLoginOptions.getCheckedRadioButtonId()) {
             case R.id.dpc_login_do:
                 intent.putExtra(EXTRA_PROVISIONING_MODE, PROVISIONING_MODE_DO);
-                break;
+                finishWithIntent(intent);
+                return;
             case R.id.dpc_login_po:
-                intent.putExtra(EXTRA_PROVISIONING_MODE, PROVISIONING_MODE_PO);
-                break;
+                startActivityForResult(
+                    new Intent(getApplicationContext(), AddAccountActivity.class),
+                    ADD_ACCOUNT_REQUEST_CODE);
+                return;
             case R.id.dpc_login_comp:
                 intent.putExtra(EXTRA_PROVISIONING_MODE,
                     PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE);
-                break;
+                finishWithIntent(intent);
+                return;
+            default:
+                finish();
         }
-        setResult(RESULT_OK , intent);
+    }
+
+    private void finishWithIntent(Intent intent) {
+        setResult(RESULT_OK, intent);
         finish();
     }
 }

app/src/main/res/layout/activity_add_account.xml

@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:icon="@drawable/ic_enterprise_blue"
     app:suwFooter="@layout/next_footer"
-    app:suwHeaderText="@string/setup_finished">
+    app:suwHeaderText="@string/add_account">
 
     <LinearLayout
         style="@style/SuwItemContainer"