PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Schematize Setup Wizard System Properties"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-21 01:01:49 +00:00
committed by Android (Google) Code Review
parent 86005a91b3 4b83150687
commit a09d0fdda2
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SetupWizardUtils.java
View File

@@ -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) {