Support GLIF v3 for lock screen settings

Also removed setup_divider_color because it's unused and is causing
a lint error.

Test: cd tests/robotests && mma
Bug: 72702989
Change-Id: I81894be6458439f688c0144d1136d3d7f75afa25
This commit is contained in:
Maurice Lam
2018-01-30 20:43:45 -08:00
parent 54e304b897
commit f5b42777c1
6 changed files with 182 additions and 192 deletions

View File

@@ -78,4 +78,14 @@ public class SetupWizardUtilsTest {
assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
}
@Test
public void testGetTheme_glifV3Light_shouldReturnThemeResource() {
SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
WizardManagerHelper.THEME_GLIF_V3_LIGHT);
Intent intent = new Intent();
assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
assertResId(SetupWizardUtils.getTransparentTheme(intent))
.isEqualTo(R.style.GlifV3Theme_Light_Transparent);
}
}