lineage-sdk: rebrand step 2: update file contents

Change-Id: I9881acc57cdc0aeea2b296aac12a8af932d30aea

5 files changed, 175 insertions, 175 deletions

diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsGlobalTests.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsGlobalTests.java
index 28669257..619580bb 100644
--- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsGlobalTests.java
+++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsGlobalTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.cmsettings.tests;
+package org.lineageos.lineagesettings.tests;
 
 import android.content.ContentResolver;
 import android.net.Uri;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
-import cyanogenmod.providers.CMSettings;
+import lineageos.providers.LineageSettings;
 
-public class CMSettingsGlobalTests extends AndroidTestCase {
+public class LineageSettingsGlobalTests extends AndroidTestCase {
     private ContentResolver mContentResolver;
 
     private static final String UNREALISTIC_SETTING = "_______UNREAL_______";
@@ -36,14 +36,14 @@ public class CMSettingsGlobalTests extends AndroidTestCase {
     @SmallTest
     public void testFloat() {
         final float expectedFloatValue = 1.0f;
-        CMSettings.Global.putFloat(mContentResolver,
-                CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedFloatValue);
+        LineageSettings.Global.putFloat(mContentResolver,
+                LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedFloatValue);
 
         try {
-            float actualValue = CMSettings.Global.getFloat(mContentResolver,
-                    CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
+            float actualValue = LineageSettings.Global.getFloat(mContentResolver,
+                    LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedFloatValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -51,7 +51,7 @@ public class CMSettingsGlobalTests extends AndroidTestCase {
     @SmallTest
     public void testFloatWithDefault() {
         final float expectedDefaultFloatValue = 1.5f;
-        float actualValue = CMSettings.Global.getFloat(mContentResolver,
+        float actualValue = LineageSettings.Global.getFloat(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultFloatValue);
         assertEquals(expectedDefaultFloatValue, actualValue);
     }
@@ -59,14 +59,14 @@ public class CMSettingsGlobalTests extends AndroidTestCase {
     @SmallTest
     public void testInt() {
         final int expectedIntValue = 2;
-        CMSettings.Global.putInt(mContentResolver,
-                CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedIntValue);
+        LineageSettings.Global.putInt(mContentResolver,
+                LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedIntValue);
 
         try {
-            int actualValue = CMSettings.Global.getInt(mContentResolver,
-                    CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
+            int actualValue = LineageSettings.Global.getInt(mContentResolver,
+                    LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedIntValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -74,7 +74,7 @@ public class CMSettingsGlobalTests extends AndroidTestCase {
     @SmallTest
     public void testIntWithDefault() {
         final int    expectedDefaultIntValue = 11;
-        int actualValue = CMSettings.Global.getInt(mContentResolver,
+        int actualValue = LineageSettings.Global.getInt(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultIntValue);
         assertEquals(expectedDefaultIntValue, actualValue);
     }
@@ -82,14 +82,14 @@ public class CMSettingsGlobalTests extends AndroidTestCase {
     @SmallTest
     public void testLong() {
         final long expectedLongValue = 3l;
-        CMSettings.Global.putLong(mContentResolver,
-                CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedLongValue);
+        LineageSettings.Global.putLong(mContentResolver,
+                LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedLongValue);
 
         try {
-            long actualValue = CMSettings.Global.getLong(mContentResolver,
-                    CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
+            long actualValue = LineageSettings.Global.getLong(mContentResolver,
+                    LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedLongValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -97,7 +97,7 @@ public class CMSettingsGlobalTests extends AndroidTestCase {
     @SmallTest
     public void testLongWithDefault() {
         final long expectedDefaultLongValue = 17l;
-        long actualValue = CMSettings.Global.getLong(mContentResolver,
+        long actualValue = LineageSettings.Global.getLong(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultLongValue);
         assertEquals(expectedDefaultLongValue, actualValue);
     }
@@ -105,21 +105,21 @@ public class CMSettingsGlobalTests extends AndroidTestCase {
     @SmallTest
     public void testString() {
         final String expectedStringValue = "4";
-        CMSettings.Global.putString(mContentResolver,
-                CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedStringValue);
+        LineageSettings.Global.putString(mContentResolver,
+                LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER, expectedStringValue);
 
-        String actualValue = CMSettings.Global.getString(mContentResolver,
-                CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
+        String actualValue = LineageSettings.Global.getString(mContentResolver,
+                LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
         assertEquals(expectedStringValue, actualValue);
     }
 
     @SmallTest
     public void testGetUri() {
-        final Uri expectedUri = Uri.withAppendedPath(CMSettings.Global.CONTENT_URI,
-                CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
+        final Uri expectedUri = Uri.withAppendedPath(LineageSettings.Global.CONTENT_URI,
+                LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
 
-        final Uri actualUri = CMSettings.Global.getUriFor(
-                CMSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
+        final Uri actualUri = LineageSettings.Global.getUriFor(
+                LineageSettings.Global.__MAGICAL_TEST_PASSING_ENABLER);
 
         assertEquals(expectedUri, actualUri);
     }
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 2ea0bf8e..ddb9c946 100644
--- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java
+++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderDefaultsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.cmsettings.tests;
+package org.lineageos.lineagesettings.tests;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -29,15 +29,15 @@ import java.util.ArrayList;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
-import cyanogenmod.providers.CMSettings;
-import org.cyanogenmod.cmsettings.CMDatabaseHelper;
-import org.cyanogenmod.cmsettings.CMSettingsProvider;
-import org.cyanogenmod.cmsettings.R;
+import lineageos.providers.LineageSettings;
+import org.lineageos.lineagesettings.LineageDatabaseHelper;
+import org.lineageos.lineagesettings.LineageSettingsProvider;
+import org.lineageos.lineagesettings.R;
 
 /**
  * Created by adnan on 1/25/16.
  */
-public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
+public class LineageSettingsProviderDefaultsTest extends AndroidTestCase {
     private ContentResolver mContentResolver;
     private boolean mHasMigratedSettings;
     private Resources mRemoteResources;
@@ -50,81 +50,81 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
     //SYSTEM
     static {
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN,
+                LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN,
                 "R.integer.def_qs_quick_pulldown"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL,
+                LineageSettings.System.NOTIFICATION_LIGHT_BRIGHTNESS_LEVEL,
                 "R.integer.def_notification_brightness_level"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.ENABLE_FORWARD_LOOKUP,
+                LineageSettings.System.ENABLE_FORWARD_LOOKUP,
                 "R.integer.def_forward_lookup"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.ENABLE_PEOPLE_LOOKUP,
+                LineageSettings.System.ENABLE_PEOPLE_LOOKUP,
                 "R.integer.def_people_lookup"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.ENABLE_REVERSE_LOOKUP,
+                LineageSettings.System.ENABLE_REVERSE_LOOKUP,
                 "R.integer.def_reverse_lookup"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE,
+                LineageSettings.System.NOTIFICATION_LIGHT_MULTIPLE_LEDS_ENABLE,
                 "R.bool.def_notification_multiple_leds"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.SYSTEM_PROFILES_ENABLED,
+                LineageSettings.System.SYSTEM_PROFILES_ENABLED,
                 "R.bool.def_profiles_enabled"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE,
+                LineageSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE,
                 "R.bool.def_notification_pulse_custom_enable"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.SWAP_VOLUME_KEYS_ON_ROTATION,
+                LineageSettings.System.SWAP_VOLUME_KEYS_ON_ROTATION,
                 "R.bool.def_swap_volume_keys_on_rotation"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES,
+                LineageSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES,
                 "R.string.def_notification_pulse_custom_value"));
         SYSTEM_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.System.STATUS_BAR_BATTERY_STYLE,
+                LineageSettings.System.STATUS_BAR_BATTERY_STYLE,
                 "R.integer.def_battery_style"));
     }
 
     //SECURE
     static {
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.ADVANCED_MODE,
+                LineageSettings.Secure.ADVANCED_MODE,
                 "R.bool.def_advanced_mode"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.QS_USE_MAIN_TILES,
+                LineageSettings.Secure.QS_USE_MAIN_TILES,
                 "R.bool.def_sysui_qs_main_tiles"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.STATS_COLLECTION,
+                LineageSettings.Secure.STATS_COLLECTION,
                 "R.bool.def_stats_collection"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.LOCKSCREEN_VISUALIZER_ENABLED,
+                LineageSettings.Secure.LOCKSCREEN_VISUALIZER_ENABLED,
                 "R.bool.def_lockscreen_visualizer"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.DEFAULT_THEME_COMPONENTS,
+                LineageSettings.Secure.DEFAULT_THEME_COMPONENTS,
                 "R.string.def_theme_components"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.DEFAULT_THEME_PACKAGE,
+                LineageSettings.Secure.DEFAULT_THEME_PACKAGE,
                 "R.string.def_theme_package"));
         SECURE_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Secure.PROTECTED_COMPONENT_MANAGERS,
+                LineageSettings.Secure.PROTECTED_COMPONENT_MANAGERS,
                 "R.string.def_protected_component_managers"));
     }
 
     //GLOBAL
     static {
         GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Global.POWER_NOTIFICATIONS_ENABLED,
+                LineageSettings.Global.POWER_NOTIFICATIONS_ENABLED,
                 "R.bool.def_power_notifications_enabled"));
         GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Global.POWER_NOTIFICATIONS_VIBRATE,
+                LineageSettings.Global.POWER_NOTIFICATIONS_VIBRATE,
                 "R.bool.def_power_notifications_vibrate"));
         GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Global.POWER_NOTIFICATIONS_RINGTONE,
+                LineageSettings.Global.POWER_NOTIFICATIONS_RINGTONE,
                 "R.string.def_power_notifications_ringtone"));
         GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Global.WEATHER_TEMPERATURE_UNIT,
+                LineageSettings.Global.WEATHER_TEMPERATURE_UNIT,
                 "R.integer.def_temperature_unit"));
         GLOBAL_SETTINGS_DEFAULTS.add(new Setting(
-                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR,
+                LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR,
                 "R.integer.def_force_show_navbar"));
     }
 
@@ -132,17 +132,17 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         mContentResolver = getContext().getContentResolver();
-        mHasMigratedSettings = getContext().getSharedPreferences(CMSettingsProvider.TAG,
-                Context.MODE_PRIVATE).getBoolean(CMSettingsProvider.PREF_HAS_MIGRATED_CM_SETTINGS,
+        mHasMigratedSettings = getContext().getSharedPreferences(LineageSettingsProvider.TAG,
+                Context.MODE_PRIVATE).getBoolean(LineageSettingsProvider.PREF_HAS_MIGRATED_LINEAGE_SETTINGS,
                 false);
-        mRemoteResources = getRemoteResources("org.cyanogenmod.cmsettings");
+        mRemoteResources = getRemoteResources("org.lineageos.lineagesettings");
     }
 
     @SmallTest
     public void testVerifySystemSettingsDefault() {
         if (verifyNotMigratedSettings()) {
             for (Setting setting : SYSTEM_SETTINGS_DEFAULTS) {
-                verifyDefaultSettingForTable(setting, CMDatabaseHelper.CMTableNames.TABLE_SYSTEM);
+                verifyDefaultSettingForTable(setting, LineageDatabaseHelper.LineageTableNames.TABLE_SYSTEM);
             }
         }
     }
@@ -151,7 +151,7 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
     public void testVerifySecureSettingsDefaults() {
         if (verifyNotMigratedSettings()) {
             for (Setting setting : SECURE_SETTINGS_DEFAULTS) {
-                verifyDefaultSettingForTable(setting, CMDatabaseHelper.CMTableNames.TABLE_SECURE);
+                verifyDefaultSettingForTable(setting, LineageDatabaseHelper.LineageTableNames.TABLE_SECURE);
             }
         }
     }
@@ -160,7 +160,7 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
     public void testVerifyGlobalSettingsDefaults() {
         if (verifyNotMigratedSettings()) {
             for (Setting setting : GLOBAL_SETTINGS_DEFAULTS) {
-                verifyDefaultSettingForTable(setting, CMDatabaseHelper.CMTableNames.TABLE_GLOBAL);
+                verifyDefaultSettingForTable(setting, LineageDatabaseHelper.LineageTableNames.TABLE_GLOBAL);
             }
         }
     }
@@ -173,7 +173,7 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
         TypedValue value = new TypedValue();
         try {
             int identifier = mRemoteResources.getIdentifier(
-                    setting.mDefResName, setting.mType, "org.cyanogenmod.cmsettings");
+                    setting.mDefResName, setting.mType, "org.lineageos.lineagesettings");
             mRemoteResources.getValue(identifier, value, true);
         } catch (Resources.NotFoundException e) {
             // Resource not found, can't verify because it probably wasn't loaded in
@@ -220,23 +220,23 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
                 case TypedValue.TYPE_NULL:
                     break;
             }
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             e.printStackTrace();
             throw new AssertionError("Setting " + setting.mKey + " not found!");
         }
     }
 
     private int getIntForTable(Setting setting, String table)
-            throws CMSettings.CMSettingNotFoundException {
+            throws LineageSettings.LineageSettingNotFoundException {
         switch (table) {
-            case CMDatabaseHelper.CMTableNames.TABLE_SYSTEM:
-                return CMSettings.System.getIntForUser(mContentResolver, setting.mKey,
+            case LineageDatabaseHelper.LineageTableNames.TABLE_SYSTEM:
+                return LineageSettings.System.getIntForUser(mContentResolver, setting.mKey,
                         UserHandle.USER_OWNER);
-            case CMDatabaseHelper.CMTableNames.TABLE_SECURE:
-                return CMSettings.Secure.getIntForUser(mContentResolver, setting.mKey,
+            case LineageDatabaseHelper.LineageTableNames.TABLE_SECURE:
+                return LineageSettings.Secure.getIntForUser(mContentResolver, setting.mKey,
                         UserHandle.USER_OWNER);
-            case CMDatabaseHelper.CMTableNames.TABLE_GLOBAL:
-                return CMSettings.Global.getIntForUser(mContentResolver, setting.mKey,
+            case LineageDatabaseHelper.LineageTableNames.TABLE_GLOBAL:
+                return LineageSettings.Global.getIntForUser(mContentResolver, setting.mKey,
                         UserHandle.USER_OWNER);
             default:
                 throw new AssertionError("Invalid or empty table!");
@@ -244,16 +244,16 @@ public class CMSettingsProviderDefaultsTest extends AndroidTestCase {
     }
 
     private String getStringForTable(Setting setting, String table)
-            throws CMSettings.CMSettingNotFoundException {
+            throws LineageSettings.LineageSettingNotFoundException {
         switch (table) {
-            case CMDatabaseHelper.CMTableNames.TABLE_SYSTEM:
-                return CMSettings.System.getStringForUser(mContentResolver, setting.mKey,
+            case LineageDatabaseHelper.LineageTableNames.TABLE_SYSTEM:
+                return LineageSettings.System.getStringForUser(mContentResolver, setting.mKey,
                         UserHandle.USER_OWNER);
-            case CMDatabaseHelper.CMTableNames.TABLE_SECURE:
-                return CMSettings.Secure.getStringForUser(mContentResolver, setting.mKey,
+            case LineageDatabaseHelper.LineageTableNames.TABLE_SECURE:
+                return LineageSettings.Secure.getStringForUser(mContentResolver, setting.mKey,
                         UserHandle.USER_OWNER);
-            case CMDatabaseHelper.CMTableNames.TABLE_GLOBAL:
-                return CMSettings.Global.getStringForUser(mContentResolver, setting.mKey,
+            case LineageDatabaseHelper.LineageTableNames.TABLE_GLOBAL:
+                return LineageSettings.Global.getStringForUser(mContentResolver, setting.mKey,
                         UserHandle.USER_OWNER);
             default:
                 throw new AssertionError("Invalid or empty table!");
diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java
index c4db088a..17908ffe 100644
--- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java
+++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsProviderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.cmsettings.tests;
+package org.lineageos.lineagesettings.tests;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -32,14 +32,14 @@ import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
-import cyanogenmod.providers.CMSettings;
-import org.cyanogenmod.cmsettings.CMSettingsProvider;
+import lineageos.providers.LineageSettings;
+import org.lineageos.lineagesettings.LineageSettingsProvider;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
- public class CMSettingsProviderTest extends AndroidTestCase {
-     private static final String TAG = "CMSettingsProviderTest";
+ public class LineageSettingsProviderTest extends AndroidTestCase {
+     private static final String TAG = "LineageSettingsProviderTest";
 
      private static final LinkedHashMap<String, String> sMap = new LinkedHashMap<String, String>();
 
@@ -70,7 +70,7 @@ import java.util.Map;
      }
 
      @MediumTest
-     public void testMigrateCMSettingsForOtherUser() {
+     public void testMigrateLineageSettingsForOtherUser() {
          // Make sure there's an owner
          assertTrue(findUser(mUserManager, UserHandle.USER_OWNER));
 
@@ -81,19 +81,19 @@ import java.util.Map;
      }
 
      /**
-      * make sure that queries to SettingsProvider are forwarded to CMSettingsProvider as needed
-      * See {@link cyanogenmod.providers.CMSettings.System#shouldInterceptSystemProvider(String)}
+      * make sure that queries to SettingsProvider are forwarded to LineageSettingsProvider as needed
+      * See {@link lineageos.providers.LineageSettings.System#shouldInterceptSystemProvider(String)}
       *
       * Currently this test only checks that
-      * {@link cyanogenmod.providers.CMSettings.System#SYSTEM_PROFILES_ENABLED} is expected to
+      * {@link lineageos.providers.LineageSettings.System#SYSTEM_PROFILES_ENABLED} is expected to
       * be forwarded, and is forwarded.
       */
      @SmallTest
      public void testSettingsProviderKeyForwarding() {
-         String forwardedKey = CMSettings.System.SYSTEM_PROFILES_ENABLED;
+         String forwardedKey = LineageSettings.System.SYSTEM_PROFILES_ENABLED;
 
          // make sure the key should be forwarded
-         assertTrue(CMSettings.System.shouldInterceptSystemProvider(forwardedKey));
+         assertTrue(LineageSettings.System.shouldInterceptSystemProvider(forwardedKey));
 
          // put value 1 into Settings provider:
          // let's try to disable the profiles via the Settings provider
@@ -104,23 +104,23 @@ import java.util.Map;
          assertEquals("0", Settings.System.getStringForUser(getContext().getContentResolver(),
                  forwardedKey, UserHandle.USER_CURRENT));
 
-         // put value 2 into CMSettings provider
-         CMSettings.System.putStringForUser(mContentResolver,
+         // put value 2 into LineageSettings provider
+         LineageSettings.System.putStringForUser(mContentResolver,
                  forwardedKey, "1", UserHandle.USER_CURRENT);
 
-         assertEquals("1", CMSettings.System.getStringForUser(getContext().getContentResolver(),
+         assertEquals("1", LineageSettings.System.getStringForUser(getContext().getContentResolver(),
                  forwardedKey, UserHandle.USER_CURRENT));
 
          // assert reading from both returns value 2
-         final String cmProviderValue = CMSettings.System.getStringForUser(
+         final String lineageProviderValue = LineageSettings.System.getStringForUser(
                  getContext().getContentResolver(), forwardedKey, UserHandle.USER_CURRENT);
          final String settingsProviderValue = Settings.System.getStringForUser(
                  getContext().getContentResolver(), forwardedKey, UserHandle.USER_CURRENT);
-         assertEquals(cmProviderValue, settingsProviderValue);
+         assertEquals(lineageProviderValue, settingsProviderValue);
      }
 
      /**
-      * The new {@link CMSettings.Secure#CM_SETUP_WIZARD_COMPLETED} cm specific provisioned flag
+      * The new {@link LineageSettings.Secure#LINEAGE_SETUP_WIZARD_COMPLETED} lineage specific provisioned flag
       * should be equal to the old {@link Settings.Global#DEVICE_PROVISIONED} flag on boot, or on
       * upgrade. These flags will almost always be equal, except during the provisioning process,
       * they may change at slightly different times.
@@ -132,50 +132,50 @@ import java.util.Map;
       */
      @Deprecated
      @SmallTest
-     public void testCMProvisionedFlagFallbackSet() {
-         final String newCmFlag = CMSettings.Secure.getStringForUser(
-                 getContext().getContentResolver(), CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED,
+     public void testLineageProvisionedFlagFallbackSet() {
+         final String newLineageFlag = LineageSettings.Secure.getStringForUser(
+                 getContext().getContentResolver(), LineageSettings.Secure.LINEAGE_SETUP_WIZARD_COMPLETED,
                  UserHandle.USER_OWNER);
-         assertNotNull(newCmFlag);
+         assertNotNull(newLineageFlag);
 
          final String previousFlag = Settings.Global.getStringForUser(
                  getContext().getContentResolver(), Settings.Global.DEVICE_PROVISIONED,
                  UserHandle.USER_OWNER);
-         assertEquals(previousFlag, newCmFlag);
+         assertEquals(previousFlag, newLineageFlag);
      }
 
      private void testMigrateSettingsForUser(int userId) {
          // Setup values in Settings
          /*final String expectedPullDownValue = "testQuickPullDownValue";
          Settings.System.putStringForUser(mContentResolver,
-                 CMSettingsProvider.LegacyCMSettings.STATUS_BAR_QUICK_QS_PULLDOWN,
+                 LineageSettingsProvider.LegacyLineageSettings.STATUS_BAR_QUICK_QS_PULLDOWN,
                  expectedPullDownValue, userId);
 
          final int expectedKeyboardBrightness = 4;
          Settings.Secure.putIntForUser(mContentResolver,
-                 CMSettingsProvider.LegacyCMSettings.KEYBOARD_BRIGHTNESS,
+                 LineageSettingsProvider.LegacyLineageSettings.KEYBOARD_BRIGHTNESS,
                  expectedKeyboardBrightness, userId);
 
          Bundle arg = new Bundle();
-         arg.putInt(CMSettings.CALL_METHOD_USER_KEY, userId);
+         arg.putInt(LineageSettings.CALL_METHOD_USER_KEY, userId);
          IContentProvider contentProvider = mContentResolver.acquireProvider(
-                 CMSettings.AUTHORITY);
+                 LineageSettings.AUTHORITY);
 
          try{
              // Trigger migrate settings for guest
              contentProvider.call(mContentResolver.getPackageName(),
-                     CMSettings.CALL_METHOD_MIGRATE_SETTINGS_FOR_USER, null, arg);
+                     LineageSettings.CALL_METHOD_MIGRATE_SETTINGS_FOR_USER, null, arg);
          } catch (RemoteException ex) {
              fail("Failed to trigger settings migration due to RemoteException");
          }
 
          // Check values
-         final String actualPullDownValue = CMSettings.System.getStringForUser(mContentResolver,
-                 CMSettings.System.QS_QUICK_PULLDOWN, userId);
+         final String actualPullDownValue = LineageSettings.System.getStringForUser(mContentResolver,
+                 LineageSettings.System.QS_QUICK_PULLDOWN, userId);
          assertEquals(expectedPullDownValue, actualPullDownValue);
 
-         final int actualKeyboardBrightness = CMSettings.Secure.getIntForUser(mContentResolver,
-                 CMSettings.Secure.KEYBOARD_BRIGHTNESS, -1, userId);
+         final int actualKeyboardBrightness = LineageSettings.Secure.getIntForUser(mContentResolver,
+                 LineageSettings.Secure.KEYBOARD_BRIGHTNESS, -1, userId);
          assertEquals(expectedKeyboardBrightness, actualKeyboardBrightness);*/
      }
 
@@ -204,9 +204,9 @@ import java.util.Map;
              contentValues[count++] = contentValue;
          }
 
-         testBulkInsertForUri(CMSettings.System.CONTENT_URI, contentValues, keyValues);
-         testBulkInsertForUri(CMSettings.Secure.CONTENT_URI, contentValues, keyValues);
-         testBulkInsertForUri(CMSettings.Global.CONTENT_URI, contentValues, keyValues);
+         testBulkInsertForUri(LineageSettings.System.CONTENT_URI, contentValues, keyValues);
+         testBulkInsertForUri(LineageSettings.Secure.CONTENT_URI, contentValues, keyValues);
+         testBulkInsertForUri(LineageSettings.Global.CONTENT_URI, contentValues, keyValues);
      }
 
      private void testBulkInsertForUri(Uri uri, ContentValues[] contentValues, String[] keyValues) {
@@ -248,9 +248,9 @@ import java.util.Map;
 
      @MediumTest
      public void testInsertUpdateDeleteSuccess() {
-         //testInsertUpdateDeleteForUri(CMSettings.System.CONTENT_URI);
-         testInsertUpdateDeleteForUri(CMSettings.Secure.CONTENT_URI);
-         testInsertUpdateDeleteForUri(CMSettings.Global.CONTENT_URI);
+         //testInsertUpdateDeleteForUri(LineageSettings.System.CONTENT_URI);
+         testInsertUpdateDeleteForUri(LineageSettings.Secure.CONTENT_URI);
+         testInsertUpdateDeleteForUri(LineageSettings.Global.CONTENT_URI);
      }
 
      private void testInsertUpdateDeleteForUri(Uri uri) {
diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSecureTests.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSecureTests.java
index 434b95df..b27accad 100644
--- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSecureTests.java
+++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSecureTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.cmsettings.tests;
+package org.lineageos.lineagesettings.tests;
 
 import android.content.ContentResolver;
 import android.net.Uri;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
-import cyanogenmod.providers.CMSettings;
+import lineageos.providers.LineageSettings;
 
-public class CMSettingsSecureTests extends AndroidTestCase {
+public class LineageSettingsSecureTests extends AndroidTestCase {
     private ContentResolver mContentResolver;
 
     private static final String UNREALISTIC_SETTING = "_______UNREAL_______";
@@ -36,14 +36,14 @@ public class CMSettingsSecureTests extends AndroidTestCase {
     @SmallTest
     public void testFloat() {
         final float expectedFloatValue = 1.0f;
-        CMSettings.Secure.putFloat(mContentResolver,
-                CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedFloatValue);
+        LineageSettings.Secure.putFloat(mContentResolver,
+                LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedFloatValue);
 
         try {
-            float actualValue = CMSettings.Secure.getFloat(mContentResolver,
-                    CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
+            float actualValue = LineageSettings.Secure.getFloat(mContentResolver,
+                    LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedFloatValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -51,7 +51,7 @@ public class CMSettingsSecureTests extends AndroidTestCase {
     @SmallTest
     public void testFloatWithDefault() {
         final float expectedDefaultFloatValue = 1.5f;
-        float actualValue = CMSettings.Secure.getFloat(mContentResolver,
+        float actualValue = LineageSettings.Secure.getFloat(mContentResolver,
                     UNREALISTIC_SETTING, expectedDefaultFloatValue);
         assertEquals(expectedDefaultFloatValue, actualValue);
     }
@@ -59,14 +59,14 @@ public class CMSettingsSecureTests extends AndroidTestCase {
     @SmallTest
     public void testInt() {
         final int expectedIntValue = 2;
-        CMSettings.Secure.putInt(mContentResolver,
-                CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedIntValue);
+        LineageSettings.Secure.putInt(mContentResolver,
+                LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedIntValue);
 
         try {
-            int actualValue = CMSettings.Secure.getInt(mContentResolver,
-                    CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
+            int actualValue = LineageSettings.Secure.getInt(mContentResolver,
+                    LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedIntValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -74,7 +74,7 @@ public class CMSettingsSecureTests extends AndroidTestCase {
     @SmallTest
     public void testIntWithDefault() {
         final int expectedDefaultIntValue = 11;
-        int actualValue = CMSettings.Secure.getInt(mContentResolver,
+        int actualValue = LineageSettings.Secure.getInt(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultIntValue);
         assertEquals(expectedDefaultIntValue, actualValue);
     }
@@ -82,14 +82,14 @@ public class CMSettingsSecureTests extends AndroidTestCase {
     @SmallTest
     public void testLong() {
         final long expectedLongValue = 3l;
-        CMSettings.Secure.putLong(mContentResolver,
-                CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedLongValue);
+        LineageSettings.Secure.putLong(mContentResolver,
+                LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedLongValue);
 
         try {
-            long actualValue = CMSettings.Secure.getLong(mContentResolver,
-                    CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
+            long actualValue = LineageSettings.Secure.getLong(mContentResolver,
+                    LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedLongValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -97,7 +97,7 @@ public class CMSettingsSecureTests extends AndroidTestCase {
     @SmallTest
     public void testLongWithDefault() {
         final long expectedDefaultLongValue = 17l;
-        long actualValue = CMSettings.Secure.getLong(mContentResolver,
+        long actualValue = LineageSettings.Secure.getLong(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultLongValue);
         assertEquals(expectedDefaultLongValue, actualValue);
     }
@@ -105,21 +105,21 @@ public class CMSettingsSecureTests extends AndroidTestCase {
     @SmallTest
     public void testString() {
         final String expectedStringValue = "4";
-        CMSettings.Secure.putString(mContentResolver,
-                CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedStringValue);
+        LineageSettings.Secure.putString(mContentResolver,
+                LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER, expectedStringValue);
 
-        String actualValue = CMSettings.Secure.getString(mContentResolver,
-                CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
+        String actualValue = LineageSettings.Secure.getString(mContentResolver,
+                LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
         assertEquals(expectedStringValue, actualValue);
     }
 
     @SmallTest
     public void testGetUri() {
-        final Uri expectedUri = Uri.withAppendedPath(CMSettings.Secure.CONTENT_URI,
-                CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
+        final Uri expectedUri = Uri.withAppendedPath(LineageSettings.Secure.CONTENT_URI,
+                LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
 
-        final Uri actualUri = CMSettings.Secure.getUriFor(
-                CMSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
+        final Uri actualUri = LineageSettings.Secure.getUriFor(
+                LineageSettings.Secure.__MAGICAL_TEST_PASSING_ENABLER);
 
         assertEquals(expectedUri, actualUri);
     }
diff --git a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSystemTests.java b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSystemTests.java
index da968bd7..101a60f4 100644
--- a/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSystemTests.java
+++ b/packages/LineageSettingsProvider/tests/src/org/lineageos/lineagesettings/tests/LineageSettingsSystemTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.cmsettings.tests;
+package org.lineageos.lineagesettings.tests;
 
 import android.content.ContentResolver;
 import android.net.Uri;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
-import cyanogenmod.providers.CMSettings;
+import lineageos.providers.LineageSettings;
 
-public class CMSettingsSystemTests extends AndroidTestCase {
+public class LineageSettingsSystemTests extends AndroidTestCase {
     private ContentResolver mContentResolver;
 
     private static final String UNREALISTIC_SETTING = "_______UNREAL_______";
@@ -36,14 +36,14 @@ public class CMSettingsSystemTests extends AndroidTestCase {
     @SmallTest
     public void testFloat() {
         final float expectedFloatValue = 1.0f;
-        CMSettings.System.putFloat(mContentResolver,
-                CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedFloatValue);
+        LineageSettings.System.putFloat(mContentResolver,
+                LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedFloatValue);
 
         try {
-            float actualValue = CMSettings.System.getFloat(mContentResolver,
-                    CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
+            float actualValue = LineageSettings.System.getFloat(mContentResolver,
+                    LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedFloatValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -51,7 +51,7 @@ public class CMSettingsSystemTests extends AndroidTestCase {
     @SmallTest
     public void testFloatWithDefault() {
         final float expectedDefaultFloatValue = 1.5f;
-        float actualValue = CMSettings.System.getFloat(mContentResolver,
+        float actualValue = LineageSettings.System.getFloat(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultFloatValue);
         assertEquals(expectedDefaultFloatValue, actualValue);
     }
@@ -59,14 +59,14 @@ public class CMSettingsSystemTests extends AndroidTestCase {
     @SmallTest
     public void testInt() {
         final int expectedIntValue = 2;
-        CMSettings.System.putInt(mContentResolver,
-                CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedIntValue);
+        LineageSettings.System.putInt(mContentResolver,
+                LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedIntValue);
 
         try {
-            int actualValue = CMSettings.System.getInt(mContentResolver,
-                    CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
+            int actualValue = LineageSettings.System.getInt(mContentResolver,
+                    LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedIntValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -74,7 +74,7 @@ public class CMSettingsSystemTests extends AndroidTestCase {
     @SmallTest
     public void testIntWithDefault() {
         final int    expectedDefaultIntValue = 11;
-        int actualValue = CMSettings.System.getInt(mContentResolver,
+        int actualValue = LineageSettings.System.getInt(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultIntValue);
         assertEquals(expectedDefaultIntValue, actualValue);
     }
@@ -82,14 +82,14 @@ public class CMSettingsSystemTests extends AndroidTestCase {
     @SmallTest
     public void testLong() {
         final long expectedLongValue = 3l;
-        CMSettings.System.putLong(mContentResolver,
-                CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedLongValue);
+        LineageSettings.System.putLong(mContentResolver,
+                LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedLongValue);
 
         try {
-            long actualValue = CMSettings.System.getLong(mContentResolver,
-                    CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
+            long actualValue = LineageSettings.System.getLong(mContentResolver,
+                    LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
             assertEquals(expectedLongValue, actualValue);
-        } catch (CMSettings.CMSettingNotFoundException e) {
+        } catch (LineageSettings.LineageSettingNotFoundException e) {
             throw new AssertionError(e);
         }
     }
@@ -97,7 +97,7 @@ public class CMSettingsSystemTests extends AndroidTestCase {
     @SmallTest
     public void testLongWithDefault() {
         final long expectedDefaultLongValue = 17l;
-        long actualValue = CMSettings.System.getLong(mContentResolver,
+        long actualValue = LineageSettings.System.getLong(mContentResolver,
                 UNREALISTIC_SETTING, expectedDefaultLongValue);
         assertEquals(expectedDefaultLongValue, actualValue);
     }
@@ -105,21 +105,21 @@ public class CMSettingsSystemTests extends AndroidTestCase {
     @SmallTest
     public void testString() {
         final String expectedStringValue = "4";
-        CMSettings.System.putString(mContentResolver,
-                CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedStringValue);
+        LineageSettings.System.putString(mContentResolver,
+                LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER, expectedStringValue);
 
-        String actualValue = CMSettings.System.getString(mContentResolver,
-                CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
+        String actualValue = LineageSettings.System.getString(mContentResolver,
+                LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
         assertEquals(expectedStringValue, actualValue);
     }
 
     @SmallTest
     public void testGetUri() {
-        final Uri expectedUri = Uri.withAppendedPath(CMSettings.System.CONTENT_URI,
-                CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
+        final Uri expectedUri = Uri.withAppendedPath(LineageSettings.System.CONTENT_URI,
+                LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
 
-        final Uri actualUri = CMSettings.System.getUriFor(
-                CMSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
+        final Uri actualUri = LineageSettings.System.getUriFor(
+                LineageSettings.System.__MAGICAL_TEST_PASSING_ENABLER);
 
         assertEquals(expectedUri, actualUri);
     }