Merge "Add snooze notification setting" into qt-dev (b8f7db90) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -7901,6 +7901,9 @@
		<!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
		<string name="asst_capabilities_actions_replies_summary">Automatically show suggested actions & replies</string>

		<!-- Configure Notifications: setting title, whether the snooze menu is shown on notifications [CHAR LIMIT=80] -->
		<string name="snooze_options_title">Allow notification snoozing</string>

		<!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
		<string name="hide_silent_icons_title">Hide icons from gentle notifications</string>

res/xml/configure_notification_settings.xml

+5 −0

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

		<SwitchPreference
		android:key="show_snooze_options"
		android:title="@string/snooze_options_title"
		settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />

		<SwitchPreference
		android:key="asst_capabilities_actions_replies"
		android:title="@string/asst_capabilities_actions_replies_title"

src/com/android/settings/notification/SnoozeNotificationPreferenceController.java

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* 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.SHOW_NOTIFICATION_SNOOZE;

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

		import com.android.settings.core.TogglePreferenceController;

		import androidx.annotation.VisibleForTesting;

		public class SnoozeNotificationPreferenceController extends TogglePreferenceController {

		private static final String TAG = "SnoozeNotifPrefContr";
		@VisibleForTesting
		static final int ON = 1;
		@VisibleForTesting
		static final int OFF = 0;

		public SnoozeNotificationPreferenceController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		}

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

		@Override
		public boolean isChecked() {
		return Settings.Secure.getInt(mContext.getContentResolver(),
		SHOW_NOTIFICATION_SNOOZE, OFF) == ON;
		}

		@Override
		public boolean setChecked(boolean isChecked) {
		return Settings.Secure.putInt(mContext.getContentResolver(),
		SHOW_NOTIFICATION_SNOOZE, isChecked ? ON : OFF);
		}
		}

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

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		/*
		* 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_BADGING;
		import static android.provider.Settings.Secure.SHOW_NOTIFICATION_SNOOZE;

		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.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.Answers;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;

		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;
		import androidx.preference.TwoStatePreference;

		@RunWith(RobolectricTestRunner.class)
		public class SnoozeNotificationPreferenceControllerTest {

		@Mock(answer = Answers.RETURNS_DEEP_STUBS)
		private Context mContext;
		@Mock(answer = Answers.RETURNS_DEEP_STUBS)
		private PreferenceScreen mScreen;

		private SnoozeNotificationPreferenceController mController;
		private Preference mPreference;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mController = new SnoozeNotificationPreferenceController(mContext,
		"key");
		mPreference = new Preference(RuntimeEnvironment.application);
		mPreference.setKey(mController.getPreferenceKey());
		when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
		}

		@Test
		public void display_configIsTrue_shouldDisplay() {
		mController.displayPreference(mScreen);
		assertThat(mPreference.isVisible()).isTrue();
		}

		@Test
		public void isChecked_settingIsOff_shouldReturnFalse() {
		Settings.Secure.putInt(mContext.getContentResolver(), SHOW_NOTIFICATION_SNOOZE, OFF);

		assertThat(mController.isChecked()).isFalse();
		}

		@Test
		public void isChecked_settingIsOn_shouldReturnTrue() {
		Settings.Secure.putInt(mContext.getContentResolver(), SHOW_NOTIFICATION_SNOOZE, ON);

		assertThat(mController.isChecked()).isTrue();
		}

		@Test
		public void setChecked_setFalse_disablesSetting() {
		Settings.Secure.putInt(mContext.getContentResolver(), SHOW_NOTIFICATION_SNOOZE, ON);

		mController.setChecked(false);
		int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),
		SHOW_NOTIFICATION_SNOOZE, -1);

		assertThat(updatedValue).isEqualTo(OFF);
		}

		@Test
		public void setChecked_setTrue_enablesSetting() {
		Settings.Secure.putInt(mContext.getContentResolver(), SHOW_NOTIFICATION_SNOOZE, OFF);

		mController.setChecked(true);
		int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),
		SHOW_NOTIFICATION_SNOOZE, -1);

		assertThat(updatedValue).isEqualTo(ON);
		}
		}