Merge "Add rounded corners to wifi connection dialog"

This commit is contained in:
TreeHugger Robot
2017-12-20 19:05:29 +00:00
committed by Android (Google) Code Review
2 changed files with 24 additions and 4 deletions

View File

@@ -48,11 +48,16 @@ public class SetupWizardUtils {
}
public static int getTransparentTheme(Intent intent) {
if (WizardManagerHelper.isLightTheme(intent, true)) {
return R.style.SetupWizardTheme_Light_Transparent;
} else {
return R.style.SetupWizardTheme_Transparent;
final int suwTheme = getTheme(intent);
int wifiDialogTheme = R.style.GlifV2Theme_Light_Transparent;
if (suwTheme == R.style.GlifV2Theme) {
wifiDialogTheme = R.style.GlifV2Theme_Transparent;
} else if (suwTheme == R.style.GlifTheme_Light) {
wifiDialogTheme = R.style.SetupWizardTheme_Light_Transparent;
} else if (suwTheme == R.style.GlifTheme) {
wifiDialogTheme = R.style.SetupWizardTheme_Transparent;
}
return wifiDialogTheme;
}
public static void copySetupExtras(Intent fromIntent, Intent toIntent) {