No public description

PiperOrigin-RevId: 603079140

Author: pfmaggi

src/main/AndroidManifest.xml

@@ -19,8 +19,8 @@
     xmlns:tools="http://schemas.android.com/tools"
           package="com.afwsamples.testdpc"
           tools:ignore="MissingClass"
-           android:versionCode="9003"
-           android:versionName="9.0.3">
+           android:versionCode="9004"
+           android:versionName="9.0.4">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33"/>
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />

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

@@ -41,9 +41,11 @@
 import android.widget.RadioGroup;
 import android.widget.Toast;
 import androidx.lifecycle.ProcessLifecycleOwner;
+import com.afwsamples.testdpc.common.ThemeUtil;
 import com.afwsamples.testdpc.common.Util;
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupcompat.util.WizardManagerHelper;
 import com.google.android.setupdesign.GlifLayout;
 import java.io.IOException;
 
@@ -75,6 +77,9 @@ protected void onCreate(Bundle savedInstanceState) {
     mDevicePolicyManager = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
     mAdminComponentName = DeviceAdminReceiver.getComponentName(this);
 
+    // get default theme string from suw intent extra and set the Theme.
+    ThemeUtil.setTheme(this, getIntent().getStringExtra(WizardManagerHelper.EXTRA_THEME));
+
     setContentView(R.layout.activity_add_account);
     GlifLayout layout = findViewById(R.id.setup_wizard_layout);
     FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);

src/main/java/com/afwsamples/testdpc/FinalizeActivity.java

@@ -29,10 +29,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.afwsamples.testdpc.common.LaunchIntentUtil;
+import com.afwsamples.testdpc.common.ThemeUtil;
 import com.afwsamples.testdpc.common.Util;
 import com.afwsamples.testdpc.provision.ProvisioningUtil;
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupcompat.util.WizardManagerHelper;
 import com.google.android.setupdesign.GlifLayout;
 
 public class FinalizeActivity extends Activity {
@@ -57,6 +59,9 @@ protected void onCreate(Bundle savedInstanceState) {
         return;
     }
 
+    // get default theme string from suw intent extra and set the Theme.
+    ThemeUtil.setTheme(this, getIntent().getStringExtra(WizardManagerHelper.EXTRA_THEME));
+
     setContentView(R.layout.finalize_activity);
     mSetupWizardLayout = findViewById(R.id.setup_wizard_layout);
     FooterBarMixin mixin = mSetupWizardLayout.getMixin(FooterBarMixin.class);

src/main/java/com/afwsamples/testdpc/SetupManagementActivity.java

@@ -2,12 +2,18 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import com.afwsamples.testdpc.common.ThemeUtil;
+import com.google.android.setupcompat.util.WizardManagerHelper;
 
 public class SetupManagementActivity extends Activity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+
+    // get default theme string from suw intent extra and set the Theme.
+    ThemeUtil.setTheme(this, getIntent().getStringExtra(WizardManagerHelper.EXTRA_THEME));
+
     setContentView(R.layout.activity_main);
     if (savedInstanceState == null) {
       getFragmentManager()

src/main/java/com/afwsamples/testdpc/common/ThemeUtil.java

@@ -0,0 +1,49 @@
+package com.afwsamples.testdpc.common;
+
+import android.content.Context;
+import android.os.Build.VERSION_CODES;
+import com.afwsamples.testdpc.R;
+import com.google.android.setupdesign.util.ThemeHelper;
+import com.google.android.setupdesign.util.ThemeResolver;
+
+/** Common utility functions for Theming. */
+public final class ThemeUtil {
+
+  /**
+   * Set the correct Theme for the SUW screen
+   *
+   * @param default theme string .
+   */
+  public static void setTheme(Context context, String themeName) {
+    int defaultTheme;
+    if (Util.SDK_INT < VERSION_CODES.TIRAMISU) {
+      defaultTheme =
+          ThemeHelper.isSetupWizardDayNightEnabled(context)
+              ? R.style.SudThemeGlifV3_DayNight
+              : R.style.SudThemeGlifV3_Light;
+    } else {
+      defaultTheme =
+          ThemeHelper.isSetupWizardDayNightEnabled(context)
+              ? R.style.SudThemeGlifV4_DayNight
+              : R.style.SudThemeGlifV4_Light;
+    }
+
+    // a. set GlifTheme based on suw intent extra & SUW daynight flag.
+    ThemeResolver THEME_RESOLVER =
+        new ThemeResolver.Builder(ThemeResolver.getDefault())
+            .setDefaultTheme(defaultTheme)
+            .setUseDayNight(true)
+            .build();
+
+    // If outside suw (themeName=null); the themeResolver will fallback
+    // to the default theme directly, resolve theme resource based on the day-night flag.
+    int themeResId =
+        THEME_RESOLVER.resolve(themeName, !ThemeHelper.isSetupWizardDayNightEnabled(context));
+
+    // setTheme for this activity.
+    context.setTheme(themeResId);
+
+    // b. overlay color attrs to dynamic color for GlifTheme.
+    ThemeHelper.trySetDynamicColor(context);
+  }
+}

src/main/res/layout/activity_add_account.xml

@@ -20,7 +20,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_enterprise_blue"
-    android:theme="@style/SudDynamicColorThemeGlifV3.DayNight"
     app:sucHeaderText="@string/add_account">
 
     <LinearLayout

src/main/res/layout/finalize_activity.xml

@@ -21,7 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_enterprise_blue"
-    android:theme="@style/SudDynamicColorThemeGlifV3.DayNight"
     app:sucHeaderText="@string/finish_setup">
 
     <LinearLayout

src/main/res/layout/setup_management_fragment.xml

@@ -18,7 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/setup_wizard_layout"
-    android:theme="@style/SudDynamicColorThemeGlifV3.DayNight"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_enterprise_blue"