Not specify theming by default in TestDPC

This allows us to test MP UI without theming, which is something
we prefer since P.

BUG: 70621340
Change-Id: Id8e0bcd7fba72fd2ba8110386ec10d57a2de8758

Author: tony-mak

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

@@ -16,6 +16,15 @@
 
 package com.afwsamples.testdpc;
 
+import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE;
+import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR;
+
 import android.accounts.Account;
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -43,28 +52,16 @@
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.afwsamples.testdpc.common.ColorPicker;
 import com.afwsamples.testdpc.common.LaunchIntentUtil;
 import com.afwsamples.testdpc.common.ProvisioningStateUtil;
 import com.afwsamples.testdpc.common.Util;
 import com.android.setupwizardlib.SetupWizardLayout;
 import com.android.setupwizardlib.view.NavigationBar;
-
 import java.security.SecureRandom;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 
-import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE;
-import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_MAIN_COLOR;
-
 /**
  * This {@link Fragment} shows the UI that allows the user to start the setup of a managed profile
  * or configuration of a device-owner if the device is in an appropriate state.
@@ -79,6 +76,8 @@ public class SetupManagementFragment extends Fragment implements
     private static final int REQUEST_PROVISION_DEVICE_OWNER = 2;
     private static final int REQUEST_GET_LOGO = 3;
 
+    private static final int NO_COLOR_SPECIFIED = -1;
+
     private TextView mSetupManagementMessage;
     private RadioGroup mSetupOptions;
     private Button mNavigationNextButton;
@@ -95,18 +94,15 @@ public class SetupManagementFragment extends Fragment implements
     private ImageView mLogoPreviewView;
     private TextView mLogoValue;
 
-    private int mCurrentColor;
+    private int mCurrentColor = NO_COLOR_SPECIFIED;
     private Uri mLogoUri = null;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         if (savedInstanceState != null) {
-            mLogoUri = (Uri) savedInstanceState.getParcelable(EXTRA_PROVISIONING_LOGO_URI);
+            mLogoUri = savedInstanceState.getParcelable(EXTRA_PROVISIONING_LOGO_URI);
             mCurrentColor = savedInstanceState.getInt(EXTRA_PROVISIONING_MAIN_COLOR);
-        } else {
-            mLogoUri = resourceToUri(getActivity(), R.drawable.ic_launcher);
-            mCurrentColor = getResources().getColor(R.color.teal);
         }
 
         // Use setupwizard theme
@@ -134,9 +130,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         view.findViewById(R.id.color_select_button).setOnClickListener(this);
         mColorValue = (TextView) view.findViewById(R.id.selected_color_value);
-        mColorValue.setText(String.format(ColorPicker.COLOR_STRING_FORMATTER, mCurrentColor));
         mColorPreviewView = (ImageView) view.findViewById(R.id.preview_color);
-        mColorPreviewView.setImageTintList(ColorStateList.valueOf(mCurrentColor));
+
+        updateColorUi();
 
         Intent launchIntent = getActivity().getIntent();
         if (LaunchIntentUtil.isSynchronousAuthLaunch(launchIntent)) {
@@ -376,6 +372,9 @@ private void specifySkipEncryption(Intent intent) {
 
 
     private void specifyLogoUri(Intent intent) {
+        if (mLogoUri == null) {
+            return;
+        }
         intent.putExtra(EXTRA_PROVISIONING_LOGO_URI, mLogoUri);
         if (mLogoUri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
             intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -384,6 +383,9 @@ private void specifyLogoUri(Intent intent) {
     }
 
     private void specifyColor(Intent intent) {
+        if (mCurrentColor == NO_COLOR_SPECIFIED) {
+            return;
+        }
         intent.putExtra(EXTRA_PROVISIONING_MAIN_COLOR, mCurrentColor);
     }
 
@@ -471,8 +473,7 @@ public void onClick(View view) {
     @Override
     public void onColorSelected(int colorValue, String id) {
         mCurrentColor = colorValue;
-        mColorValue.setText(String.format(ColorPicker.COLOR_STRING_FORMATTER, colorValue));
-        mColorPreviewView.setImageTintList(ColorStateList.valueOf(colorValue));
+        updateColorUi();
     }
 
     @Override
@@ -500,4 +501,15 @@ private Intent getGetContentIntent() {
     private boolean canAnAppHandleGetContent() {
         return getGetContentIntent().resolveActivity(getActivity().getPackageManager()) != null;
     }
+
+    private void updateColorUi() {
+        if (mCurrentColor != NO_COLOR_SPECIFIED) {
+            mColorValue.setText(String.format(ColorPicker.COLOR_STRING_FORMATTER, mCurrentColor));
+            mColorPreviewView.setImageTintList(ColorStateList.valueOf(mCurrentColor));
+            mColorPreviewView.setVisibility(View.VISIBLE);
+        } else {
+            mColorValue.setText("");
+            mColorPreviewView.setVisibility(View.GONE);
+        }
+    }
 }

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

@@ -36,14 +36,12 @@
         <TextView android:id="@+id/selected_color_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@color/teal"
                 android:layout_gravity="center_vertical"
                 android:paddingEnd="@dimen/params_padding_start_end" />
         <ImageView android:id="@+id/preview_color"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_circle"
-                android:tint="@color/teal"
                 android:layout_gravity="center_vertical" />
         <View
                 android:layout_width="0dp"

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

@@ -38,7 +38,7 @@
         <TextView android:id="@+id/selected_logo_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="ic_launcher"
+                android:text=""
                 android:layout_gravity="center_vertical"
                 android:paddingEnd="@dimen/params_padding_start_end" />
         <ImageView android:id="@+id/preview_logo"
@@ -48,8 +48,7 @@
                 android:maxWidth="@dimen/params_preview_logo_max_width"
                 android:maxHeight="@dimen/params_preview_logo_max_height"
                 android:scaleType="fitCenter"
-                android:adjustViewBounds="true"
-                android:src="@drawable/ic_launcher" />
+                android:adjustViewBounds="true"/>
         <View
                 android:layout_width="0dp"
                 android:layout_height="match_parent"