summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-05-08 21:29:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-08 21:29:38 +0000
commit35b7b0b80000774b503f7d06bf3685836f22608f (patch)
tree64f8684cf544d7ea696d78ab3d31fa2e6dee92f0 /core/java/android
parent6dee0a0fe68096a6714b7d570241f61e4d6ea20a (diff)
parent647f8f3d063a2341272122fffc23c11d0c6fa940 (diff)
Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev
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 c16b2cc02135..38fb51bc43e9 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
};
/**