PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use Settings.Secure values, not Global values"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-31 17:13:27 +00:00
committed by Android (Google) Code Review
parent 919334c04f b00cef308e
commit 467a6559c1
9 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
View File

@@ -17,13 +17,14 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -80,7 +81,7 @@ public class ChargingSoundPreferenceControllerTest {
@Test
public void displayPreference_chargingSoundEnabled_shouldCheckedPreference() {
Global.putInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 1);
Secure.putInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1);
mController.displayPreference(mScreen);
@@ -89,7 +90,7 @@ public class ChargingSoundPreferenceControllerTest {
@Test
public void displayPreference_chargingSoundDisabled_shouldUncheckedPreference() {
Global.putInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 0);
Secure.putInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 0);
mController.displayPreference(mScreen);
@@ -102,7 +103,7 @@ public class ChargingSoundPreferenceControllerTest {
mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true);
assertThat(Global.getInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 1))
assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1))
.isEqualTo(1);
}
@@ -112,7 +113,7 @@ public class ChargingSoundPreferenceControllerTest {
mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false);
assertThat(Global.getInt(mContentResolver, Global.CHARGING_SOUNDS_ENABLED, 1))
assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1))
.isEqualTo(0);
}
}

10
tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java
View File

@@ -78,8 +78,8 @@ public class ZenModeDurationPreferenceControllerTest {
@Test
public void updateState_DurationForever() {
Settings.Global.putInt(mContentResolver, Settings.Global.ZEN_DURATION,
Settings.Global.ZEN_DURATION_FOREVER);
Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
Settings.Secure.ZEN_DURATION_FOREVER);
final Preference mockPref = mock(Preference.class);
mController.updateState(mockPref);
@@ -88,8 +88,8 @@ public class ZenModeDurationPreferenceControllerTest {
@Test
public void updateState_DurationPrompt() {
Settings.Global.putInt(mContentResolver, Settings.Global.ZEN_DURATION,
Settings.Global.ZEN_DURATION_PROMPT);
Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
Settings.Secure.ZEN_DURATION_PROMPT);
final Preference mockPref = mock(Preference.class);
mController.updateState(mockPref);
@@ -100,7 +100,7 @@ public class ZenModeDurationPreferenceControllerTest {
@Test
public void updateState_DurationCustom() {
int zenDuration = 45;
Settings.Global.putInt(mContentResolver, Settings.Global.ZEN_DURATION,
Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
zenDuration);
final Preference mockPref = mock(Preference.class);
mController.updateState(mockPref);

12
tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
View File

@@ -177,16 +177,16 @@ public class ZenOnboardingActivityTest {
setShowSettingsSuggestion(true);
setWithinTimeThreshold(true);
assertThat(isSuggestionComplete(mContext)).isTrue();
assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_SETTINGS_UPDATED, -1)).isEqualTo(1);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ZEN_SETTINGS_UPDATED, -1)).isEqualTo(1);
}
private void setZenUpdated(boolean updated) {
int zenUpdated = updated ? 1 : 0;
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ZEN_SETTINGS_UPDATED, zenUpdated);
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ZEN_SETTINGS_UPDATED, zenUpdated);
}
private void setWithinTimeThreshold(boolean withinTime) {
@@ -208,8 +208,8 @@ public class ZenOnboardingActivityTest {
showZenSuggestion = 1;
}
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.SHOW_ZEN_SETTINGS_SUGGESTION, showZenSuggestion);
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, showZenSuggestion);
}
private SharedPreferences getSharedPreferences() {