How about TestDPC in blue?

Tested sync auth (DO + WP) + QR DO + manual setup WP flow.

Change-Id: Ia904cb5bcd90f4d6d8a8d0d55c21d45f9c5cbf35

Author: tony-mak

app/build.gradle

@@ -83,7 +83,6 @@ dependencies {
     implementation 'com.android.support:recyclerview-v7:27.0.2'
     implementation 'com.android.support:support-v13:27.0.2'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.google.android.gms:play-services-safetynet:+'
     implementation(name: 'setup-wizard-lib-platform-release', ext: 'aar')
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.56'

app/libs/setup-wizard-lib-platform-release.aar

@@ -45,6 +45,7 @@
 
         <activity
                 android:name=".SetupManagementActivity"
+                android:theme="@style/SuwThemeGlifV3.Light"
                 android:label="@string/setup_app_name"
                 android:taskAffinity="">
         </activity>
@@ -62,22 +63,17 @@
         <activity
                 android:name=".AddAccountActivity"
                 android:label="@string/app_name"
-                android:theme="@style/SetupTheme"/>
+                android:theme="@style/SuwThemeGlifV3.Light"/>
 
         <activity
-                android:name=".EnableProfileActivity"
+                android:name=".FinalizeActivity"
                 android:label="@string/app_name"
-                android:theme="@style/SetupTheme"/>
-
-        <activity
-                android:name=".EnableDeviceOwnerActivity"
-                android:label="@string/app_name"
-                android:theme="@style/SetupTheme"/>
+                android:theme="@style/SuwThemeGlifV3.Light"/>
 
         <activity
                 android:name=".cosu.EnableCosuActivity"
                 android:label="@string/app_name"
-                android:theme="@style/SetupTheme"/>
+                android:theme="@style/SuwThemeGlifV3.Light"/>
 
         <activity
                 android:name=".policy.locktask.KioskModeActivity"
@@ -117,17 +113,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".FirstAccountReadyBroadcastReceiver"
-                android:exported="true"
-                android:enabled="true">
-            <intent-filter>
-                <action android:name="com.google.android.work.action.FIRST_ACCOUNT_READY"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.afwsamples.testdpc.FIRST_ACCOUNT_READY_TIMEOUT"/>
-            </intent-filter>
-        </receiver>
-
         <receiver android:name=".BootReceiver"
             android:exported="false">
             <intent-filter>

app/src/main/AndroidManifest.xml

@@ -35,8 +35,7 @@
 import android.widget.RadioGroup;
 import android.widget.Toast;
 
-import com.android.setupwizardlib.SetupWizardLayout;
-import com.android.setupwizardlib.view.NavigationBar;
+import com.android.setupwizardlib.GlifLayout;
 
 import java.io.IOException;
 
@@ -45,7 +44,7 @@
  * It is responsible for adding an account to the managed profile (Profile Owner) or managed device
  * (Device Owner).
  */
-public class AddAccountActivity extends Activity implements NavigationBar.NavigationBarListener {
+public class AddAccountActivity extends Activity {
 
     private static final String TAG = "AddAccountActivity";
     private static final String GOOGLE_ACCOUNT_TYPE = "com.google";
@@ -70,10 +69,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mAdminComponentName = DeviceAdminReceiver.getComponentName(this);
 
         setContentView(R.layout.activity_add_account);
-        SetupWizardLayout layout = (SetupWizardLayout) findViewById(R.id.setup_wizard_layout);
-        layout.getNavigationBar().setNavigationBarListener(this);
-        NavigationBar navigationBar = layout.getNavigationBar();
-        navigationBar.getBackButton().setEnabled(false);
+        GlifLayout layout = findViewById(R.id.setup_wizard_layout);
+        layout.findViewById(R.id.next_button).setOnClickListener(this::onNavigateNext);
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
@@ -145,9 +142,8 @@ private void restoreUserRestrictions() {
         }
     }
 
-    @Override
-    public void onNavigateNext() {
-        RadioGroup addAccountOptions = (RadioGroup) findViewById(R.id.add_account_options);
+    public void onNavigateNext(View nextButton) {
+        RadioGroup addAccountOptions = findViewById(R.id.add_account_options);
         switch (addAccountOptions.getCheckedRadioButtonId()) {
             case R.id.add_account:
                 addAccount(null);
@@ -168,14 +164,10 @@ public void onNavigateNext() {
                 break;
             case R.id.add_account_skip:
                 if (mNextActivityIntent != null) {
-                    mNextActivityIntent.putExtra(EnableProfileActivity.EXTRA_ENABLE_PROFILE_NOW, true);
                     startActivity(mNextActivityIntent);
                 }
                 finish();
                 break;
         }
     }
-
-    @Override
-    public void onNavigateBack() {}
 }