Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 769e3937 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add rounded corners to wifi connection dialog"

parents f1da7579 a248b34c

res/values/themes.xml

+15 −0
Original line number Diff line number Diff line
@@ -114,6 +114,21 @@ 
        <item name="android:windowAnimationStyle">@null</item>

    </style>



    <style name="GlifV2Theme.Transparent">

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:windowIsFloating">true</item>

        <item name="android:windowAnimationStyle">@null</item>

    </style>



    <style name="GlifV2Theme.Light.Transparent">

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:windowIsFloating">true</item>

        <item name="android:windowAnimationStyle">@null</item>

    </style>





    <style name="SuwSuggestionThemeGlif.Light" parent="SuwThemeGlif.Light">

        <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>

    </style>

src/com/android/settings/SetupWizardUtils.java

+9 −4
Original line number Diff line number Diff line
@@ -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) {