Merge "Add a settings for notification history" (7b036f36) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+6 −0

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

		<!-- Configure notifications: settings summary [CHAR LIMIT=NONE] -->
		<string name="notification_history_summary">Turn on notification history to keep track of past notifications and snoozed notifications</string>

		<!-- Configure notifications: settings title [CHAR LIMIT=100] -->
		<string name="notification_history">Notification history</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>

res/xml/configure_notification_settings.xml

+6 −0

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

		<SwitchPreference
		android:key="notification_history"
		android:title="@string/notification_history"
		android:summary="@string/notification_history_summary"
		settings:controller="com.android.settings.notification.NotificationHistoryPreferenceController"/>

		<SwitchPreference
		android:key="silent_icons"
		android:title="@string/silent_notifications_status_bar"

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

0 → 100644

+128 −0

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

		import android.content.ContentResolver;
		import android.content.Context;
		import android.database.ContentObserver;
		import android.net.Uri;
		import android.os.Handler;
		import android.provider.Settings;
		import android.text.TextUtils;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.core.TogglePreferenceController;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnPause;
		import com.android.settingslib.core.lifecycle.events.OnResume;

		public class NotificationHistoryPreferenceController extends TogglePreferenceController
		implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
		LifecycleObserver, OnResume, OnPause {

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

		private SettingObserver mSettingObserver;

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

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		Preference preference = screen.findPreference(NOTIFICATION_HISTORY_ENABLED);
		if (preference != null) {
		mSettingObserver = new SettingObserver(preference);
		}
		}

		@Override
		public void onResume() {
		if (mSettingObserver != null) {
		mSettingObserver.register(mContext.getContentResolver(), true /* register */);
		}
		}

		@Override
		public void onPause() {
		if (mSettingObserver != null) {
		mSettingObserver.register(mContext.getContentResolver(), false /* register */);
		}
		}

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

		@Override
		public boolean isSliceable() {
		return false;
		}

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

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

		class SettingObserver extends ContentObserver {

		private final Uri NOTIFICATION_URI =
		Settings.Secure.getUriFor(NOTIFICATION_HISTORY_ENABLED);

		private final Preference mPreference;

		public SettingObserver(Preference preference) {
		super(new Handler());
		mPreference = preference;
		}

		public void register(ContentResolver cr, boolean register) {
		if (register) {
		cr.registerContentObserver(NOTIFICATION_URI, false, this);
		} else {
		cr.unregisterContentObserver(this);
		}
		}

		@Override
		public void onChange(boolean selfChange, Uri uri) {
		super.onChange(selfChange, uri);
		if (NOTIFICATION_URI.equals(uri)) {
		updateState(mPreference);
		}
		}
		}
		}

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

0 → 100644

+139 −0

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

		import static com.android.settings.notification.NotificationHistoryPreferenceController.OFF;
		import static com.android.settings.notification.NotificationHistoryPreferenceController.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 androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;
		import androidx.preference.TwoStatePreference;

		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;

		@RunWith(RobolectricTestRunner.class)
		public class NotificationHistoryPreferenceControllerTest {

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

		private NotificationHistoryPreferenceController mController;
		private Preference mPreference;

		private static final String KEY = "notification_history";

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

		@Test
		public void testIsVisible() {
		mController.displayPreference(mScreen);

		assertThat(mPreference.isVisible()).isTrue();
		}

		@Test
		public void updateState_preferenceSetCheckedWhenSettingIsOn() {
		final TwoStatePreference preference = mock(TwoStatePreference.class);
		final Context context = RuntimeEnvironment.application;
		Settings.Secure.putInt(context.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, ON);

		mController = new NotificationHistoryPreferenceController(context, KEY);
		mController.updateState(preference);

		verify(preference).setChecked(true);
		}

		@Test
		public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
		final TwoStatePreference preference = mock(TwoStatePreference.class);
		final Context context = RuntimeEnvironment.application;
		Settings.Secure.putInt(context.getContentResolver(), NOTIFICATION_HISTORY_ENABLED, OFF);

		mController = new NotificationHistoryPreferenceController(context, KEY);
		mController.updateState(preference);

		verify(preference).setChecked(false);
		}

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

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

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

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

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

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

		assertThat(updatedValue).isEqualTo(OFF);
		}

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

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

		assertThat(updatedValue).isEqualTo(ON);
		}

		@Test
		public void isSliceable_returnsFalse() {
		assertThat(mController.isSliceable()).isFalse();
		}
		}