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

Merge "Remove ActivityManagerNative dependency for adjusting font scale"

Browse Source
This commit is contained in:
Casey Burkhardt
2016-02-04 19:35:53 +00:00
committed by Android (Google) Code Review
parent 91e0ba7d40 a8b2a5072c
commit fcb84e6912
4 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/DisplaySettings.java
View File

@@ -88,8 +88,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private Preference mFontSizePref;
private final Configuration mCurConfig = new Configuration();
private RestrictedListPreference mScreenTimeoutPreference;
private ListPreference mNightModePreference;
private Preference mScreenSaverPreference;
@@ -411,11 +409,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
}
private void updateFontSizeSummary() {
final Resources res = mFontSizePref.getContext().getResources();
final Context context = mFontSizePref.getContext();
final float currentScale = Settings.System.getFloat(context.getContentResolver(),
Settings.System.FONT_SCALE, 1.0f);
final Resources res = context.getResources();
final String[] entries = res.getStringArray(R.array.entries_font_size);
final String[] strEntryValues = res.getStringArray(R.array.entryvalues_font_size);
final int index = ToggleFontSizePreferenceFragment.fontSizeValueToIndex(
res.getConfiguration().fontScale, strEntryValues);
final int index = ToggleFontSizePreferenceFragment.fontSizeValueToIndex(currentScale,
strEntryValues);
mFontSizePref.setSummary(entries[index]);
}