From c5152878007495177cbd32a15d73b3ae29ad2ec3 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 7 Nov 2016 18:27:16 -0800
Subject: [PATCH] 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
---
 res/values/themes.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/res/values/themes.xml b/res/values/themes.xml
index a5ff54ae7d7..6b765f7e9cf 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -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>