summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-05-08 14:33:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-08 14:33:31 -0700
commit3672624cdc8849f7b4944cff501bddb9a14bbdc0 (patch)
tree7a984a4c2206f07d49b52abb0981c48be4fdd54d /core/java/android
parent7741b63c5a8e14b5123c4b735dc768cf55fa2ed5 (diff)
parent35b7b0b80000774b503f7d06bf3685836f22608f (diff)
downloadframeworks_base-3672624cdc8849f7b4944cff501bddb9a14bbdc0.zip
frameworks_base-3672624cdc8849f7b4944cff501bddb9a14bbdc0.tar.gz
frameworks_base-3672624cdc8849f7b4944cff501bddb9a14bbdc0.tar.bz2
am 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev
* commit '35b7b0b80000774b503f7d06bf3685836f22608f': Add system setting key for dialpad autocomplete
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index c16b2cc..38fb51b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4076,6 +4076,13 @@ public final class Settings {
public static final String ENABLED_NOTIFICATION_LISTENERS = "enabled_notification_listeners";
/**
+ * Whether or not to enable the dial pad autocomplete functionality.
+ *
+ * @hide
+ */
+ public static final String DIALPAD_AUTOCOMPLETE = "dialpad_autocomplete";
+
+ /**
* This are the settings to be backed up.
*
* NOTE: Settings are backed up and restored in the order they appear
@@ -4115,7 +4122,8 @@ public final class Settings {
MOUNT_UMS_AUTOSTART,
MOUNT_UMS_PROMPT,
MOUNT_UMS_NOTIFY_ENABLED,
- UI_NIGHT_MODE
+ UI_NIGHT_MODE,
+ DIALPAD_AUTOCOMPLETE
};
/**