Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev am: 5d3f6d566b

am: 16afefd509

Change-Id: Id24c066d913dcab8532b42211dad25e61e2dc0bd
This commit is contained in:
Fan Zhang
2017-07-10 21:36:10 +00:00
committed by android-build-merger

View File

@@ -49,6 +49,7 @@
<item name="allowDividerAbove">false</item> <item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">true</item> <item name="allowDividerBelow">true</item>
<item name="iconSpaceReserved">true</item> <item name="iconSpaceReserved">true</item>
<item name="singleLineTitle">false</item>
<item name="android:dialogLayout">@layout/preference_dialog_edittext</item> <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
</style> </style>
@@ -72,6 +73,7 @@
<item name="allowDividerAbove">false</item> <item name="allowDividerAbove">false</item>
<item name="allowDividerBelow">true</item> <item name="allowDividerBelow">true</item>
<item name="iconSpaceReserved">true</item> <item name="iconSpaceReserved">true</item>
<item name="singleLineTitle">false</item>
</style> </style>
<style name="SyncSwitchPreference" parent="SettingsPreference"> <style name="SyncSwitchPreference" parent="SettingsPreference">