PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch font size from a dialog to dropdown preference."

Browse Source
This commit is contained in:
Julia Reynolds
2015-08-13 14:42:39 +00:00
committed by Android (Google) Code Review
parent 6b60287ff9 a02bc9991d
commit fcfe3d82d2
3 changed files with 5 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -2042,8 +2042,6 @@
<string name="title_font_size">Font size</string>
<!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
<string name="summary_font_size" translatable="false">%1$s</string>
<!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
<string name="dialog_title_font_size">Font size</string>
<!-- SIM lock settings title [CHAR LIMIT=40] -->
<string name="sim_lock_settings">SIM card lock settings</string>
@@ -5606,8 +5604,6 @@
<string name="global_change_warning" product="default">This setting affects all users on this phone.</string>
<!-- Warning message title for global locale change [CHAR LIMIT=40] -->
<string name="global_locale_change_title">Change language</string>
<!-- Warning message title for global font change [CHAR LIMIT=40] -->
<string name="global_font_change_title">Change font size</string>
<!-- NFC payment settings --><skip/>
<string name="nfc_payment_settings_title">Tap &amp; pay</string>

5
res/xml/display_settings.xml
View File

@@ -85,14 +85,13 @@
android:summary="@string/tap_to_wake_summary"
android:persistent="false" />
<com.android.settings.WarnedListPreference
<com.android.settings.DropDownPreference
android:key="font_size"
android:title="@string/title_font_size"
settings:keywords="@string/keywords_display_font_size"
android:summary="@string/summary_font_size"
android:entries="@array/entries_font_size"
android:entryValues="@array/entryvalues_font_size"
android:dialogTitle="@string/dialog_title_font_size" />
android:entryValues="@array/entryvalues_font_size" />
<com.android.settings.DropDownPreference
android:key="auto_rotate"