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

Merge "Make GLIF v2 available to OEMs"

Browse Source
This commit is contained in:
Maurice Lam
2017-04-06 18:42:37 +00:00
committed by Android (Google) Code Review
parent 8071d18ad5 e0e81b68c6
commit 0ed1d928d4
4 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
View File

@@ -52,7 +52,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
mConfirmCredentialTheme = ConfirmCredentialTheme.DARK;
} else {
setTheme(R.style.SetupWizardTheme_Light);
setTheme(R.style.GlifTheme_Light);
mConfirmCredentialTheme = ConfirmCredentialTheme.INTERNAL;
}
super.onCreate(savedState);

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

@@ -23,11 +23,20 @@ import com.android.setupwizardlib.util.WizardManagerHelper;
public class SetupWizardUtils {
public static int getTheme(Intent intent) {
if (WizardManagerHelper.isLightTheme(intent, true)) {
return R.style.SetupWizardTheme_Light;
} else {
return R.style.SetupWizardTheme;
String theme = intent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
if (theme != null) {
switch (theme) {
case WizardManagerHelper.THEME_GLIF_V2_LIGHT:
return R.style.GlifV2Theme_Light;
case WizardManagerHelper.THEME_GLIF_V2:
return R.style.GlifV2Theme;
case WizardManagerHelper.THEME_GLIF_LIGHT:
return R.style.GlifTheme_Light;
case WizardManagerHelper.THEME_GLIF:
return R.style.GlifTheme;
}
}
return R.style.GlifTheme_Light;
}
public static int getTransparentTheme(Intent intent) {