Use preference supported attr to reserve icon space

Change-Id: I28c36f44e6db91fba9aaa5a260303c873a684a5f
Fix: 37572422
Test: runtest android.settings.functional.DisplaySettingsTest

diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index d9124c5..9c7fca9 100644 (file)
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -28,11 +28,11 @@
     </style>
 
     <!-- Preferences -->
-    <style name="SettingsPreference">
+    <style name="SettingsPreference" parent="@style/Preference.Material">
         <item name="allowDividerAbove">false</item>
         <item name="allowDividerBelow">true</item>
         <item name="singleLineTitle">false</item>
-        <item name="android:layout">@layout/preference_material_settings</item>
+        <item name="iconSpaceReserved">true</item>
     </style>
 
     <style name="ApnPreference" parent="SettingsPreference">
@@ -48,7 +48,7 @@
            parent="@style/Preference.DialogPreference.EditTextPreference.Material">
         <item name="allowDividerAbove">false</item>
         <item name="allowDividerBelow">true</item>
-        <item name="android:layout">@layout/preference_material_settings</item>
+        <item name="iconSpaceReserved">true</item>
         <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
     </style>