diff options
| author | 2016-03-08 19:55:58 +0000 | |
|---|---|---|
| committer | 2016-03-08 19:55:59 +0000 | |
| commit | fbcaea877c152e1c82dfd09c356cfaa636f0bbf0 (patch) | |
| tree | 12e67362754ccde6844ef57b215148e22d0c73f8 | |
| parent | 984600566be81ffeb2e25b43c96f6d158e16fa99 (diff) | |
| parent | de16b869308b1d667743bac3deba5d7b2b3c5889 (diff) | |
Merge "SettingsProvider: Add default value for SHOW_IME_WITH_HARD_KEYBOARD." into nyc-dev
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 51d8ca03d4af..978ca9466ff1 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -155,6 +155,9 @@ <!-- Default for Settings.Secure.LONG_PRESS_TIMEOUT_MILLIS --> <integer name="def_long_press_timeout_millis">500</integer> + <!-- Default for Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD --> + <bool name="def_show_ime_with_hard_keyboard">false</bool> + <!-- Default for Settings.System.POINTER_SPEED --> <integer name="def_pointer_speed">0</integer> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 83974db87625..987b5ea2db09 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1940,7 +1940,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 124; + private static final int SETTINGS_VERSION = 125; private final int mUserId; @@ -2120,6 +2120,22 @@ public class SettingsProvider extends ContentProvider { currentVersion = 124; } + if (currentVersion == 124) { + // Version 124: allow OEMs to set a default value for whether IME should be + // shown when a physical keyboard is connected. + final SettingsState secureSettings = getSecureSettingsLocked(userId); + Setting currentSetting = secureSettings.getSettingLocked( + Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD); + if (currentSetting == null) { + secureSettings.insertSettingLocked( + Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, + getContext().getResources().getBoolean( + R.bool.def_show_ime_with_hard_keyboard) ? "1" : "0", + SettingsState.SYSTEM_PACKAGE_NAME); + } + currentVersion = 125; + } + // vXXX: Add new settings above this point. // Return the current version. |