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

Commit ccaa62ec authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "notif_minimalism_settings" into main 

* changes:
  Notification Minimalism Settings Main Switch
  Show the Tangor Unseen Notification Toggle when notification_minimalism is Enabled
parents b5aa5265 41cd514f

res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -8657,6 +8657,13 @@ 
    <!-- 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 or not to minimalize the









    number of notifications to show on the lock screen[CHAR LIMIT=60] -->









    <string name="lock_screen_notif_minimalism">Lock screen notification minimalism</string>

















    <!-- Configure notifications: Summary for option lock_screen_notif_minimalism. [CHAR LIMIT=100] -->









    <string name="lock_screen_notif_minimalism_summary">Show fewer notifications on lock screen</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>

























res/xml/configure_notification_settings.xml



+16
−8






























Original line number
Diff line number
Diff line







@@ -136,8 +136,16 @@







        />



















        <SwitchPreferenceCompat









            android:key="lock_screen_show_only_unseen_notifs"









            android:key="lock_screen_notif_minimalism"









            android:order="19"









            android:title="@string/lock_screen_notif_minimalism"









            android:summary="@string/lock_screen_notif_minimalism_summary"









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









            />



















        <SwitchPreferenceCompat









            android:key="lock_screen_show_only_unseen_notifs"









            android:order="20"









            android:title="@string/unseen_notifs_lock_screen"









            android:summary="@string/unseen_notifs_lock_screen_summary"









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








@@ -146,7 +154,7 @@







        <Preference









            android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment"









            android:key="flash_notifications_preference"









            android:order="20"









            android:order="21"









            android:persistent="false"









            android:title="@string/flash_notifications_title"









            settings:searchable="false"








@@ -154,7 +162,7 @@

















        <com.android.settingslib.RestrictedPreference









            android:key="app_and_notif_cell_broadcast_settings"









            android:order="21"









            android:order="22"









            android:title="@string/cell_broadcast_settings"









            settings:useAdminDisabledSummary="true">









            <intent








@@ -165,33 +173,33 @@

















        <SwitchPreferenceCompat









             android:key="silent_icons"









             android:order="22"









             android:order="23"









             android:title="@string/silent_notifications_status_bar"









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



















        <SwitchPreferenceCompat









            android:key="show_snooze_options"









            android:order="23"









            android:order="24"









            android:title="@string/snooze_options_title"









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



















        <!-- Notification badging -->









        <SwitchPreferenceCompat









            android:key="notification_badging"









            android:order="24"









            android:order="25"









            android:title="@string/notification_badging_title"









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



















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









        <SwitchPreferenceCompat









            android:key="notification_pulse"









            android:order="25"









            android:order="26"









            android:title="@string/notification_pulse_title"









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



















        <SwitchPreferenceCompat









            android:key="notification_assistant"









            android:order="26"









            android:order="27"









            android:title="@string/notification_assistant_title"









            android:summary="@string/notification_assistant_summary"









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
































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



+74
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2024 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_NOTIFICATION_MINIMALISM;









import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;



















import android.content.Context;









import android.provider.Settings;



















import androidx.annotation.VisibleForTesting;



















import com.android.server.notification.Flags;









import com.android.settings.R;









import com.android.settings.core.TogglePreferenceController;



















public class LockscreenNotificationMinimalismPreferenceController









        extends TogglePreferenceController {



















    @VisibleForTesting









    static final int ON = 1;









    @VisibleForTesting









    static final int OFF = 0;



















    public LockscreenNotificationMinimalismPreferenceController(









            Context context,









            String preferenceKey) {









        super(context, preferenceKey);









    }



















    @Override









    public boolean isChecked() {









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









                LOCK_SCREEN_NOTIFICATION_MINIMALISM, ON) == ON;









    }



















    @Override









    public boolean setChecked(boolean isChecked) {









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









                LOCK_SCREEN_NOTIFICATION_MINIMALISM, isChecked ? ON : OFF);









    }



















    @Override









    public int getAvailabilityStatus() {









        if (!Flags.notificationMinimalism()) {









            return CONDITIONALLY_UNAVAILABLE;









        }









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









                LOCK_SCREEN_SHOW_NOTIFICATIONS, 0);









        if (lockScreenNotif == 0) {









            return DISABLED_DEPENDENT_SETTING;









        }









        return AVAILABLE;









    }



















    @Override









    public int getSliceHighlightMenuRes() {









        return R.string.menu_key_notifications;









    }









}
























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



+14
−0






























Original line number
Diff line number
Diff line







@@ -16,6 +16,7 @@

















package com.android.settings.notification;



















import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;









import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS;



















import android.content.Context;








@@ -23,6 +24,7 @@ import android.provider.Settings;

















import androidx.annotation.VisibleForTesting;



















import com.android.server.notification.Flags;









import com.android.settings.R;









import com.android.settings.core.TogglePreferenceController;


















@@ -55,6 +57,13 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController

















    @Override









    public int getAvailabilityStatus() {









        if (Flags.notificationMinimalism()) {









            if (!isNotifOnLockScreenEnabled()) {









                return DISABLED_DEPENDENT_SETTING;









            }









            // We want to show the switch when the lock screen notification minimalism flag is on.









            return AVAILABLE;









        }









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









                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET);









        if (setting == UNSET) {








@@ -68,4 +77,9 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController







    public int getSliceHighlightMenuRes() {









        return R.string.menu_key_notifications;









    }



















    private boolean isNotifOnLockScreenEnabled() {









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









                LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) == 1;









    }









}
























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



+105
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2024 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_NOTIFICATION_MINIMALISM;



















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.platform.test.annotations.DisableFlags;









import android.platform.test.annotations.EnableFlags;









import android.platform.test.flag.junit.SetFlagsRule;









import android.provider.Settings;



















import androidx.preference.Preference;









import androidx.preference.PreferenceScreen;



















import org.junit.Before;









import org.junit.Rule;









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



















    @Mock(answer = Answers.RETURNS_DEEP_STUBS)









    private Context mContext;









    @Mock(answer = Answers.RETURNS_DEEP_STUBS)









    private PreferenceScreen mScreen;



















    private LockscreenNotificationMinimalismPreferenceController mController;









    private Preference mPreference;









    static final int ON = 1;









    static final int OFF = 0;









    @Rule









    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



















    @Before









    public void setUp() {









        MockitoAnnotations.initMocks(this);









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









                .getSystemService(Context.DEVICE_POLICY_SERVICE);









        mController = new LockscreenNotificationMinimalismPreferenceController(mContext,









                "key");









        mPreference = new Preference(RuntimeEnvironment.application);









        mPreference.setKey(mController.getPreferenceKey());









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









    }



















    @Test









    @DisableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)









    public void display_featureFlagOff_shouldNotDisplay() {









        mController.displayPreference(mScreen);









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









    }



















    @Test









    @EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)









    public void display_featureFlagOn_shouldDisplay() {









        mController.displayPreference(mScreen);









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









    }



















    @Test









    @EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)









    public void isChecked_settingIsOff_shouldReturnFalse() {









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









                LOCK_SCREEN_NOTIFICATION_MINIMALISM, OFF);



















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









    }



















    @Test









    @EnableFlags(com.android.server.notification.Flags.FLAG_NOTIFICATION_MINIMALISM)









    public void isChecked_settingIsOn_shouldReturnTrue() {









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









                LOCK_SCREEN_NOTIFICATION_MINIMALISM, ON);



















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









    }









}