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

@@ -29,7 +29,7 @@ public class DescriptionPreferenceController extends NotificationPreferenceContr
private static final String KEY_DESC = "desc";
public DescriptionPreferenceController(Context context) {
super(context, null);
super(context, null, KEY_DESC);
}
@Override
@@ -38,20 +38,20 @@ public class DescriptionPreferenceController extends NotificationPreferenceContr
}
@Override
public boolean isAvailable() {
if (!super.isAvailable()) {
return false;
public int getAvailabilityStatus() {
if (super.getAvailabilityStatus() == CONDITIONALLY_UNAVAILABLE) {
return CONDITIONALLY_UNAVAILABLE;
}
if (mChannel == null && !hasValidGroup()) {
return false;
return CONDITIONALLY_UNAVAILABLE;
}
if (mChannel != null && !TextUtils.isEmpty(mChannel.getDescription())) {
return true;
return AVAILABLE;
}
if (hasValidGroup() && !TextUtils.isEmpty(mChannelGroup.getDescription())) {
return true;
return AVAILABLE;
}
return false;
return CONDITIONALLY_UNAVAILABLE;
}
@Override