Revert^2 "Improve App notification loading"

c5f1cb11e0

Change-Id: I5a6d39e0a5f2b7bd30bcc12e207b8bb23857c6d8
This commit is contained in:
Julia Reynolds
2022-08-10 17:40:20 +00:00
parent b132484ead
commit 33710fd9e2
34 changed files with 318 additions and 272 deletions

View File

@@ -30,7 +30,7 @@ public class DeletedChannelsPreferenceController extends NotificationPreferenceC
private static final String KEY_DELETED = "deleted";
public DeletedChannelsPreferenceController(Context context, NotificationBackend backend) {
super(context, backend);
super(context, backend, KEY_DELETED);
}
@Override
@@ -39,16 +39,19 @@ public class DeletedChannelsPreferenceController extends NotificationPreferenceC
}
@Override
public boolean isAvailable() {
if (!super.isAvailable()) {
return false;
public int getAvailabilityStatus() {
if (super.getAvailabilityStatus() == CONDITIONALLY_UNAVAILABLE) {
return CONDITIONALLY_UNAVAILABLE;
}
// only visible on app screen
if (mChannel != null || hasValidGroup()) {
return false;
return CONDITIONALLY_UNAVAILABLE;
}
return mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid) > 0;
if (mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid) > 0) {
return AVAILABLE;
}
return CONDITIONALLY_UNAVAILABLE;
}
@Override