Revert^3 "Improve App notification loading"

33710fd9e2

Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
This commit is contained in:
Michael Wright
2022-08-24 12:22:12 +00:00
parent 33710fd9e2
commit 475632c4fe
34 changed files with 272 additions and 318 deletions

View File

@@ -47,7 +47,7 @@ public class SoundPreferenceController extends NotificationPreferenceController
public SoundPreferenceController(Context context, SettingsPreferenceFragment hostFragment,
NotificationSettings.DependentFieldListener dependentFieldListener,
NotificationBackend backend) {
super(context, backend, KEY_SOUND);
super(context, backend);
mFragment = hostFragment;
mListener = dependentFieldListener;
}
@@ -58,17 +58,14 @@ public class SoundPreferenceController extends NotificationPreferenceController
}
@Override
public int getAvailabilityStatus() {
if (super.getAvailabilityStatus() == CONDITIONALLY_UNAVAILABLE) {
return CONDITIONALLY_UNAVAILABLE;
public boolean isAvailable() {
if (!super.isAvailable()) {
return false;
}
if (mChannel == null) {
return CONDITIONALLY_UNAVAILABLE;
return false;
}
if (checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT) && !isDefaultChannel()) {
return AVAILABLE;
}
return CONDITIONALLY_UNAVAILABLE;
return checkCanBeVisible(NotificationManager.IMPORTANCE_DEFAULT) && !isDefaultChannel();
}
@Override