summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-12-14 05:45:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-14 05:45:44 -0800
commit6cb3b52df4f2ec4cc5f361886377657986e9dd19 (patch)
tree2110a0cd1dbaba91bc560cfa957135b63a2ef860
parent4738da2e30272ceeec7e065be3ce4b2838a22d07 (diff)
parent5c58dfcf7dbc87b1f0904cccf2697ab6854a89bf (diff)
downloadframeworks_base-6cb3b52df4f2ec4cc5f361886377657986e9dd19.zip
frameworks_base-6cb3b52df4f2ec4cc5f361886377657986e9dd19.tar.gz
frameworks_base-6cb3b52df4f2ec4cc5f361886377657986e9dd19.tar.bz2
Merge "Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY""
-rw-r--r--api/current.xml11
-rw-r--r--core/java/android/provider/Settings.java6
2 files changed, 17 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 2c971ec..c9371d0 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -162670,6 +162670,17 @@
visibility="public"
>
</field>
+<field name="INPUT_METHOD_SELECTOR_VISIBILITY"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;input_method_selector_visibility&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="INSTALL_NON_MARKET_APPS"
type="java.lang.String"
transient="false"
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1e80da7..873674d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2410,6 +2410,12 @@ public final class Settings {
"input_methods_subtype_history";
/**
+ * Setting to record the visibility of input method selector
+ */
+ public static final String INPUT_METHOD_SELECTOR_VISIBILITY =
+ "input_method_selector_visibility";
+
+ /**
* Whether the device has been provisioned (0 = false, 1 = true)
*/
public static final String DEVICE_PROVISIONED = "device_provisioned";