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

am: 5d3f6d566b

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

View File

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