ADHOC
/
replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsdk: Fix cm settings provider tests. 

Change-Id: Iedb9c3278f5fa872ffd28682fb3ef48ceb163dba
This commit is contained in:
Adnan Begovic 2015-11-05 16:42:26 -08:00
parent 8c65e15e74
commit 6a79d5714c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java
View File

@ -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

7
packages/CMSettingsProvider/tests/src/org/cyanogenmod/cmsettings/tests/CMSettingsProviderTest.java
View File

@ -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();