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

Commit 8b643187 authored by Yining Liu's avatar Yining Liu
Browse files

Show the Tangor Unseen Notification Toggle when notification_minimalism is Enabled 

Show the Tangor unseen notification toggle in the Notification settings when
notification_minimalism flag is enabled on both phones and large screen devices.

Bug: 330387368
Bug: 354047572
Flag: com.android.server.notification.notification_minimalism
Test: atest ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest
Change-Id: Ic126b7885eb29897b55c4acdc1a2f73b4bc7841e
parent 226e60f3

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.settings.notification;

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 static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS;





import android.content.Context;

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




import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;





import com.android.server.notification.Flags;

import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.core.TogglePreferenceController;
@@ -55,6 +57,13 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController 




    @Override

    @Override

    public int getAvailabilityStatus() {

    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(),

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

                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET);

                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UNSET);

        if (setting == UNSET) {

        if (setting == UNSET) {
@@ -68,4 +77,9 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController 
    public int getSliceHighlightMenuRes() {

    public int getSliceHighlightMenuRes() {

        return R.string.menu_key_notifications;

        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/ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest.java

+17 −0
Original line number Original line Diff line number Diff line
@@ -29,12 +29,16 @@ import static org.mockito.Mockito.when; 




import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

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 android.provider.Settings;





import androidx.preference.Preference;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;

import androidx.preference.PreferenceScreen;





import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.Answers;
@@ -53,6 +57,8 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest { 




    private ShowOnlyUnseenNotificationsOnLockscreenPreferenceController mController;

    private ShowOnlyUnseenNotificationsOnLockscreenPreferenceController mController;

    private Preference mPreference;

    private Preference mPreference;

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();





    @Before

    @Before

    public void setUp() {

    public void setUp() {
@@ -67,12 +73,14 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest { 
    }

    }





    @Test

    @Test

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

    public void display_configUnset_shouldNotDisplay() {

    public void display_configUnset_shouldNotDisplay() {

        mController.displayPreference(mScreen);

        mController.displayPreference(mScreen);

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

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

    }

    }





    @Test

    @Test

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

    public void display_configSet_showDisplay() {

    public void display_configSet_showDisplay() {

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

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

                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, OFF);

                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, OFF);
@@ -80,6 +88,15 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceControllerTest { 
        assertThat(mPreference.isVisible()).isTrue();

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

    }

    }





    @Test

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

    public void display_configUnset_minimalismEnabled_shouldDisplay() {

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

                LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, ON);

        mController.displayPreference(mScreen);

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

    }



    @Test

    @Test

    public void isChecked_settingIsOff_shouldReturnFalse() {

    public void isChecked_settingIsOff_shouldReturnFalse() {

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

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