diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml index aedf0b413aa..e5fddc4e58e 100644 --- a/res/xml/configure_notification_settings.xml +++ b/res/xml/configure_notification_settings.xml @@ -92,23 +92,31 @@ android:singleLineTitle="false" android:summary="@string/summary_placeholder" /> + + diff --git a/res/xml/lock_screen_notifications_settings.xml b/res/xml/lock_screen_notifications_settings.xml new file mode 100644 index 00000000000..8eed90e9c61 --- /dev/null +++ b/res/xml/lock_screen_notifications_settings.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/src/com/android/settings/notification/LockScreenNotificationsPreferencePageController.java b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageController.java new file mode 100644 index 00000000000..61ac27485db --- /dev/null +++ b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageController.java @@ -0,0 +1,40 @@ +/* + * 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 android.content.Context; + +import com.android.server.notification.Flags; +import com.android.settings.core.BasePreferenceController; + +// TODO(b/367455695): remove controller when the feature flag is removed! + +/** + * Controller for lock screen notifications settings page. + */ +public class LockScreenNotificationsPreferencePageController extends BasePreferenceController { + + public LockScreenNotificationsPreferencePageController(Context context, String preferenceKey) { + super(context, preferenceKey); + } + + @Override + public int getAvailabilityStatus() { + return Flags.notificationLockScreenSettings() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; + } + +} diff --git a/src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java new file mode 100644 index 00000000000..ef53e2da829 --- /dev/null +++ b/src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java @@ -0,0 +1,56 @@ +/* + * 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 android.app.settings.SettingsEnums; +import android.content.Context; + +import com.android.server.notification.Flags; +import com.android.settings.R; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; + +/** + * Fragment for notifications on lock screen preference page. + */ +@SearchIndexable +public class LockScreenNotificationsPreferencePageFragment extends DashboardFragment { + + @Override + public int getMetricsCategory() { + //TODO(b/367455695): create a new metrics category + return SettingsEnums.SETTINGS_LOCK_SCREEN_PREFERENCES; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.lock_screen_notifications_settings; + } + @Override + protected String getLogTag() { + return "LockScreenNotificationsPreferenceFragment"; + } + + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.lock_screen_notifications_settings) { + @Override + protected boolean isPageSearchEnabled(Context context) { + return Flags.notificationLockScreenSettings(); + } + }; +} diff --git a/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java b/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java index 7b48ba7ff5a..03875566621 100644 --- a/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java +++ b/src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java @@ -56,6 +56,10 @@ public class LockscreenNotificationMinimalismPreferenceController @Override public int getAvailabilityStatus() { + // Hide when the notifications on lock screen settings page flag is enabled. + if (Flags.notificationLockScreenSettings()) { + return CONDITIONALLY_UNAVAILABLE; + } if (!Flags.notificationMinimalism()) { return CONDITIONALLY_UNAVAILABLE; } diff --git a/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java b/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java index e6e0947149a..49edcb8b769 100644 --- a/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java +++ b/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java @@ -18,16 +18,19 @@ package com.android.settings.notification; import android.content.Context; +import androidx.annotation.NonNull; + import com.android.server.notification.Flags; import com.android.settings.core.BasePreferenceController; -// TODO: b/291897570 - remove controller when the feature flag is removed! +// TODO(b/330606963): remove controller when the feature flag is removed! /** * Controller for polite notifications settings page. */ public class PoliteNotificationsPreferenceController extends BasePreferenceController { - public PoliteNotificationsPreferenceController(Context context, String preferenceKey) { + public PoliteNotificationsPreferenceController(@NonNull Context context, + @NonNull String preferenceKey) { super(context, preferenceKey); } diff --git a/src/com/android/settings/notification/RedactNotificationPreferenceController.java b/src/com/android/settings/notification/RedactNotificationPreferenceController.java index 4ebf08e0a43..ea52be6d88f 100644 --- a/src/com/android/settings/notification/RedactNotificationPreferenceController.java +++ b/src/com/android/settings/notification/RedactNotificationPreferenceController.java @@ -33,6 +33,7 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; +import com.android.server.notification.Flags; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -120,6 +121,11 @@ public class RedactNotificationPreferenceController extends TogglePreferenceCont @Override public int getAvailabilityStatus() { + // Hide when the notifications on lock screen settings page flag is enabled. + if (Flags.notificationLockScreenSettings()) { + return CONDITIONALLY_UNAVAILABLE; + } + // hide work profile setting if no work profile if (KEY_LOCKSCREEN_WORK_PROFILE_REDACT.equals(getPreferenceKey()) && mProfileUserId == UserHandle.myUserId()) { diff --git a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java index 1addd8220db..fc5fa740359 100644 --- a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java @@ -26,6 +26,7 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.server.notification.Flags; import com.android.settings.R; import com.android.settings.RestrictedListPreference; import com.android.settings.core.PreferenceControllerMixin; @@ -63,7 +64,8 @@ public class ShowOnLockScreenNotificationPreferenceController extends AbstractPr @Override public boolean isAvailable() { - return true; + // When notificationLockScreenSettings is enabled, show the lock screen notif settings page + return !Flags.notificationLockScreenSettings(); } @Override diff --git a/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java b/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java index 9534483d25f..225fc7c8946 100644 --- a/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java +++ b/src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java @@ -57,6 +57,10 @@ public class ShowOnlyUnseenNotificationsOnLockscreenPreferenceController @Override public int getAvailabilityStatus() { + // Hide when the notifications on lock screen page flag is enabled. + if (Flags.notificationLockScreenSettings()) { + return CONDITIONALLY_UNAVAILABLE; + } if (Flags.notificationMinimalism()) { if (!isNotifOnLockScreenEnabled()) { return DISABLED_DEPENDENT_SETTING; diff --git a/tests/robotests/src/com/android/settings/notification/LockScreenNotificationsPreferencePageControllerTest.java b/tests/robotests/src/com/android/settings/notification/LockScreenNotificationsPreferencePageControllerTest.java new file mode 100644 index 00000000000..472d9cb6f65 --- /dev/null +++ b/tests/robotests/src/com/android/settings/notification/LockScreenNotificationsPreferencePageControllerTest.java @@ -0,0 +1,69 @@ +/* + * 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 com.google.common.truth.Truth.assertThat; + +import android.platform.test.flag.junit.SetFlagsRule; + +import com.android.server.notification.Flags; +import com.android.settings.core.BasePreferenceController; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +// TODO(b/367455695): remove test when feature flag is cleaned +@RunWith(RobolectricTestRunner.class) +public class LockScreenNotificationsPreferencePageControllerTest { + + @Rule + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + + private static final String PREFERENCE_KEY = "lock_screen_notifications_page"; + + private LockScreenNotificationsPreferencePageController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mController = new LockScreenNotificationsPreferencePageController( + RuntimeEnvironment.application, + PREFERENCE_KEY); + } + + @Test + public void isAvailable_flagEnabled_shouldReturnTrue() { + mSetFlagsRule.enableFlags(Flags.FLAG_NOTIFICATION_LOCK_SCREEN_SETTINGS); + assertThat(mController.isAvailable()).isTrue(); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.AVAILABLE); + } + + @Test + public void isAvailable_flagDisabled_shouldReturnFalse() { + mSetFlagsRule.disableFlags(Flags.FLAG_NOTIFICATION_LOCK_SCREEN_SETTINGS); + assertThat(mController.isAvailable()).isFalse(); + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BasePreferenceController.CONDITIONALLY_UNAVAILABLE); + } + +}