相关修改文件
/packages/apps/Settings/src/com/android/settings/DisplaySettings.java +434
packages/apps/Settings/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
./device/mediatek/common/overlay/tablet/packages/apps/Settings/res/values-sw600dp/arrays.xml +22
packages/apps/Settings/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/packages/apps/Settings/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -25,6 +25,8 @@ import android.provider.Settings;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.PreviewSeekBarPreferenceFragment;
import com.android.settings.R;
+import android.util.Log;
+
/**
* Preference fragment used to control font size.
@@ -46,7 +48,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
mEntries = res.getStringArray(R.array.entries_font_size);
final String[] strEntryValues = res.getStringArray(R.array.entryvalues_font_size);
final float currentScale =
- Settings.System.getFloat(resolver, Settings.System.FONT_SCALE, 1.30f);
+ Settings.System.getFloat(resolver, Settings.System.FONT_SCALE, 1.55f);
mInitialIndex = fontSizeValueToIndex(currentScale, strEntryValues);
mValues = new float[strEntryValues.length];
for (int i = 0; i < strEntryValues.length; ++i) {
/packages/apps/Settings/src/com/android/settings/DisplaySettings.java +434
@@ -432,7 +434,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
final Context context = mDisplaySettingsExt.isCustomPrefPresent()
? mCustomFontSizePref.getContext() : mFontSizePref.getContext();
final float currentScale = Settings.System.getFloat(context.getContentResolver(),
- Settings.System.FONT_SCALE, 1.30f);
+ Settings.System.FONT_SCALE, 1.55f);
+ Log.d("displaySettings","kyd_currentScale = " + currentScale);
final Resources res = context.getResources();
final String[] entries = mDisplaySettingsExt
.getFontEntries(res.getStringArray(R.array.entries_font_size));
@@ -440,6 +443,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
.getFontEntryValues(res.getStringArray(R.array.entryvalues_font_size));
final int index = ToggleFontSizePreferenceFragment.fontSizeValueToIndex(currentScale,
strEntryValues);
+ Log.d("displaySettings","kyd_index = " + index);
if (!mDisplaySettingsExt.isCustomPrefPresent()) {
mFontSizePref.setSummary(entries[index]);
} else {
packages/apps/Settings/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
./device/mediatek/common/overlay/tablet/packages/apps/Settings/res/values-sw600dp/arrays.xml +22
--- a/device/mediatek/common/overlay/tablet/packages/apps/Settings/res/values-sw600dp/arrays.xml
+++ b/device/mediatek/common/overlay/tablet/packages/apps/Settings/res/values-sw600dp/arrays.xml
@@ -20,10 +20,9 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="entryvalues_font_size" translatable="false">
- <item>1</item>
<item>1.30</item>
<item>1.55</item>
<item>1.75</item>
</string-array>
-</resources>
/packages/apps/Settings/res/values/arrays.xml +144
--- a/packages/apps/Settings/res/values-zh-rCN/arrays.xml
+++ b/packages/apps/Settings/res/values-zh-rCN/arrays.xml
@@ -60,10 +60,9 @@
<item msgid="4322676235684793329">"30分钟"</item>
</string-array>
<string-array name="entries_font_size">
- <item msgid="8166647333858618801">"小"</item>
- <item msgid="6986443533756848935">"默认"</item>
- <item msgid="38373998008112077">"大"</item>
- <item msgid="7635254317531872272">"最大"</item>
+ <item msgid="6986443533756848935">"小"</item>
+ <item msgid="38373998008112077">"默认"</item>
+ <item msgid="7635254317531872272">"大"</item>
</string-array>