Read setup wizard theme from system properties

Test: cd tests/robotests && mma
Bug: 62060286
Change-Id: I285638736efa63314fa3e055f72ac021bce40bfe

src/com/android/settings/SetupWizardUtils.java

@@ -17,13 +17,21 @@
 package com.android.settings;
 
 import android.content.Intent;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
 public class SetupWizardUtils {
 
+    @VisibleForTesting
+    static final String SYSTEM_PROP_SETUPWIZARD_THEME = "setupwizard.theme";
+
     public static int getTheme(Intent intent) {
         String theme = intent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
+        if (theme == null) {
+            theme = SystemProperties.get(SYSTEM_PROP_SETUPWIZARD_THEME);
+        }
         if (theme != null) {
             switch (theme) {
                 case WizardManagerHelper.THEME_GLIF_V2_LIGHT:

tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java

@@ -16,21 +16,35 @@
 
 package com.android.settings;
 
+import static com.android.settings.testutils.ResIdSubject.assertResId;
+
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Intent;
 
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowSystemProperties.class
+        })
 public class SetupWizardUtilsTest {
 
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
     @Test
     public void testCopySetupExtras() throws Throwable {
         Intent fromIntent = new Intent();
@@ -44,4 +58,24 @@ public class SetupWizardUtilsTest {
         assertThat(toIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false))
                 .isTrue();
     }
+
+    @Test
+    public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
+        SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
+                WizardManagerHelper.THEME_GLIF);
+        Intent intent = new Intent();
+        intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
+
+        assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
+    }
+
+    @Test
+    public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() {
+        SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
+                WizardManagerHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = new Intent();
+
+        assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
+    }
+
 }

tests/robotests/src/com/android/settings/testutils/ResIdSubject.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import static com.google.common.truth.Truth.assertAbout;
+
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.support.annotation.Nullable;
+
+import com.google.common.truth.ComparableSubject;
+import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.SubjectFactory;
+
+/**
+ * Custom subject for use with {@link com.google.common.truth.Truth}, to provide a more readable
+ * error message, so that instead of "Not true that 2130706432 equals to 17170444", it will say
+ * "Not true that color/my_color equals to android:color/black".
+ *
+ * <p>Usage:
+ * <pre>{@code
+ *     ResIdSubject.assertResId(activity.getThemeResId()).isEqualTo(android.R.style.Theme_Material)
+ * }</pre>
+ */
+public class ResIdSubject extends ComparableSubject<ResIdSubject, Integer> {
+
+    public static final SubjectFactory<ResIdSubject, Integer> FACTORY =
+            new SubjectFactory<ResIdSubject, Integer>() {
+                @Override
+                public ResIdSubject getSubject(
+                        FailureStrategy failureStrategy, Integer integer) {
+                    return new ResIdSubject(failureStrategy, integer);
+                }
+            };
+
+    public static ResIdSubject assertResId(int resId) {
+        return assertAbout(ResIdSubject.FACTORY).that(resId);
+    }
+
+    public ResIdSubject(
+            FailureStrategy failureStrategy,
+            @Nullable Integer integer) {
+        super(failureStrategy, integer);
+    }
+
+    public void isEqualTo(int other) {
+        Integer subject = getSubject();
+        if (subject == null || subject != other) {
+            fail("equals to", resIdToString(other));
+        }
+    }
+
+    @Override
+    protected String getDisplaySubject() {
+        String resourceName = "<" + resIdToString(getSubject()) + ">";
+        String customName = internalCustomName();
+        if (customName != null) {
+            return customName + " " + resourceName;
+        } else {
+            return resourceName;
+        }
+    }
+
+    private static String resIdToString(int resId) {
+        return application.getResources().getResourceName(resId);
+    }
+}