AOD helper handling adjustments

Chainfire · Feb 19, 2021 · 1f56664 · 1f56664
1 parent 8f718c8
commit 1f56664
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/app/src/main/java/eu/chainfire/holeylight/animation/NotificationAnimation.java b/app/src/main/java/eu/chainfire/holeylight/animation/NotificationAnimation.java
@@ -644,7 +644,7 @@ public void updateTSPRect(Rect rect, int overlayBottom) {
         Slog.d("AOD_TSP", "Anim " + rect.toString() + " bottom:" + overlayBottom + " apply:" + apply);
         if (apply) {
             tspRect.set(rect);
-            tspOverlayBottom = overlayBottom;
+            if (overlayBottom > 0) tspOverlayBottom = overlayBottom;
             spritePlayer.setTSPBlank(rect.height() == 0);
             applyDimensions();
         }

diff --git a/app/src/main/java/eu/chainfire/holeylight/animation/Overlay.java b/app/src/main/java/eu/chainfire/holeylight/animation/Overlay.java
@@ -484,14 +484,10 @@ public void evaluate(boolean refreshAll, boolean isDelayed) {
             if (!lastState || colorsChanged() || renderMode != lastMode || blackFill != lastBlackFill || doze != lastDoze) {
                 animation.setMode(renderMode, blackFill);
                 createOverlay();
-                if (settings.isHideAOD() && doze && allowHideAOD) {
-                    animation.setHideAOD(true, settings.isHideAODFully());
-                    AODControl.setAODEnabled(spritePlayer.getContext(), true, null);
-                } else {
-                    animation.setHideAOD(spritePlayer.isTSPMode(renderMode), settings.isHideAODFully());
-                }
+                animation.setHideAOD(spritePlayer.isTSPMode(renderMode) || (settings.isHideAOD() && doze && allowHideAOD), settings.isHideAODFully());
                 animation.setDoze(doze);
                 animation.play(activeHide ? new int[] { Color.BLACK } : colors, settings.isUnholeyLightIcons() ? icons : new Drawable[0], false, (renderMode != lastMode));
+                if (colors.length > 0) AODControl.setAODEnabled(spritePlayer.getContext(), true, null);
                 lastColors = colors;
                 lastState = true;
                 lastMode = renderMode;
@@ -500,22 +496,35 @@ public void evaluate(boolean refreshAll, boolean isDelayed) {
             }
         } else {
             if (lastState) {
-                if (spritePlayer.isTSPMode(lastMode)) {
-                    animation.setHideAOD(false);
-                }
-                if (settings.isHideAOD()) {
-                    animation.setHideAOD(false);
+                final boolean fVisible = visible;
+                final boolean fDoze = doze;
+                Runnable goAway = () -> {
+                    if (lastState) {
+                        if (spritePlayer.isTSPMode(lastMode)) {
+                            animation.setHideAOD(false);
+                        }
+                        if (settings.isHideAOD()) {
+                            animation.setHideAOD(false);
+                        }
+                        if (animation.isPlaying()) {
+                            boolean immediately = !fVisible || kill || isDelayed || settings.isAODHelperControl();
+                            animation.stop(immediately);
+                            if (immediately) removeOverlay();
+                        } else {
+                            removeOverlay();
+                        }
+                        lastState = false;
+                        lastDoze = fDoze;
+                    }
+                };
+                if (doze && settings.isAODHelperControl()) {
+                    animation.setHideAOD(true, settings.isHideAODFully());
                     AODControl.setAODEnabled(spritePlayer.getContext(), false, null);
-                }
-                if (animation.isPlaying()) {
-                    boolean immediately = !visible || kill || isDelayed;
-                    animation.stop(immediately);
-                    if (immediately) removeOverlay();
+                    pokeWakeLocks(500);
+                    handler.postDelayed(goAway, 250);
                 } else {
-                    removeOverlay();
+                    goAway.run();
                 }
-                lastState = false;
-                lastDoze = doze;
             }
         }