diff --git a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index c5dc55cc30..46ae3fffaa 100644
--- a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -250,4 +250,9 @@
<integer name="def_screenshot_button_show">0</integer>
<!-- Default for Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLE -->
<bool name="def_camera_double_tap_power_gesture_disable">true</bool>
+
+ <string name="default_input_method" translatable="false">com.android.inputmethod.latin/.LatinIME:com.google.android.inputmethod.latin/com.android.inputmethod.latin.LatinIME</string>
+ <string name="enabled_input_methods" translatable="false">com.google.android.inputmethod.latin/com.android.inputmethod.latin.LatinIME</string>
</resources>
diff --git a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 79148fe377..b39cd37831 100644
--- a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2292,6 +2292,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
loadStringSetting(stmt, Settings.System.TIME_12_24, R.string.def_time_12_24);
+ loadFractionSetting(stmt, Settings.System.FONT_SCALE, R.fraction.def_font_scale, 1);
/*
* IMPORTANT: Do not add any more upgrade steps here as the global,
* secure, and system settings are no longer stored in a database
@@ -2421,6 +2422,11 @@ class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
R.bool.def_camera_double_tap_power_gesture_disable);
+ loadStringSetting(stmt, Settings.Secure.ENABLED_INPUT_METHODS,
+ R.string.enabled_input_methods);
+
+ loadStringSetting(stmt, Settings.Secure.DEFAULT_INPUT_METHOD,
+ R.string.default_input_method);
/*
* IMPORTANT: Do not add any more upgrade steps here as the global,
* secure, and system settings are no longer stored in a database
AOSP: 增加输入法配置
于 2023-09-11 19:44:54 首次发布