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

Support GLIF v3 for lock screen settings

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,10 @@ public class SetupWizardUtils {
}
if (theme != null) {
switch (theme) {
case WizardManagerHelper.THEME_GLIF_V3_LIGHT:
return R.style.GlifV3Theme_Light;
case WizardManagerHelper.THEME_GLIF_V3:
return R.style.GlifV3Theme;
case WizardManagerHelper.THEME_GLIF_V2_LIGHT:
return R.style.GlifV2Theme_Light;
case WizardManagerHelper.THEME_GLIF_V2:
@@ -50,7 +54,11 @@ public class SetupWizardUtils {
public static int getTransparentTheme(Intent intent) {
final int suwTheme = getTheme(intent);
int wifiDialogTheme = R.style.GlifV2Theme_Light_Transparent;
if (suwTheme == R.style.GlifV2Theme) {
if (suwTheme == R.style.GlifV3Theme) {
wifiDialogTheme = R.style.GlifV3Theme_Transparent;
} else if (suwTheme == R.style.GlifV3Theme_Light) {
wifiDialogTheme = R.style.GlifV3Theme_Light_Transparent;
} else if (suwTheme == R.style.GlifV2Theme) {
wifiDialogTheme = R.style.GlifV2Theme_Transparent;
} else if (suwTheme == R.style.GlifTheme_Light) {
wifiDialogTheme = R.style.SetupWizardTheme_Light_Transparent;