Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the new settings page for lock screen notifs

Browse Source 
Add a new empty settings page, which is flag-guarded. When the flag
is disabled, show the original Notifications on lock screen
tri-state switch, otherwise show the new page.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: atest LockScreenNotificationsPreferenceControllerTest

Change-Id: I8a81ad651626f39380767b2c9cfa2f1c19d0e7c5
This commit is contained in:
Yining Liu
2024-09-27 17:16:50 +00:00
parent 226c6392ef
commit 9836d6a69a
10 changed files with 233 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/com/android/settings/notification/LockScreenNotificationsPreferencePageController.java Normal file
View File

@@ -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;
}
}

56
src/com/android/settings/notification/LockScreenNotificationsPreferencePageFragment.java Normal file
View File

@@ -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();
}
};
}

4
src/com/android/settings/notification/LockscreenNotificationMinimalismPreferenceController.java
View File

@@ -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;
}

7
src/com/android/settings/notification/PoliteNotificationsPreferenceController.java
View File

@@ -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);
}

6
src/com/android/settings/notification/RedactNotificationPreferenceController.java
View File

@@ -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()) {

4
src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
View File

@@ -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

4
src/com/android/settings/notification/ShowOnlyUnseenNotificationsOnLockscreenPreferenceController.java
View File

@@ -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;