Fix touch ripples for setup wizard screens

Make PreferenceTheme.SetupWizard inherit from PreferenceTheme so the
preference layout from the support library is used.

Automated tests were not added because when trying to test
SettingsActivity under Robolectric, it fails due to the lack of API
24 support.
(https://github.com/robolectric/robolectric/issues/2554)

Test: (Manual) Ripples shown when touched and keyboard focused.
Bug: 32671413
Change-Id: I5271aaddbcfdb7ee0a71bc3c223e6dc62a5ecb47
This commit is contained in:
Maurice Lam
2016-11-07 18:27:16 -08:00
parent e185c5cc19
commit c515287800

View File

@@ -65,7 +65,7 @@
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard.Light</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
@@ -95,11 +95,7 @@
<item name="apnPreferenceStyle">@style/ApnPreference</item>
</style>
<style name="PreferenceTheme.SetupWizard" parent="SetupWizardTheme">
<item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
</style>
<style name="PreferenceTheme.SetupWizard.Light" parent="SetupWizardTheme.Light">
<style name="PreferenceTheme.SetupWizard" parent="PreferenceTheme">
<item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
</style>