Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a09d0fdd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Schematize Setup Wizard System Properties"

parents 86005a91 4b831506

src/com/android/settings/SetupWizardUtils.java

+2 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.settings;



import android.content.Intent;

import android.os.SystemProperties;

import android.sysprop.SetupWizardProperties;



import androidx.annotation.VisibleForTesting;
@@ -27,13 +27,10 @@ import com.google.android.setupdesign.util.ThemeHelper; 


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);

            theme = SetupWizardProperties.theme().orElse("");

        }

        if (theme != null) {

            switch (theme) {

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

+4 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.settings; 
import static com.google.common.truth.Truth.assertThat;



import android.content.Intent;

import android.os.SystemProperties;

import android.sysprop.SetupWizardProperties;



import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.util.ThemeHelper;
@@ -47,8 +47,7 @@ public class SetupWizardUtilsTest { 


    @Test

    public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {

        SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,

            ThemeHelper.THEME_GLIF);

        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF);

        Intent intent = new Intent();

        intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
@@ -57,8 +56,7 @@ public class SetupWizardUtilsTest { 


    @Test

    public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() {

        SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,

            ThemeHelper.THEME_GLIF_V2_LIGHT);

        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);

        Intent intent = new Intent();



        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
@@ -66,8 +64,7 @@ public class SetupWizardUtilsTest { 


    @Test

    public void testGetTheme_glifV3Light_shouldReturnThemeResource() {

        SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,

            ThemeHelper.THEME_GLIF_V3_LIGHT);

        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3_LIGHT);

        Intent intent = new Intent();



        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);