am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev

* commit 'edfc6a0a5fb4d371272e4b4c80de22c4ff346214':
  [Setup] Theme ChooseLockGeneric for setup wizard
This commit is contained in:
Maurice Lam
2014-11-26 19:56:48 +00:00
committed by Android Git Automerger
6 changed files with 215 additions and 57 deletions

View File

@@ -28,7 +28,7 @@
<item name="android:windowBackground">@null</item>
</style>
<style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
<style name="SetupWizardTheme" parent="android:Theme.Material.NoActionBar">
<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
<item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
@@ -45,7 +45,7 @@
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
</style>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
<style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
<item name="android:colorAccent">@color/setup_wizard_color_accent_light</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>