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

Commit 2add7d0d authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-dev

parents 28c3ba15 c36b61ea
Loading
Loading
Loading
Loading
+0 −18
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@
    </style>

    <style name="SetupWizardTheme" parent="SuwThemeMaterial">
        <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
        <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -51,7 +50,6 @@
    </style>

    <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
        <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
        <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
        <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
        <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -71,22 +69,6 @@
        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
    </style>

    <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
        <item name="android:windowSoftInputMode">adjustResize</item>
        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
        <item name="ic_wps">@drawable/ic_wps_dark</item>
        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
    </style>

    <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
        <item name="android:windowSoftInputMode">adjustResize</item>
        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
        <item name="ic_wps">@drawable/ic_wps_light</item>
        <item name="wifi_signal">@drawable/wifi_signal_light</item>
    </style>

    <!-- Theme with no local references, used by AccountPreferenceBase where we have to inflate
         layouts against a remote context using our local theme colors. Due to the implementation
         details of Theme, we can't reference any local resources and MUST instead use the values