Make GLIF v2 available to OEMs

Rename GLIF Pixel to GLIF v2 and make available to OEMs. In this
model settings read the EXTRA_THEME from the intent and picks between
GLIF and GLIF v2.

Test: Manual
Bug: 36857917
Change-Id: I4899a3d041abaf0b97843cf14affc8d6f9587a22
This commit is contained in:
Maurice Lam
2017-04-05 12:10:37 -07:00
parent 98d02620a0
commit e0e81b68c6
4 changed files with 72 additions and 22 deletions

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