summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-08-19 00:34:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-18 23:27:42 +0000
commit468fef687031f0d4f050bb001392fffc6ccf2c4b (patch)
treef5fcd4833174ebdba6847cac2092d0325cc2cf80 /core/java/android/provider/Settings.java
parent8b987196ca8a030010739b50f76c1e03d6302214 (diff)
parent7b5a96ba8364d5c180780b2f878f5a2b949cfdac (diff)
downloadframeworks_base-468fef687031f0d4f050bb001392fffc6ccf2c4b.zip
frameworks_base-468fef687031f0d4f050bb001392fffc6ccf2c4b.tar.gz
frameworks_base-468fef687031f0d4f050bb001392fffc6ccf2c4b.tar.bz2
Merge "Persist Show IME option." into lmp-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
-rw-r--r--core/java/android/provider/Settings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 20e26e6..e4ec1cd 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3546,6 +3546,13 @@ public final class Settings {
public static final String DISABLED_SYSTEM_INPUT_METHODS = "disabled_system_input_methods";
/**
+ * Whether to show the IME when a hard keyboard is connected. This is a boolean that
+ * determines if the IME should be shown when a hard keyboard is attached.
+ * @hide
+ */
+ public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";
+
+ /**
* Host name and port for global http proxy. Uses ':' seperator for
* between host and port.
*