Merge "Show new visual effects options in dnd settings" into pi-dev
This commit is contained in:
Julia Reynolds
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
e056b2ebc9
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
package com.android.settings.notification;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
import android.content.Context;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
@@ -37,22 +37,17 @@ import org.robolectric.shadows.ShadowApplication;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class ZenModeScreenOnPreferenceControllerTest {
|
||||
public final class ZenModeBlockedEffectsPreferenceControllerTest {
|
||||
|
||||
private static final boolean MOCK_PRIORITY_SCREEN_ON_SETTING = false;
|
||||
|
||||
private ZenModeScreenOnPreferenceController mController;
|
||||
|
||||
@Mock
|
||||
private ZenModeBackend mBackend;
|
||||
private ZenModeBlockedEffectsPreferenceController mController;
|
||||
@Mock
|
||||
private NotificationManager mNotificationManager;
|
||||
@Mock
|
||||
private SwitchPreference mockPref;
|
||||
@Mock
|
||||
private NotificationManager.Policy mPolicy;
|
||||
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private ZenModeBackend mBackend;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
@@ -63,35 +58,18 @@ public class ZenModeScreenOnPreferenceControllerTest {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
|
||||
|
||||
mController = new ZenModeScreenOnPreferenceController(mContext, mock(Lifecycle.class));
|
||||
mController = new ZenModeBlockedEffectsPreferenceController(
|
||||
mContext, mock(Lifecycle.class));
|
||||
ReflectionHelpers.setField(mController, "mBackend", mBackend);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState() {
|
||||
final SwitchPreference mockPref = mock(SwitchPreference.class);
|
||||
when(mBackend.isEffectAllowed(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON))
|
||||
.thenReturn(MOCK_PRIORITY_SCREEN_ON_SETTING);
|
||||
mController.updateState(mockPref);
|
||||
|
||||
verify(mockPref).setChecked(MOCK_PRIORITY_SCREEN_ON_SETTING);
|
||||
public void testIsAvailable() {
|
||||
assertTrue(mController.isAvailable());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_EnableScreenOn() {
|
||||
boolean allow = true;
|
||||
mController.onPreferenceChange(mockPref, allow);
|
||||
|
||||
verify(mBackend)
|
||||
.saveVisualEffectsPolicy(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
|
||||
public void testHasSummary() {
|
||||
assertNotNull(mController.getSummary());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_DisableScreenOn() {
|
||||
boolean allow = false;
|
||||
mController.onPreferenceChange(mockPref, allow);
|
||||
|
||||
verify(mBackend)
|
||||
.saveVisualEffectsPolicy(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,96 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.notification;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
import android.content.Context;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class ZenModeScreenOffPreferenceControllerTest {
|
||||
|
||||
private static final boolean MOCK_PRIORITY_SCREEN_OFF_SETTING = false;
|
||||
|
||||
private ZenModeScreenOffPreferenceController mController;
|
||||
|
||||
@Mock
|
||||
private ZenModeBackend mBackend;
|
||||
@Mock
|
||||
private NotificationManager mNotificationManager;
|
||||
@Mock
|
||||
private SwitchPreference mockPref;
|
||||
@Mock
|
||||
private NotificationManager.Policy mPolicy;
|
||||
|
||||
private Context mContext;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
ShadowApplication shadowApplication = ShadowApplication.getInstance();
|
||||
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
|
||||
|
||||
mContext = shadowApplication.getApplicationContext();
|
||||
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
|
||||
|
||||
mController = new ZenModeScreenOffPreferenceController(mContext, mock(Lifecycle.class));
|
||||
ReflectionHelpers.setField(mController, "mBackend", mBackend);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState() {
|
||||
final SwitchPreference mockPref = mock(SwitchPreference.class);
|
||||
when(mBackend.isEffectAllowed(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF))
|
||||
.thenReturn(MOCK_PRIORITY_SCREEN_OFF_SETTING);
|
||||
mController.updateState(mockPref);
|
||||
|
||||
verify(mockPref).setChecked(MOCK_PRIORITY_SCREEN_OFF_SETTING);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_EnableScreenOff() {
|
||||
boolean allow = true;
|
||||
mController.onPreferenceChange(mockPref, allow);
|
||||
|
||||
verify(mBackend).saveVisualEffectsPolicy(
|
||||
NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF, allow);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_DisableScreenOff() {
|
||||
boolean allow = false;
|
||||
mController.onPreferenceChange(mockPref, allow);
|
||||
|
||||
verify(mBackend).saveVisualEffectsPolicy(
|
||||
NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF, allow);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,152 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.notification;
|
||||
|
||||
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
|
||||
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST;
|
||||
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.CheckBoxPreference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class ZenModeVisEffectPreferenceControllerTest {
|
||||
private ZenModeVisEffectPreferenceController mController;
|
||||
|
||||
@Mock
|
||||
private ZenModeBackend mBackend;
|
||||
@Mock
|
||||
private CheckBoxPreference mockPref;
|
||||
private Context mContext;
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock NotificationManager mNotificationManager;
|
||||
|
||||
private static final String PREF_KEY = "main_pref";
|
||||
private static final int PREF_METRICS = 1;
|
||||
private static final int PARENT_EFFECT1 = SUPPRESSED_EFFECT_BADGE;
|
||||
private static final int PARENT_EFFECT2 = SUPPRESSED_EFFECT_NOTIFICATION_LIST;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
ShadowApplication shadowApplication = ShadowApplication.getInstance();
|
||||
mContext = shadowApplication.getApplicationContext();
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
|
||||
when(mNotificationManager.getNotificationPolicy()).thenReturn(
|
||||
mock(NotificationManager.Policy.class));
|
||||
mController = new ZenModeVisEffectPreferenceController(mContext, mock(Lifecycle.class),
|
||||
PREF_KEY, SUPPRESSED_EFFECT_PEEK, PREF_METRICS, null);
|
||||
ReflectionHelpers.setField(mController, "mBackend", mBackend);
|
||||
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_notChecked() {
|
||||
when(mBackend.isVisualEffectSuppressed(SUPPRESSED_EFFECT_PEEK)).thenReturn(false);
|
||||
mController.updateState(mockPref);
|
||||
|
||||
verify(mockPref).setChecked(false);
|
||||
verify(mockPref).setEnabled(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_checked() {
|
||||
when(mBackend.isVisualEffectSuppressed(SUPPRESSED_EFFECT_PEEK)).thenReturn(true);
|
||||
mController.updateState(mockPref);
|
||||
|
||||
verify(mockPref).setChecked(true);
|
||||
verify(mockPref).setEnabled(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_checkedFalse_parentChecked() {
|
||||
mController = new ZenModeVisEffectPreferenceController(mContext, mock(Lifecycle.class),
|
||||
PREF_KEY, SUPPRESSED_EFFECT_PEEK, PREF_METRICS,
|
||||
new int[] {PARENT_EFFECT1, PARENT_EFFECT2});
|
||||
ReflectionHelpers.setField(mController, "mBackend", mBackend);
|
||||
when(mBackend.isVisualEffectSuppressed(SUPPRESSED_EFFECT_PEEK)).thenReturn(false);
|
||||
when(mBackend.isVisualEffectSuppressed(PARENT_EFFECT1)).thenReturn(false);
|
||||
when(mBackend.isVisualEffectSuppressed(PARENT_EFFECT2)).thenReturn(true);
|
||||
mController.updateState(mockPref);
|
||||
|
||||
verify(mockPref).setChecked(true);
|
||||
verify(mockPref).setEnabled(false);
|
||||
verify(mBackend, times(1)).saveVisualEffectsPolicy(SUPPRESSED_EFFECT_PEEK, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_checkedFalse_parentNotChecked() {
|
||||
mController = new ZenModeVisEffectPreferenceController(mContext, mock(Lifecycle.class),
|
||||
PREF_KEY, SUPPRESSED_EFFECT_PEEK, PREF_METRICS,
|
||||
new int[] {PARENT_EFFECT1, PARENT_EFFECT2});
|
||||
ReflectionHelpers.setField(mController, "mBackend", mBackend);
|
||||
when(mBackend.isVisualEffectSuppressed(SUPPRESSED_EFFECT_PEEK)).thenReturn(false);
|
||||
when(mBackend.isVisualEffectSuppressed(PARENT_EFFECT1)).thenReturn(false);
|
||||
when(mBackend.isVisualEffectSuppressed(PARENT_EFFECT2)).thenReturn(false);
|
||||
mController.updateState(mockPref);
|
||||
|
||||
verify(mockPref).setChecked(false);
|
||||
verify(mockPref).setEnabled(true);
|
||||
verify(mBackend, never()).saveVisualEffectsPolicy(SUPPRESSED_EFFECT_PEEK, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_checkedFalse() {
|
||||
mController.onPreferenceChange(mockPref, false);
|
||||
|
||||
verify(mBackend).saveVisualEffectsPolicy(SUPPRESSED_EFFECT_PEEK, false);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
|
||||
eq(PREF_METRICS),
|
||||
eq(false));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_checkedTrue() {
|
||||
mController.onPreferenceChange(mockPref, true);
|
||||
verify(mBackend).saveVisualEffectsPolicy(SUPPRESSED_EFFECT_PEEK, true);
|
||||
verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
|
||||
eq(PREF_METRICS),
|
||||
eq(true));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user