am f5440793: Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev

* commit 'f54407933fd30c0838fcd89d9f4dafaf7af865be':
  Fix bug #15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
This commit is contained in:
Fabrice Di Meglio
2014-06-12 16:53:47 +00:00
committed by Android Git Automerger

View File

@@ -30,6 +30,8 @@
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item>
</style>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -41,6 +43,8 @@
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
<item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item>
</style>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">