From 988fbcebcd2e885ae38a6acc84c48a4984f88711 Mon Sep 17 00:00:00 2001
From: ajp_anton <ajp_anton@git.ajpanton.se>
Date: Wed, 15 Jul 2026 23:16:50 +0000
Subject: [PATCH] Remove redundant AOD capability wrappers

---
 .../runtime/render/UnlockedLayoutPlanner.java              | 6 +-----
 .../runtime/render/UnlockedStockSourceCollector.java       | 7 ++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedLayoutPlanner.java b/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedLayoutPlanner.java
index 714b02c..a8f71fb 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedLayoutPlanner.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedLayoutPlanner.java
@@ -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
     ) {
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedStockSourceCollector.java b/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedStockSourceCollector.java
index 930b44d..3cb9b48 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedStockSourceCollector.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/runtime/render/UnlockedStockSourceCollector.java
@@ -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) {