<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>
<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 & pay</string>
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"
import java.util.List;
public class DisplaySettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, OnPreferenceClickListener, Indexable {
+ Preference.OnPreferenceChangeListener, Indexable {
private static final String TAG = "DisplaySettings";
/** If there is no setting in the provider, use this. */
private static final String KEY_NIGHT_MODE = "night_mode";
private static final String KEY_CAMERA_GESTURE = "camera_gesture";
- private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
-
- private WarnedListPreference mFontSizePref;
+ private DropDownPreference mFontSizePref;
private final Configuration mCurConfig = new Configuration();
disableUnusableTimeouts(mScreenTimeoutPreference);
updateTimeoutPreferenceDescription(currentTimeout);
- mFontSizePref = (WarnedListPreference) findPreference(KEY_FONT_SIZE);
+ mFontSizePref = (DropDownPreference) findPreference(KEY_FONT_SIZE);
mFontSizePref.setOnPreferenceChangeListener(this);
- mFontSizePref.setOnPreferenceClickListener(this);
if (isAutomaticBrightnessAvailable(getResources())) {
mAutoBrightnessPreference = (SwitchPreference) findPreference(KEY_AUTO_BRIGHTNESS);
updateState();
}
- @Override
- public Dialog onCreateDialog(int dialogId) {
- if (dialogId == DLG_GLOBAL_CHANGE_WARNING) {
- return Utils.buildGlobalChangeWarningDialog(getActivity(),
- R.string.global_font_change_title,
- new Runnable() {
- public void run() {
- mFontSizePref.click();
- }
- });
- }
- return null;
- }
-
private void updateState() {
readFontSizePreference(mFontSizePref);
updateScreenSaverSummary();
}
@Override
- public boolean onPreferenceClick(Preference preference) {
- if (preference == mFontSizePref) {
- if (Utils.hasMultipleUsers(getActivity())) {
- showDialog(DLG_GLOBAL_CHANGE_WARNING);
- return true;
- } else {
- mFontSizePref.click();
- }
- }
- return false;
- }
-
- @Override
protected int getHelpResource() {
return R.string.help_uri_display;
}