Merge "Remove dialpad_autocomplete system key from settings" into klp-dev

2013-08-22 16:20:16 +00:00
parent e2a6d3df12 35785bfdd1
commit 83e1015d73
1 changed files with 1 additions and 9 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4269,13 +4269,6 @@ 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";
-
        /** @hide */
        public static final String BAR_SERVICE_COMPONENT = "bar_service_component";

@@ -4327,8 +4320,7 @@ public final class Settings {
            MOUNT_UMS_AUTOSTART,
            MOUNT_UMS_PROMPT,
            MOUNT_UMS_NOTIFY_ENABLED,
-            UI_NIGHT_MODE,
-            DIALPAD_AUTOCOMPLETE
+            UI_NIGHT_MODE
        };

        /**