Remove redundant AOD capability wrappers
This commit is contained in:
+1
-5
@@ -859,7 +859,7 @@ final class UnlockedLayoutPlanner {
|
||||
}
|
||||
if (style != NotificationDisplayStyle.ICONS
|
||||
&& !(style == NotificationDisplayStyle.UNKNOWN
|
||||
&& isExperimentalGenericAod(settings))) {
|
||||
&& SystemUiCapabilities.supportsExperimentalGenericAodStatusbarRoot(settings))) {
|
||||
return 0;
|
||||
}
|
||||
return settings.layoutNotifEnabledAod ? settings.layoutNotifAodCount : 0;
|
||||
@@ -873,10 +873,6 @@ final class UnlockedLayoutPlanner {
|
||||
&& scene.notificationDisplayStyle() == NotificationDisplayStyle.DOT;
|
||||
}
|
||||
|
||||
private boolean isExperimentalGenericAod(SbtSettings settings) {
|
||||
return SystemUiCapabilities.supportsExperimentalGenericAodStatusbarRoot(settings);
|
||||
}
|
||||
|
||||
private ArrayList<SnapshotPlacement> unreadNotificationPlacements(
|
||||
ArrayList<SnapshotPlacement> placements
|
||||
) {
|
||||
|
||||
+2
-5
@@ -92,7 +92,8 @@ final class UnlockedStockSourceCollector {
|
||||
LockscreenCardsNotificationIconSourceStore
|
||||
.snapshotAodNotificationPackageSources(root));
|
||||
}
|
||||
if (notificationIcons.isEmpty() && isExperimentalGenericAod(settings)) {
|
||||
if (notificationIcons.isEmpty()
|
||||
&& SystemUiCapabilities.supportsExperimentalGenericAodStatusbarRoot(settings)) {
|
||||
View notificationRoot = anchors != null && anchors.notificationRoot != null
|
||||
? anchors.notificationRoot
|
||||
: root;
|
||||
@@ -146,10 +147,6 @@ final class UnlockedStockSourceCollector {
|
||||
&& SystemUiCapabilities.treatsUnknownAodNotificationStyleAsIcons(settings));
|
||||
}
|
||||
|
||||
private boolean isExperimentalGenericAod(SbtSettings settings) {
|
||||
return SystemUiCapabilities.supportsExperimentalGenericAodStatusbarRoot(settings);
|
||||
}
|
||||
|
||||
private String reflectString(View view, String methodName, String... fieldNames) {
|
||||
Object methodValue = ReflectionSupport.invokeMethod(view, methodName);
|
||||
if (methodValue != null) {
|
||||
|
||||
Reference in New Issue
Block a user