From 6a79d5714ce26bf0235c5fb4b25d4f55f9a9460e Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Thu, 5 Nov 2015 16:42:26 -0800
Subject: [PATCH] cmsdk: Fix cm settings provider tests.

Change-Id: Iedb9c3278f5fa872ffd28682fb3ef48ceb163dba
---
 .../src/org/cyanogenmod/cmsettings/CMSettingsProvider.java | 3 ++-
 .../cmsettings/tests/CMSettingsProviderTest.java           | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
index 5684fdf..a55ae2c 100644
--- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
+++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
@@ -45,6 +45,7 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
+
 import cyanogenmod.providers.CMSettings;
 
 import java.util.HashMap;
@@ -158,7 +159,7 @@ public class CMSettingsProvider extends ContentProvider {
     }
 
     /* @hide */
-    static class LegacyCMSettings {
+    public static class LegacyCMSettings {
         /**
          * Whether to allow one finger quick settings expansion on the right side of the statusbar.
          * @deprecated Use {@link android.provider.Settings.System#QS_QUICK_PULLDOWN} instead
diff --git a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java
index 01070d0..bf370d3 100644
--- a/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java
+++ b/packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java
@@ -32,6 +32,7 @@ import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.text.TextUtils;
 import cyanogenmod.providers.CMSettings;
+import org.cyanogenmod.cmsettings.CMSettingsProvider;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -81,11 +82,13 @@ import java.util.Map;
      private void testMigrateSettingsForUser(int userId) {
          // Setup values in Settings
          final String expectedPullDownValue = "testQuickPullDownValue";
-         Settings.System.putStringForUser(mContentResolver, Settings.System.QS_QUICK_PULLDOWN,
+         Settings.System.putStringForUser(mContentResolver,
+                 CMSettingsProvider.LegacyCMSettings.STATUS_BAR_QUICK_QS_PULLDOWN,
                  expectedPullDownValue, userId);
 
          final int expectedKeyboardBrightness = 4;
-         Settings.Secure.putIntForUser(mContentResolver, Settings.Secure.KEYBOARD_BRIGHTNESS,
+         Settings.Secure.putIntForUser(mContentResolver,
+                 CMSettingsProvider.LegacyCMSettings.KEYBOARD_BRIGHTNESS,
                  expectedKeyboardBrightness, userId);
 
          Bundle arg = new Bundle();