From c36b61ea4404c2bc049a1c51bf949fe3bb257910 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 28 Apr 2015 18:33:50 -0700
Subject: [PATCH] [WifiSetup] Use default theme for Wi-Fi dialogs

Just use the default theme as the dialog doesn't require any
additional attributes to be specified. (Theme.Settings is setting
alertDialogTheme to Theme.AlertDialog as well).

This will allow the correct accent colors (among other theme
attributes) to be propagated to the dialog.

Bug: 20663720
Change-Id: Ibb12c185e8104ccb8f3ddd01524127c748b47487
---
 res/values/themes.xml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 40b645147a5..a0dd58131bf 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -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