From da9ccded0a25c84c6a15a0b4ce971ccf76335341 Mon Sep 17 00:00:00 2001
From: Antony Sargent <asargent@google.com>
Date: Mon, 11 Jun 2018 14:59:05 -0700
Subject: [PATCH] Go back to using PreferenceThemeOverlay.v14.Material

We temporarily need to go back to having
PreferenceThemeOverlay.SettingsBase inherit from
PreferenceThemeOverlay.v14.Material. This v14.Material version has been
deprecated in the support library source in favor of just having those
styles be what's in PreferenceThemeOverlay, but the prebuilt with those
changes hasn't made it to the master branch yet.

Bug: 110048976
Test: visual (settings should not have dividers between each Preference)
Change-Id: Id9c33f6f235b1cb39cf78830da901413f7aa6815
---
 packages/SettingsLib/res/values/styles_support_preference.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsLib/res/values/styles_support_preference.xml b/packages/SettingsLib/res/values/styles_support_preference.xml
index 6e611960b2c77..5d787f85e3ab1 100644
--- a/packages/SettingsLib/res/values/styles_support_preference.xml
+++ b/packages/SettingsLib/res/values/styles_support_preference.xml
@@ -26,7 +26,7 @@
         <item name="allowDividerAbove">true</item>
     </style>
 
-    <style name="PreferenceThemeOverlay.SettingsBase" parent="@style/PreferenceThemeOverlay">
+    <style name="PreferenceThemeOverlay.SettingsBase" parent="@style/PreferenceThemeOverlay.v14.Material">
         <item name="footerPreferenceStyle">@style/Preference.FooterPreference.SettingsBase</item>
     </style>