aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/CMSettingsProvider/res/values/defaults.xml3
-rw-r--r--packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java3
-rw-r--r--packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java3
3 files changed, 9 insertions, 0 deletions
diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml
index 5d590ad..4a082cb 100644
--- a/packages/CMSettingsProvider/res/values/defaults.xml
+++ b/packages/CMSettingsProvider/res/values/defaults.xml
@@ -107,4 +107,7 @@
<!-- Default values for protected component managers -->
<string name="def_protected_component_managers" translatable="false">com.android.settings|com.android.launcher3|com.cyanogenmod.trebuchet</string>
+ <!-- Default value for COLP -->
+ <bool name="def_connected_line_identification">true</bool>
+
</resources>
diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
index 98064af..ee064c0 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java
@@ -299,6 +299,9 @@ public class CMDatabaseHelper extends SQLiteOpenHelper{
loadIntegerSetting(stmt, CMSettings.System.STATUS_BAR_BATTERY_STYLE,
R.integer.def_battery_style);
+ loadBooleanSetting(stmt, CMSettings.System.CONNECTED_LINE_IDENTIFICATION,
+ R.bool.def_connected_line_identification);
+
if (mContext.getResources().getBoolean(R.bool.def_notification_pulse_custom_enable)) {
loadStringSetting(stmt, CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES,
R.string.def_notification_pulse_custom_value);
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 a2c4269..fcbe601 100644
--- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
+++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderDefaultsTest.java
@@ -76,6 +76,9 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
CMSettings.System.STATUS_BAR_BATTERY_STYLE,
"R.integer.def_battery_style"));
+ SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
+ CMSettings.System.CONNECTED_LINE_IDENTIFICATION,
+ "R.bool.def_connected_line_identification"));
}
//SECURE