Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2891e33e authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge "Setting to control seen notification filtering" into tm-qpr-dev am: c8a6db40 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21022067



Change-Id: Ibb65634f4c0f6b45dc8a769d4a45c363c4c63522
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2042f150 c8a6db40

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -9420,6 +9420,12 @@ 
    <!-- Configure Notifications: Title for the option controlling notifications for work profile. [CHAR LIMIT=30] -->

    <string name="locked_work_profile_notification_title">When work profile is locked</string>









    <!-- Configure notifications: Title for the option controlling whether only new notifications are displayed to the user









    on the lock screen [CHAR LIMIT=60] -->









    <string name="unseen_notifs_lock_screen">Show only new notifications on lock screen</string>

















    <!-- Configure notifications: Summary for option of showing only new notifications on the lock screen. [CHAR LIMIT=100] -->









    <string name="unseen_notifs_lock_screen_summary">After each unlock, remove existing notifications from the lock screen</string>

















    <!-- Configure notifications: Title for determining which notifications appear on the lock screen [CHAR LIMIT=60] -->









    <string name="lock_screen_notifs_title">Notifications on lock screen</string>

























res/xml/configure_notification_settings.xml



+13
−6






























Original line number
Diff line number
Diff line







@@ -119,9 +119,16 @@







            android:fragment="com.android.settings.notification.zen.ZenModeSettings"









            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"









        />









        <SwitchPreference









            android:key="lock_screen_show_only_unseen_notifs"









            android:order="18"









            android:title="@string/unseen_notifs_lock_screen"









            android:summary="@string/unseen_notifs_lock_screen_summary"









            settings:controller="com.android.settings.notification.ShowOnlyUnseenNotificationsOnLockscreenPreferenceController"









        />









        <com.android.settingslib.RestrictedPreference









            android:key="app_and_notif_cell_broadcast_settings"









            android:order="18"









            android:order="19"









            android:title="@string/cell_broadcast_settings"









            settings:useAdminDisabledSummary="true">









            <intent








@@ -132,33 +139,33 @@

















        <SwitchPreference









             android:key="silent_icons"









             android:order="19"









             android:order="20"









             android:title="@string/silent_notifications_status_bar"









             settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>



















        <SwitchPreference









            android:key="show_snooze_options"









            android:order="20"









            android:order="21"









            android:title="@string/snooze_options_title"









            settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />



















        <!-- Notification badging -->









        <SwitchPreference









            android:key="notification_badging"









            android:order="21"









            android:order="22"









            android:title="@string/notification_badging_title"









            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>



















        <!-- Pulse notification light, on devices that support it -->









        <SwitchPreference









            android:key="notification_pulse"









            android:order="22"









            android:order="23"









            android:title="@string/notification_pulse_title"









            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>



















        <com.android.settingslib.PrimarySwitchPreference









            android:key="notification_assistant"









            android:order="23"









            android:order="24"









            android:title="@string/notification_assistant_title"









            android:summary="@string/notification_assistant_summary"









            settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
































src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
0 → 100644



+71
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2023 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.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS;



















import android.content.Context;









import android.provider.Settings;



















import androidx.annotation.VisibleForTesting;



















import com.android.settings.R;









import com.android.settings.core.TogglePreferenceController;



















public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController









        extends TogglePreferenceController {



















    private static final int UNSET = 0;









    @VisibleForTesting









    static final int ON = 1;









    @VisibleForTesting









    static final int OFF = 2;



















    public ShowOnlyUnseenNotificationsOnLockscreenPreferenceController(









            Context context,









            String preferenceKey) {









        super(context, preferenceKey);









    }



















    @Override









    public boolean isChecked() {









        return Settings.Secure.getInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET) == ON;









    }



















    @Override









    public boolean setChecked(boolean isChecked) {









        return Settings.Secure.putInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, isChecked ? ON : OFF);









    }



















    @Override









    public int getAvailabilityStatus() {









        int setting = Settings.Secure.getInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET);









        if (setting == UNSET) {









            return CONDITIONALLY_UNAVAILABLE;









        } else {









            return AVAILABLE;









        }









    }



















    @Override









    public int getSliceHighlightMenuRes() {









        return R.string.menu_key_notifications;









    }









}
























tests/robotests/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest.java
0 → 100644



+122
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2023 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.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS;



















import static com.android.settings.notification.ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.OFF;









import static com.android.settings.notification.ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.ON;



















import static com.google.common.truth.Truth.assertThat;



















import static org.mockito.Mockito.doReturn;









import static org.mockito.Mockito.mock;









import static org.mockito.Mockito.when;



















import android.app.admin.DevicePolicyManager;









import android.content.Context;









import android.provider.Settings;



















import androidx.preference.Preference;









import androidx.preference.PreferenceScreen;



















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 ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest {



















    @Mock(answer = Answers.RETURNS_DEEP_STUBS)









    private Context mContext;









    @Mock(answer = Answers.RETURNS_DEEP_STUBS)









    private PreferenceScreen mScreen;



















    private ShowOnlyUnseenNotificationsOnLockscreenPreferenceController mController;









    private Preference mPreference;



















    @Before









    public void setUp() {









        MockitoAnnotations.initMocks(this);









        doReturn(mock(DevicePolicyManager.class)).when(mContext)









                .getSystemService(Context.DEVICE_POLICY_SERVICE);









        mController = new ShowOnlyUnseenNotificationsOnLockscreenPreferenceController(mContext,









                "key");









        mPreference = new Preference(RuntimeEnvironment.application);









        mPreference.setKey(mController.getPreferenceKey());









        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);









    }



















    @Test









    public void display_configUnset_shouldNotDisplay() {









        mController.displayPreference(mScreen);









        assertThat(mPreference.isVisible()).isFalse();









    }



















    @Test









    public void display_configSet_showDisplay() {









        Settings.Secure.putInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, OFF);









        mController.displayPreference(mScreen);









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









    }



















    @Test









    public void isChecked_settingIsOff_shouldReturnFalse() {









        Settings.Secure.putInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, OFF);



















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









    }



















    @Test









    public void isChecked_settingIsOn_shouldReturnTrue() {









        Settings.Secure.putInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, ON);



















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









    }



















    @Test









    public void setChecked_setFalse_disablesSetting() {









        Settings.Secure.putInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, ON);



















        mController.setChecked(false);









        int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, -1);



















        assertThat(updatedValue).isEqualTo(OFF);









    }



















    @Test









    public void setChecked_setTrue_enablesSetting() {









        Settings.Secure.putInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, OFF);



















        mController.setChecked(true);









        int updatedValue = Settings.Secure.getInt(mContext.getContentResolver(),









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, -1);



















        assertThat(updatedValue).isEqualTo(ON);









    }









}