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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user