PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate Enhanced notifications to SwitchPreferenceCompat

Browse Source 
Settings use SwitchPreferenceCompat instead of SwitchPreference in the
future, for new Material 3 UI.

Also clean up unused fields in its controller.

Bug: 306658427
Test: manual - on Notifications page
Change-Id: I0c4dd3f088e68852a1f63ed46447c306f7c0f65a
This commit is contained in:
Chaohui Wang
2023-10-28 18:19:17 +08:00
parent 570314569f
commit 64def2e3ce
3 changed files with 5 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/notification/NotificationAssistantPreferenceController.java
View File

@@ -18,44 +18,31 @@ package com.android.settings.notification;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.service.notification.NotificationAssistantService;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.PrimarySwitchPreference;
import com.google.common.annotations.VisibleForTesting;
import java.util.List;
public class NotificationAssistantPreferenceController extends TogglePreferenceController {
private static final String TAG = "NASPreferenceController";
static final String KEY_NAS = "notification_assistant";
private final UserManager mUserManager;
private final PackageManager mPackageManager;
private Fragment mFragment;
private int mUserId = UserHandle.myUserId();
@VisibleForTesting
protected NotificationBackend mNotificationBackend;
private ComponentName mDefaultNASComponent;
private Intent mNASSettingIntent;
public NotificationAssistantPreferenceController(Context context) {
super(context, KEY_NAS);
mUserManager = UserManager.get(context);
mNotificationBackend = new NotificationBackend();
mPackageManager = context.getPackageManager();
getDefaultNASIntent();
}
@@ -118,12 +105,6 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC
@VisibleForTesting
void getDefaultNASIntent() {
mDefaultNASComponent = mNotificationBackend.getDefaultNotificationAssistant();
if (mDefaultNASComponent != null) {
mNASSettingIntent = new Intent(
NotificationAssistantService.ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS);
mNASSettingIntent.setPackage(mDefaultNASComponent.getPackageName());
mNASSettingIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
}
@Override
@@ -136,7 +117,6 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC
super.updateState(preference);
if (mDefaultNASComponent == null) {
preference.setEnabled(false);
((PrimarySwitchPreference) preference).setSwitchEnabled(false);
}
}
}