Add display and notif vis effects to new modes ui
Test: atest com.android.settings.notification.modes Flag: android.app.modes_ui Fixes: 337087926 Fixes: 308820151 Change-Id: Id9cd9cc4b2d521713a2ba1d4581eb818ad0e5eee
This commit is contained in:
Julia Reynolds
@@ -0,0 +1,252 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.modes;
|
||||
|
||||
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
|
||||
import static android.service.notification.ZenPolicy.STATE_ALLOW;
|
||||
import static android.service.notification.ZenPolicy.STATE_UNSET;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.AutomaticZenRule;
|
||||
import android.app.Flags;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.platform.test.annotations.EnableFlags;
|
||||
import android.platform.test.flag.junit.SetFlagsRule;
|
||||
import android.service.notification.ZenDeviceEffects;
|
||||
import android.service.notification.ZenPolicy;
|
||||
import androidx.preference.TwoStatePreference;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||
public final class ZenModeDisplayEffectPreferenceControllerTest {
|
||||
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private ZenModesBackend mBackend;
|
||||
|
||||
@Rule
|
||||
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateState_grayscale() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDisplayGrayscale(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(
|
||||
mContext, "effect_greyscale", mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnPreferenceChange_grayscale() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowAlarms(false).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDisplayGrayscale(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(mContext, "effect_greyscale", mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
controller.onPreferenceChange(preference, false);
|
||||
|
||||
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
|
||||
verify(mBackend).updateMode(captor.capture());
|
||||
assertThat(captor.getValue().getRule().getDeviceEffects().shouldDisplayGrayscale())
|
||||
.isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateState_aod() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowMedia(true).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldSuppressAmbientDisplay(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(mContext, "effect_aod", mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnPreferenceChange_aod() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowMedia(false).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldSuppressAmbientDisplay(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(mContext, "effect_aod", mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
controller.onPreferenceChange(preference, false);
|
||||
|
||||
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
|
||||
verify(mBackend).updateMode(captor.capture());
|
||||
assertThat(captor.getValue().getRule().getDeviceEffects().shouldSuppressAmbientDisplay())
|
||||
.isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateState_wallpaper() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowSystem(true).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDimWallpaper(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(
|
||||
mContext, "effect_wallpaper", mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnPreferenceChange_wallpaper() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowSystem(false).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDimWallpaper(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(
|
||||
mContext, "effect_wallpaper", mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
controller.onPreferenceChange(preference, false);
|
||||
|
||||
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
|
||||
verify(mBackend).updateMode(captor.capture());
|
||||
assertThat(captor.getValue().getRule().getDeviceEffects().shouldDimWallpaper()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateState_darkTheme() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowReminders(true).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldUseNightMode(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(mContext, "effect_dark_theme",
|
||||
mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnPreferenceChange_darkTheme() {
|
||||
TwoStatePreference preference = mock(TwoStatePreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowReminders(false).build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldUseNightMode(true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
ZenModeDisplayEffectPreferenceController controller =
|
||||
new ZenModeDisplayEffectPreferenceController(mContext, "effect_dark_theme",
|
||||
mBackend);
|
||||
|
||||
controller.updateZenMode(preference, zenMode);
|
||||
|
||||
controller.onPreferenceChange(preference, false);
|
||||
|
||||
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
|
||||
verify(mBackend).updateMode(captor.capture());
|
||||
assertThat(captor.getValue().getRule().getDeviceEffects().shouldUseNightMode()).isFalse();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.modes;
|
||||
|
||||
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.AutomaticZenRule;
|
||||
import android.app.Flags;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.platform.test.annotations.EnableFlags;
|
||||
import android.platform.test.flag.junit.SetFlagsRule;
|
||||
import android.service.notification.ZenPolicy;
|
||||
import androidx.preference.Preference;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public final class ZenModeDisplayLinkPreferenceControllerTest {
|
||||
|
||||
private ZenModeDisplayLinkPreferenceController mController;
|
||||
|
||||
@Rule
|
||||
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private ZenModesBackend mBackend;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mContext = RuntimeEnvironment.application;
|
||||
|
||||
mController = new ZenModeDisplayLinkPreferenceController(
|
||||
mContext, "something", mBackend);
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||
public void testHasSummary() {
|
||||
Preference pref = mock(Preference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
|
||||
.build(), true);
|
||||
mController.updateZenMode(pref, zenMode);
|
||||
verify(pref).setSummary(any());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.modes;
|
||||
|
||||
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.AutomaticZenRule;
|
||||
import android.app.Flags;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.platform.test.annotations.EnableFlags;
|
||||
import android.platform.test.flag.junit.SetFlagsRule;
|
||||
import android.service.notification.ZenPolicy;
|
||||
import androidx.preference.Preference;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public final class ZenModeNotifVisLinkPreferenceControllerTest {
|
||||
|
||||
private ZenModeNotifVisLinkPreferenceController mController;
|
||||
|
||||
@Rule
|
||||
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private ZenModesBackend mBackend;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mContext = RuntimeEnvironment.application;
|
||||
|
||||
mController = new ZenModeNotifVisLinkPreferenceController(
|
||||
mContext, "something", mBackend);
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||
public void testHasSummary() {
|
||||
Preference pref = mock(Preference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
|
||||
.build(), true);
|
||||
mController.updateZenMode(pref, zenMode);
|
||||
verify(pref).setSummary(any());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,241 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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.modes;
|
||||
|
||||
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
|
||||
import static android.service.notification.ZenPolicy.STATE_ALLOW;
|
||||
import static android.service.notification.ZenPolicy.STATE_DISALLOW;
|
||||
import static android.service.notification.ZenPolicy.STATE_UNSET;
|
||||
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_LIGHTS;
|
||||
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_NOTIFICATION_LIST;
|
||||
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_PEEK;
|
||||
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_STATUS_BAR;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
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.AutomaticZenRule;
|
||||
import android.app.Flags;
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.net.Uri;
|
||||
import android.platform.test.annotations.EnableFlags;
|
||||
import android.platform.test.flag.junit.SetFlagsRule;
|
||||
import android.service.notification.ZenDeviceEffects;
|
||||
import android.service.notification.ZenPolicy;
|
||||
import androidx.preference.TwoStatePreference;
|
||||
import com.android.settings.notification.zen.ZenModeVisEffectPreferenceController;
|
||||
import com.android.settings.widget.DisabledCheckBoxPreference;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@EnableFlags(Flags.FLAG_MODES_UI)
|
||||
public final class ZenModeNotifVisPreferenceControllerTest {
|
||||
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private ZenModesBackend mBackend;
|
||||
|
||||
@Rule
|
||||
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
|
||||
private ZenModeNotifVisPreferenceController mController;
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mController = new ZenModeNotifVisPreferenceController(mContext,
|
||||
"zen_effect_peek", VISUAL_EFFECT_PEEK, null, mBackend);
|
||||
}
|
||||
@Test
|
||||
public void isAvailable() {
|
||||
// SUPPRESSED_EFFECT_PEEK is always available:
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
|
||||
// SUPPRESSED_EFFECT_LIGHTS is only available if the device has an LED:
|
||||
Context mockContext = mock(Context.class);
|
||||
mController = new ZenModeNotifVisPreferenceController(mockContext,
|
||||
"zen_effect_light", VISUAL_EFFECT_LIGHTS, null, mBackend);
|
||||
Resources mockResources = mock(Resources.class);
|
||||
when(mockContext.getResources()).thenReturn(mockResources);
|
||||
|
||||
when(mockResources.getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed))
|
||||
.thenReturn(false); // no light
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
|
||||
when(mockResources.getBoolean(com.android.internal.R.bool.config_intrusiveNotificationLed))
|
||||
.thenReturn(true); // has light
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_notChecked() {
|
||||
DisabledCheckBoxPreference preference = mock(DisabledCheckBoxPreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.showAllVisualEffects()
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
mController.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(false);
|
||||
verify(preference).enableCheckbox(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_checked() {
|
||||
DisabledCheckBoxPreference preference = mock(DisabledCheckBoxPreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.showVisualEffect(VISUAL_EFFECT_PEEK, false)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
mController.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(true);
|
||||
verify(preference).enableCheckbox(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_checkedFalse_parentChecked() {
|
||||
DisabledCheckBoxPreference preference = mock(DisabledCheckBoxPreference.class);
|
||||
mController = new ZenModeNotifVisPreferenceController(mContext,
|
||||
"zen_effect_status", VISUAL_EFFECT_STATUS_BAR,
|
||||
new int[]{VISUAL_EFFECT_NOTIFICATION_LIST}, mBackend);
|
||||
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.showVisualEffect(VISUAL_EFFECT_NOTIFICATION_LIST, false)
|
||||
.showVisualEffect(VISUAL_EFFECT_STATUS_BAR, true)
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
mController.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(true);
|
||||
verify(preference).enableCheckbox(false);
|
||||
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
|
||||
verify(mBackend).updateMode(captor.capture());
|
||||
assertThat(captor.getValue().getPolicy().getVisualEffectStatusBar())
|
||||
.isEqualTo(STATE_DISALLOW);
|
||||
assertThat(captor.getValue().getPolicy().getVisualEffectNotificationList())
|
||||
.isEqualTo(STATE_UNSET);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_checkedFalse_parentNotChecked() {
|
||||
DisabledCheckBoxPreference preference = mock(DisabledCheckBoxPreference.class);
|
||||
mController = new ZenModeNotifVisPreferenceController(mContext,
|
||||
"zen_effect_status", VISUAL_EFFECT_STATUS_BAR,
|
||||
new int[]{VISUAL_EFFECT_NOTIFICATION_LIST}, mBackend);
|
||||
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.showAllVisualEffects()
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
mController.updateZenMode(preference, zenMode);
|
||||
|
||||
verify(preference).setChecked(false);
|
||||
verify(preference).enableCheckbox(true);
|
||||
verify(mBackend, never()).updateMode(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_checkedFalse() {
|
||||
DisabledCheckBoxPreference preference = mock(DisabledCheckBoxPreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.hideAllVisualEffects()
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
mController.updateZenMode(preference, zenMode);
|
||||
|
||||
mController.onPreferenceChange(preference, false);
|
||||
|
||||
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
|
||||
verify(mBackend).updateMode(captor.capture());
|
||||
assertThat(captor.getValue().getPolicy().getVisualEffectPeek())
|
||||
.isEqualTo(STATE_ALLOW);
|
||||
assertThat(captor.getValue().getPolicy().getVisualEffectNotificationList())
|
||||
.isEqualTo(STATE_UNSET);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChanged_checkedTrue() {
|
||||
DisabledCheckBoxPreference preference = mock(DisabledCheckBoxPreference.class);
|
||||
ZenMode zenMode = new ZenMode("id",
|
||||
new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
|
||||
.setType(AutomaticZenRule.TYPE_DRIVING)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.showAllVisualEffects()
|
||||
.build())
|
||||
.build(), true);
|
||||
|
||||
mController.updateZenMode(preference, zenMode);
|
||||
|
||||
mController.onPreferenceChange(preference, true);
|
||||
|
||||
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
|
||||
verify(mBackend).updateMode(captor.capture());
|
||||
assertThat(captor.getValue().getPolicy().getVisualEffectPeek())
|
||||
.isEqualTo(STATE_DISALLOW);
|
||||
assertThat(captor.getValue().getPolicy().getVisualEffectNotificationList())
|
||||
.isEqualTo(STATE_UNSET);
|
||||
}
|
||||
}
|
||||
@@ -20,11 +20,14 @@ import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
|
||||
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE;
|
||||
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
|
||||
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_CONTACTS;
|
||||
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_AMBIENT;
|
||||
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_LIGHTS;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.app.AutomaticZenRule;
|
||||
import android.content.Context;
|
||||
import android.net.Uri;
|
||||
import android.service.notification.ZenDeviceEffects;
|
||||
import android.service.notification.ZenPolicy;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -165,4 +168,161 @@ public class ZenModesSummaryHelperTest {
|
||||
assertThat(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode)).isEqualTo(
|
||||
"Alarms, media, and 3 more can interrupt");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getBlockedEffectsSummary_none() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.showAllVisualEffects()
|
||||
.allowAlarms(true)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
assertThat(mSummaryHelper.getBlockedEffectsSummary(zenMode))
|
||||
.isEqualTo("Notifications shown");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getBlockedEffectsSummary_some() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.showAllVisualEffects()
|
||||
.showVisualEffect(VISUAL_EFFECT_AMBIENT, false)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
assertThat(mSummaryHelper.getBlockedEffectsSummary(zenMode))
|
||||
.isEqualTo("Notifications partially hidden");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getBlockedEffectsSummary_all() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.allowAlarms(true)
|
||||
.hideAllVisualEffects()
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
assertThat(mSummaryHelper.getBlockedEffectsSummary(zenMode))
|
||||
.isEqualTo("Notifications hidden");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDisplayEffectsSummary_single_notifVis() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.showAllVisualEffects()
|
||||
.showVisualEffect(VISUAL_EFFECT_AMBIENT, false)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
|
||||
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
|
||||
"Notifications partially hidden");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDisplayEffectsSummary_single_notifVis_unusedEffect() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.showAllVisualEffects()
|
||||
.showVisualEffect(VISUAL_EFFECT_LIGHTS, false)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
|
||||
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
|
||||
"Notifications shown");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDisplayEffectsSummary_single_displayEffect() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().showAllVisualEffects().build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDimWallpaper(true)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
|
||||
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
|
||||
"Dim the wallpaper");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDisplayEffectsSummary_duo() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder().showAllVisualEffects().build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDimWallpaper(true)
|
||||
.setShouldDisplayGrayscale(true)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
|
||||
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
|
||||
"Grayscale and dim the wallpaper");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDisplayEffectsSummary_trio() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.hideAllVisualEffects()
|
||||
.allowAlarms(true)
|
||||
.allowMedia(true)
|
||||
.allowSystem(true)
|
||||
.build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDisplayGrayscale(true)
|
||||
.setShouldDimWallpaper(true)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
|
||||
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
|
||||
"Notifications hidden, grayscale, and dim the wallpaper");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDisplayEffectsSummary_quad() {
|
||||
AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
|
||||
.setType(AutomaticZenRule.TYPE_BEDTIME)
|
||||
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
|
||||
.setZenPolicy(new ZenPolicy.Builder()
|
||||
.showAllVisualEffects()
|
||||
.showVisualEffect(VISUAL_EFFECT_AMBIENT, false)
|
||||
.allowAlarms(true)
|
||||
.allowMedia(true)
|
||||
.allowSystem(true)
|
||||
.build())
|
||||
.setDeviceEffects(new ZenDeviceEffects.Builder()
|
||||
.setShouldDimWallpaper(true)
|
||||
.setShouldDisplayGrayscale(true)
|
||||
.setShouldUseNightMode(true)
|
||||
.build())
|
||||
.build();
|
||||
ZenMode zenMode = new ZenMode("id", rule, true);
|
||||
|
||||
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
|
||||
"Notifications partially hidden, grayscale, and 2 more");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user