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

Merge "If zen settings are updated, don't show onboarding" into pi-dev

Browse Source 
am: aaac61eb5e

Change-Id: I96929a31ab8f644f83db74ce12b201bd0852c782
This commit is contained in:
Beverly
2018-06-06 18:34:25 -07:00
committed by android-build-merger
parent ac7ce09efe aaac61eb5e
commit 1717b8550e
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/ZenOnboardingActivity.java
View File

@@ -156,6 +156,12 @@ public class ZenOnboardingActivity extends Activity {
// ZEN_SETTINGS_UPDATED is true for:
// - fresh P+ device
// - if zen visual effects values were changed by the user in Settings
NotificationManager nm = context.getSystemService(NotificationManager.class);
if (NotificationManager.Policy.areAllVisualEffectsSuppressed(
nm.getNotificationPolicy().suppressedVisualEffects)) {
Settings.Global.putInt(context.getContentResolver(),
Settings.Global.ZEN_SETTINGS_UPDATED, 1);
}
return Settings.Global.getInt(context.getContentResolver(),
Settings.Global.ZEN_SETTINGS_UPDATED, 0) != 0;
}

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

@@ -51,6 +51,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenOnboardingActivityTest {
@@ -68,6 +69,8 @@ public class ZenOnboardingActivityTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
mActivity = Robolectric.buildActivity(ZenOnboardingActivity.class)
.create()
@@ -124,6 +127,9 @@ public class ZenOnboardingActivityTest {
@Test
public void isSuggestionComplete_zenUpdated() {
Policy policy = new Policy(0, 0, 0, 0);
when(mNm.getNotificationPolicy()).thenReturn(policy);
setZenUpdated(true);
setShowSettingsSuggestion(false);
setWithinTimeThreshold(true);
@@ -132,6 +138,9 @@ public class ZenOnboardingActivityTest {
@Test
public void isSuggestionComplete_withinTimeThreshold() {
Policy policy = new Policy(0, 0, 0, 0);
when(mNm.getNotificationPolicy()).thenReturn(policy);
setZenUpdated(false);
setShowSettingsSuggestion(false);
setWithinTimeThreshold(true);
@@ -140,6 +149,9 @@ public class ZenOnboardingActivityTest {
@Test
public void isSuggestionComplete_showSettingsSuggestionTrue() {
Policy policy = new Policy(0, 0, 0, 0);
when(mNm.getNotificationPolicy()).thenReturn(policy);
setZenUpdated(false);
setShowSettingsSuggestion(true);
setWithinTimeThreshold(false);
@@ -148,17 +160,33 @@ public class ZenOnboardingActivityTest {
@Test
public void isSuggestionComplete_showSettingsSuggestionFalse_notWithinTimeThreshold() {
Policy policy = new Policy(0, 0, 0, 0);
when(mNm.getNotificationPolicy()).thenReturn(policy);
setZenUpdated(false);
setShowSettingsSuggestion(false);
setWithinTimeThreshold(false);
assertThat(isSuggestionComplete(mContext)).isTrue();
}
@Test
public void isSuggestionComplete_visualEffectsUpdated() {
// all values suppressed
Policy policy = new Policy(0, 0, 0, 511);
when(mNm.getNotificationPolicy()).thenReturn(policy);
setZenUpdated(false);
setShowSettingsSuggestion(true);
setWithinTimeThreshold(true);
assertThat(isSuggestionComplete(mContext)).isTrue();
assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_SETTINGS_UPDATED, -1)).isEqualTo(1);
}
private void setZenUpdated(boolean updated) {
int zenUpdated = 0;
if (updated) {
zenUpdated = 1;
}
int zenUpdated = updated ? 1 : 0;
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ZEN_SETTINGS_UPDATED, zenUpdated);