Schematize Setup Wizard System Properties
Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: mma -j Change-Id: I53b16e6d784071a04fe3fe1a9aaac8d5be91077b (cherry picked from commit d328f613cbe55ba935f23cef081a0f1e1cc40977)
This commit is contained in:
@@ -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) {
|
||||
|
Reference in New Issue
Block a user