Gentle notifications screen

With lockscreen and status bar settings

Test: robo tests
Bug: 128445911
Change-Id: I46c5943d4d8dc1ee74b5b920239f259f5880a2d3

tests/robotests/src/com/android/settings/notification/GentleDrawablePreferenceControllerTest.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2019 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.widget.ImageView;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.LayoutPreference;
+
+import org.junit.Before;
+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;
+
+import androidx.preference.Preference;
+
+@RunWith(RobolectricTestRunner.class)
+public class GentleDrawablePreferenceControllerTest {
+
+    private Context mContext;
+
+    private GentleDrawablePreferenceController mController;
+    @Mock
+    private LayoutPreference mPreference;
+    @Mock
+    NotificationBackend mBackend;
+    @Mock
+    ImageView mView;
+
+    private static final String KEY = "gentle_notifications";
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new GentleDrawablePreferenceController(mContext, KEY);
+        mController.setBackend(mBackend);
+        when(mPreference.findViewById(R.id.drawable)).thenReturn(mView);
+    }
+
+    @Test
+    public void display_shouldDisplay() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_lock() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mView).setImageResource(R.drawable.gentle_notifications_shade_lock);
+    }
+
+    @Test
+    public void updateState_status() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false);
+
+        mController.updateState(mPreference);
+
+        verify(mView).setImageResource(R.drawable.gentle_notifications_shade_status);
+    }
+
+    @Test
+    public void updateState_both() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false);
+
+        mController.updateState(mPreference);
+
+        verify(mView).setImageResource(R.drawable.gentle_notifications_shade_status_lock);
+    }
+
+    @Test
+    public void updateState_neither() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mView).setImageResource(R.drawable.gentle_notifications_shade);
+    }
+}

tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2019 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.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+
+import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
+import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+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;
+
+import androidx.preference.Preference;
+
+@RunWith(RobolectricTestRunner.class)
+public class GentleNotificationsPreferenceControllerTest {
+
+    private Context mContext;
+
+    @Mock
+    NotificationBackend mBackend;
+
+    private GentleNotificationsPreferenceController mController;
+    private Preference mPreference;
+
+    private static final String KEY = "gentle_notifications";
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new GentleNotificationsPreferenceController(mContext, KEY);
+        mController.setBackend(mBackend);
+        mPreference = new Preference(mContext);
+    }
+
+    @Test
+    public void display_shouldDisplay() {
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void getSummary_lock() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getString(R.string.gentle_notifications_display_summary_shade_lock));
+    }
+
+    @Test
+    public void getSummary_status() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getString(R.string.gentle_notifications_display_summary_shade_status));
+    }
+
+    @Test
+    public void getSummary_both() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(false);
+
+        assertThat(mController.getSummary()).isEqualTo(mContext.getString(
+                R.string.gentle_notifications_display_summary_shade_status_lock));
+    }
+
+    @Test
+    public void getSummary_neither() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
+        when(mBackend.shouldHideSilentStatusBarIcons(mContext)).thenReturn(true);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getString(R.string.gentle_notifications_display_summary_shade));
+    }
+}

tests/robotests/src/com/android/settings/notification/SilentLockscreenPreferenceControllerTest.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2019 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.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import org.junit.Before;
+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;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+@RunWith(RobolectricTestRunner.class)
+public class SilentLockscreenPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private SilentLockscreenPreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new SilentLockscreenPreferenceController(mContext);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void isAvailable_featureEnabled() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 1);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_featureDisabled() {
+        Settings.Secure.putInt(
+                mContext.getContentResolver(), NOTIFICATION_NEW_INTERRUPTION_MODEL, 0);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_settingIsOff_false() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0);
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_settingIsOn_true() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_on() {
+        mController.onPreferenceChange(mPreference, true);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0)).isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChange_off() {
+        mController.onPreferenceChange(mPreference, false);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1)).isEqualTo(0);
+    }
+
+    @Test
+    public void listenerTriggered() {
+        SilentLockscreenPreferenceController.Listener listener = mock(
+                SilentLockscreenPreferenceController.Listener.class);
+        mController.setListener(listener);
+
+        mController.setChecked(false);
+        verify(listener).onChange(false);
+
+        mController.setChecked(true);
+        verify(listener).onChange(true);
+    }
+}
+

tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java

@@ -21,6 +21,7 @@ import static android.provider.Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MOD
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -79,26 +80,39 @@ public class SilentStatusBarPreferenceControllerTest {
 
     @Test
     public void isChecked_settingIsOff_false() {
-        when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(false);
+        when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(true);
         assertThat(mController.isChecked()).isFalse();
     }
 
     @Test
     public void isChecked_settingIsOn_true() {
-        when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(true);
+        when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(false);
         assertThat(mController.isChecked()).isTrue();
     }
 
     @Test
     public void onPreferenceChange_on() {
         mController.onPreferenceChange(mPreference, true);
-        verify(mBackend).setHideSilentStatusIcons(true);
+        verify(mBackend).setHideSilentStatusIcons(false);
     }
 
     @Test
     public void onPreferenceChange_off() {
         mController.onPreferenceChange(mPreference, false);
-        verify(mBackend).setHideSilentStatusIcons(false);
+        verify(mBackend).setHideSilentStatusIcons(true);
+    }
+
+    @Test
+    public void listenerTriggered() {
+        SilentStatusBarPreferenceController.Listener listener = mock(
+                SilentStatusBarPreferenceController.Listener.class);
+        mController.setListener(listener);
+
+        mController.setChecked(false);
+        verify(listener).onChange(false);
+
+        mController.setChecked(true);
+        verify(listener).onChange(true);
     }
 }