diff options
| author | Maurice Lam <yukl@google.com> | 2015-03-03 18:27:48 -0800 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2015-04-17 04:46:09 +0000 |
| commit | bddc56648569ed21b696ca5451cd1fc82009bb43 (patch) | |
| tree | d8b008b2dde31b0e91422f659aee5e6ea0253033 /res/values/themes.xml | |
| parent | a928ff4a67756341a972569a1029c0e981c9bb8d (diff) | |
| download | packages_apps_Settings-bddc56648569ed21b696ca5451cd1fc82009bb43.zip packages_apps_Settings-bddc56648569ed21b696ca5451cd1fc82009bb43.tar.gz packages_apps_Settings-bddc56648569ed21b696ca5451cd1fc82009bb43.tar.bz2 | |
Use SetupWizardLib helpers
Use SystemBarHelper, WizardManagerHelper and themes from Setup Wizard
Library.
Bug: 19594252
Change-Id: I60b6ab4f086a170ac270fb08325fc42010293523
Diffstat (limited to 'res/values/themes.xml')
| -rw-r--r-- | res/values/themes.xml | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/res/values/themes.xml b/res/values/themes.xml index 379c36a..0d28126 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -29,14 +29,11 @@ <item name="android:windowBackground">@null</item> </style> - <style name="SetupWizardTheme" parent="android:Theme.Material.NoActionBar"> + <style name="SetupWizardTheme" parent="SuwThemeMaterial"> <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> <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item> - <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item> <item name="android:windowBackground">?android:attr/colorBackground</item> - <item name="android:windowSoftInputMode">adjustPan</item> <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item> @@ -53,14 +50,11 @@ <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item> </style> - <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar"> + <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light"> <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> <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item> - <item name="android:windowAnimationStyle">@style/Animation.SetupWizard</item> <item name="android:windowBackground">?android:attr/colorBackground</item> - <item name="android:windowSoftInputMode">adjustPan</item> <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> <item name="ic_menu_add">@drawable/ic_menu_add_light</item> <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item> @@ -77,13 +71,6 @@ <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item> </style> - <style name="Animation.SetupWizard" parent="@android:style/Animation.Activity"> - <item name="android:activityOpenEnterAnimation">@anim/slide_next_in</item> - <item name="android:activityOpenExitAnimation">@anim/slide_next_out</item> - <item name="android:activityCloseEnterAnimation">@anim/slide_back_in</item> - <item name="android:activityCloseExitAnimation">@anim/slide_back_out</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> |