am 795511ec: [WifiSetup] Disable app starting window

* commit '795511ec9c952041afb158d43dd22960443b503f':
  [WifiSetup] Disable app starting window
This commit is contained in:
Maurice Lam
2014-09-16 08:31:54 +00:00
committed by Android Git Automerger
2 changed files with 7 additions and 1 deletions

View File

@@ -193,7 +193,7 @@
<activity android:name=".wifi.WifiSetupActivity" <activity android:name=".wifi.WifiSetupActivity"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardWifiTheme" android:theme="@style/SetupWizardDisableAppStartingTheme"
android:label="@string/wifi_setup_wizard_title" android:label="@string/wifi_setup_wizard_title"
android:icon="@drawable/empty_icon" android:icon="@drawable/empty_icon"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">

View File

@@ -22,6 +22,12 @@
<attr name="wifi_signal_color" format="reference" /> <attr name="wifi_signal_color" format="reference" />
<attr name="wifi_signal" format="reference" /> <attr name="wifi_signal" format="reference" />
<style name="SetupWizardDisableAppStartingTheme">
<!-- Theme to disable the app starting window. The actual theme of the activity needs to
be then set in code via setTheme or onApplyThemeResource. -->
<item name="android:windowBackground">@null</item>
</style>
<style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar"> <style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item> <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
<item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item> <item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item>