LineageSettings: Mark lookup features as deprecated

These are now handled directly in our Dialer app.

Change-Id: I8d1cd0963360a88be21fdda727725cdb7146723f

4 files changed, 16 insertions, 30 deletions

diff --git a/packages/LineageSettingsProvider/res/values/defaults.xml b/packages/LineageSettingsProvider/res/values/defaults.xml
index 855c7eca..30a7924f 100644
--- a/packages/LineageSettingsProvider/res/values/defaults.xml
+++ b/packages/LineageSettingsProvider/res/values/defaults.xml
@@ -48,15 +48,6 @@
     <!-- Default for LineageSettings.Secure.LOCKSCREEN_VISUALIZER_ENABLED -->
     <bool name="def_lockscreen_visualizer">false</bool>
 
-    <!-- Default value of LineageSettings.System.ENABLE_FORWARD_LOOKUP -->
-    <integer name="def_forward_lookup">1</integer>
-
-    <!-- Default value of LineageSettings.System.ENABLE_PEOPLE_LOOKUP -->
-    <integer name="def_people_lookup">1</integer>
-
-    <!-- Default value of LineageSettings.System.ENABLE_REVERSE_LOOKUP -->
-    <integer name="def_reverse_lookup">1</integer>
-
     <!-- Defaults for Global -->
 
     <!-- Default for LineageSettings.Global.DEVICE_NAME
diff --git a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
index 27a08d22..f2148882 100644
--- a/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
+++ b/packages/LineageSettingsProvider/src/org/lineageos/lineagesettings/LineageDatabaseHelper.java
@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2015, The CyanogenMod Project
- * Copyright (c) 2017,2019-2021 The LineageOS Project
+ * Copyright (C) 2015-2016 The CyanogenMod Project
+ *               2017-2021 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -590,15 +590,6 @@ public class LineageDatabaseHelper extends SQLiteOpenHelper{
             loadBooleanSetting(stmt, LineageSettings.System.SYSTEM_PROFILES_ENABLED,
                     R.bool.def_profiles_enabled);
 
-            loadIntegerSetting(stmt, LineageSettings.System.ENABLE_FORWARD_LOOKUP,
-                    R.integer.def_forward_lookup);
-
-            loadIntegerSetting(stmt, LineageSettings.System.ENABLE_PEOPLE_LOOKUP,
-                    R.integer.def_people_lookup);
-
-            loadIntegerSetting(stmt, LineageSettings.System.ENABLE_REVERSE_LOOKUP,
-                    R.integer.def_reverse_lookup);
-
             loadBooleanSetting(stmt, LineageSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE,
                     R.bool.def_notification_pulse_custom_enable);
 
diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java
index c92ff692..a798c570 100644
--- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java
+++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java
@@ -1,5 +1,6 @@
 /**
- * Copyright (c) 2016, The CyanogenMod Project
+ * Copyright (C) 2016 The CyanogenMod Project
+ *               2021 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,15 +55,6 @@ public class LineageSettingsProviderDefaultsTest extends AndroidTestCase {
                 LineageSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL,
                 "R.integer.def_notification_brightness_level"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                LineageSettings.System.ENABLE_FORWARD_LOOKUP,
-                "R.integer.def_forward_lookup"));
-        SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                LineageSettings.System.ENABLE_PEOPLE_LOOKUP,
-                "R.integer.def_people_lookup"));
-        SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                LineageSettings.System.ENABLE_REVERSE_LOOKUP,
-                "R.integer.def_reverse_lookup"));
-        SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
                 LineageSettings.System.SYSTEM_PROFILES_ENABLED,
                 "R.bool.def_profiles_enabled"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
diff --git a/sdk/src/java/lineageos/providers/LineageSettings.java b/sdk/src/java/lineageos/providers/LineageSettings.java
index 46df9776..c1734af6 100644
--- a/sdk/src/java/lineageos/providers/LineageSettings.java
+++ b/sdk/src/java/lineageos/providers/LineageSettings.java
@@ -1456,9 +1456,11 @@ public final class LineageSettings {
          * Enable looking up of phone numbers of nearby places
          * 0 = 0ff, 1 = on
          */
+        @Deprecated
         public static final String ENABLE_FORWARD_LOOKUP = "enable_forward_lookup";
 
         /** @hide */
+        @Deprecated
         public static final Validator ENABLE_FORWARD_LOOKUP_VALIDATOR =
                 sBooleanValidator;
 
@@ -1466,9 +1468,11 @@ public final class LineageSettings {
          * Enable looking up of phone numbers of people
          * 0 = 0ff, 1 = on
          */
+        @Deprecated
         public static final String ENABLE_PEOPLE_LOOKUP = "enable_people_lookup";
 
         /** @hide */
+        @Deprecated
         public static final Validator ENABLE_PEOPLE_LOOKUP_VALIDATOR =
                 sBooleanValidator;
 
@@ -1476,34 +1480,42 @@ public final class LineageSettings {
          * Enable looking up of information of phone numbers not in the contacts
          * 0 = 0ff, 1 = on
          */
+        @Deprecated
         public static final String ENABLE_REVERSE_LOOKUP = "enable_reverse_lookup";
 
         /** @hide */
+        @Deprecated
         public static final Validator ENABLE_REVERSE_LOOKUP_VALIDATOR =
                 sBooleanValidator;
 
         /**
          * The forward lookup provider to be utilized by the Dialer
          */
+        @Deprecated
         public static final String FORWARD_LOOKUP_PROVIDER = "forward_lookup_provider";
 
         /** @hide */
+        @Deprecated
         public static final Validator FORWARD_LOOKUP_PROVIDER_VALIDATOR = sAlwaysTrueValidator;
 
         /**
          * The people lookup provider to be utilized by the Dialer
          */
+        @Deprecated
         public static final String PEOPLE_LOOKUP_PROVIDER = "people_lookup_provider";
 
         /** @hide */
+        @Deprecated
         public static final Validator PEOPLE_LOOKUP_PROVIDER_VALIDATOR = sAlwaysTrueValidator;
 
         /**
          * The reverse lookup provider to be utilized by the Dialer
          */
+        @Deprecated
         public static final String REVERSE_LOOKUP_PROVIDER = "reverse_lookup_provider";
 
         /** @hide */
+        @Deprecated
         public static final Validator REVERSE_LOOKUP_PROVIDER_VALIDATOR = sAlwaysTrueValidator;
 
         /**