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

Revert "Secure => global bubble settings pt 2"

Browse Source 
This reverts commit a978ab4526.

Reason for revert: fix test

Change-Id: Id6b49106ab7d8a42ea5de8b16a0dd3ed49d58817
This commit is contained in:
Lyn Han
2019-07-15 18:06:32 +00:00
parent a978ab4526
commit ca77022900
8 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.development;
import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
import static com.android.settings.development.BubbleGlobalPreferenceController.OFF;
import static com.android.settings.development.BubbleGlobalPreferenceController.ON;
@@ -77,7 +77,7 @@ public class BubbleGlobalPreferenceControllerTest {
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Secure.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 1 /* enabled */);
mController.updateState(mPreference);
@@ -86,7 +86,7 @@ public class BubbleGlobalPreferenceControllerTest {
@Test
public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Secure.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 0 /* enabled */);
mController.updateState(mPreference);
@@ -104,7 +104,7 @@ public class BubbleGlobalPreferenceControllerTest {
}
private boolean isSettingEnabled() {
return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
return Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
OFF /* default off */) == ON;
}