Merge "Add setting to hide silent notifs in status bar" (ecb62abb) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -8080,6 +8080,9 @@
		<!-- Gentle notifications settings: display on all surfaces [CHAR LIMIT=100] -->
		<string name="gentle_notifications_display_summary_shade_status_lock">Display in pull-down shade, status bar & on lock screen</string>

		<!-- Notification settings: suppress status bar/ambient icons for silent notifications -->
		<string name="silent_notifications_status_bar">Hide silent notifications in status bar</string>

		<!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
		<string name="notification_pulse_title">Blink light</string>

res/xml/configure_notification_settings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,11 @@
		android:order="15"
		settings:initialExpandedChildrenCount="0">

		<SwitchPreference
		android:key="silent_icons"
		android:title="@string/silent_notifications_status_bar"
		settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>

		<SwitchPreference
		android:key="show_snooze_options"
		android:title="@string/snooze_options_title"

src/com/android/settings/notification/GentleNotificationsPreferenceController.java→src/com/android/settings/notification/SilentStatusBarPreferenceController.java

+55 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		* Copyright (C) 2020 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.
		@@ -17,22 +17,18 @@
		package com.android.settings.notification;

		import android.content.Context;
		import android.provider.Settings;

		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.core.TogglePreferenceController;

		import androidx.annotation.VisibleForTesting;
		import com.google.common.annotations.VisibleForTesting;

		public class GentleNotificationsPreferenceController extends BasePreferenceController {

		@VisibleForTesting
		static final int ON = 1;
		public class SilentStatusBarPreferenceController extends TogglePreferenceController {

		private static final String KEY = "silent_icons";
		private NotificationBackend mBackend;

		public GentleNotificationsPreferenceController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		public SilentStatusBarPreferenceController(Context context) {
		super(context, KEY);
		mBackend = new NotificationBackend();
		}

		@@ -42,35 +38,18 @@ public class GentleNotificationsPreferenceController extends BasePreferenceContr
		}

		@Override
		public CharSequence getSummary() {
		boolean showOnLockscreen = showOnLockscreen();
		boolean showOnStatusBar = showOnStatusBar();

		if (showOnLockscreen) {
		if (showOnStatusBar) {
		return mContext.getString(
		R.string.gentle_notifications_display_summary_shade_status_lock);
		} else {
		return mContext.getString(R.string.gentle_notifications_display_summary_shade_lock);
		}
		} else if (showOnStatusBar) {
		return mContext.getString(R.string.gentle_notifications_display_summary_shade_status);
		} else {
		return mContext.getString(R.string.gentle_notifications_display_summary_shade);
		public boolean isChecked() {
		return mBackend.shouldHideSilentStatusBarIcons(mContext);
		}

		@Override
		public boolean setChecked(boolean isChecked) {
		mBackend.setHideSilentStatusIcons(isChecked);
		return true;
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		}

		private boolean showOnLockscreen() {
		return Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, ON) == ON;
		}

		private boolean showOnStatusBar() {
		return !mBackend.shouldHideSilentStatusBarIcons(mContext);
		}
		}

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

+85 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		* Copyright (C) 2020 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,17 +16,17 @@

		package com.android.settings.notification;

		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.ArgumentMatchers.any;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.provider.Settings;

		import com.android.settings.R;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import org.junit.Before;
		import org.junit.Test;
		@@ -36,72 +36,50 @@ 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;
		public class SilentStatusBarPreferenceControllerTest {

		@Mock
		NotificationBackend mBackend;
		private NotificationBackend mBackend;
		@Mock
		private PreferenceScreen mScreen;

		private GentleNotificationsPreferenceController mController;
		private Context mContext;
		private SilentStatusBarPreferenceController 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 = new SilentStatusBarPreferenceController(mContext);
		mController.setBackend(mBackend);
		mPreference = new Preference(mContext);
		mPreference.setKey(mController.getPreferenceKey());
		when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
		}

		@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));
		public void isChecked_settingIsOff() {
		when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(false);
		assertThat(mController.isChecked()).isFalse();
		}

		@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));
		public void isChecked_settingIsOn() {
		when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(true);
		assertThat(mController.isChecked()).isTrue();
		}

		@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));
		public void setChecked_Off() {
		mController.setChecked(false);
		verify(mBackend, times(1)).setHideSilentStatusIcons(false);
		}

		@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));
		public void setChecked_On() {
		mController.setChecked(true);
		verify(mBackend, times(1)).setHideSilentStatusIcons(true);
		}
		}
		No newline at end of file