aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2016-07-23 00:26:29 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-07-29 11:17:46 -0700
commit55c755aa729a70e7f657bba76539d85e58e78948 (patch)
treed8e946d9446b11f1f6cbf909aa4e18e7abbd5b2a /packages
parent544d324c82d8ef1f613711378b5b5735a53f9d9e (diff)
downloadvendor_cmsdk-55c755aa729a70e7f657bba76539d85e58e78948.zip
vendor_cmsdk-55c755aa729a70e7f657bba76539d85e58e78948.tar.gz
vendor_cmsdk-55c755aa729a70e7f657bba76539d85e58e78948.tar.bz2
CMSettings: Add default overlay for forward and reverse lookup
Change-Id: I3510a3e136ef86a8d45847a0bf7a35fb426212f9
Diffstat (limited to 'packages')
-rw-r--r--packages/CMSettingsProvider/res/values/defaults.xml6
-rw-r--r--packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java6
-rw-r--r--packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java6
3 files changed, 18 insertions, 0 deletions
diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml
index 378e36f..1ea76a6 100644
--- a/packages/CMSettingsProvider/res/values/defaults.xml
+++ b/packages/CMSettingsProvider/res/values/defaults.xml
@@ -67,9 +67,15 @@
<!-- Default for CMSettings.Secure.LOCKSCREEN_VISUALIZER_ENABLED -->
<bool name="def_lockscreen_visualizer">true</bool>
+ <!-- Default value of CMSettings.System.ENABLE_FORWARD_LOOKUP -->
+ <integer name="def_forward_lookup">1</integer>
+
<!-- Default value of CMSettings.System.ENABLE_PEOPLE_LOOKUP -->
<integer name="def_people_lookup">1</integer>
+ <!-- Default value of CMSettings.System.ENABLE_REVERSE_LOOKUP -->
+ <integer name="def_reverse_lookup">1</integer>
+
<!-- Defaults for Global -->
<!-- Default for CMSettings.Global.DEVICE_NAME
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
index cf99e1c..d35f449 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
@@ -377,9 +377,15 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{
loadBooleanSetting(stmt, CMSettings.System.SYSTEM_PROFILES_ENABLED,
R.bool.def_profiles_enabled);
+ loadIntegerSetting(stmt, CMSettings.System.ENABLE_FORWARD_LOOKUP,
+ R.integer.def_forward_lookup);
+
loadIntegerSetting(stmt, CMSettings.System.ENABLE_PEOPLE_LOOKUP,
R.integer.def_people_lookup);
+ loadIntegerSetting(stmt, CMSettings.System.ENABLE_REVERSE_LOOKUP,
+ R.integer.def_reverse_lookup);
+
loadBooleanSetting(stmt, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE,
R.bool.def_notification_pulse_custom_enable);
diff --git a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
index 568949c..2ea0bf8 100644
--- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
+++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
@@ -56,9 +56,15 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
CMSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL,
"R.integer.def_notification_brightness_level"));
SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
+ CMSettings.System.ENABLE_FORWARD_LOOKUP,
+ "R.integer.def_forward_lookup"));
+ SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.System.ENABLE_PEOPLE_LOOKUP,
"R.integer.def_people_lookup"));
SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
+ CMSettings.System.ENABLE_REVERSE_LOOKUP,
+ "R.integer.def_reverse_lookup"));
+ SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE,
"R.bool.def_notification_multiple_leds"));
SYSTEM_SETTINGS_DEFAULTS.add(new Setting(