From d17e5903989ea8b791636ab41f138e5516c1b7aa Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 27 Sep 2026 14:22:17 -0400 Subject: [PATCH] fix(motion): honor the system animation scale everywhere and on resume --- app/src/main/java/com/droiddeck/launcher/MainActivity.kt | 1 + app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 1 + app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt | 6 ++++-- .../main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 6 +++++- .../main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt | 1 - .../main/java/com/droiddeck/launcher/ui/SessionLoading.kt | 4 +++- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 0562074d6c..fbdfb96700 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -518,6 +518,7 @@ class MainActivity : ComponentActivity() { override fun onResume() { super.onResume() + com.droiddeck.launcher.ui.Motion.refresh(this) refreshPhantomStatus() // Swaps queued while a game ran on that Proton go in once nothing uses it (usually the // session has just ended). Cheap when nothing is queued. diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index c3b9405120..1777066c53 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1468,6 +1468,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onResume() { super.onResume() + com.droiddeck.launcher.ui.Motion.refresh(this) refreshHomeApp() if (intent?.action == SessionService.ACTION_RESUME) { intent.action = null diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 8b6589d95a..41f38fe415 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -231,7 +231,9 @@ private fun ResumeRailItem(name: String, compact: Boolean, iconOnly: Boolean, on val focused by src.collectIsFocusedAsState() val hovered by src.collectIsHoveredAsState() val pulse = rememberInfiniteTransition(label = "pulse") - val ringScale by pulse.animateFloat(0.4f, 1.6f, infiniteRepeatable(tween(1600, easing = Motion.Ease), RepeatMode.Restart), label = "ring") + val ringScale by pulse.animateFloat(0.4f, 1.6f, infiniteRepeatable(tween(Motion.ms(1600).coerceAtLeast(1), easing = Motion.Ease), RepeatMode.Restart), label = "ring") + // Animations off: the live dot alone, no pulsing ring. + val still = Motion.scale == 0f Column( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp), @@ -247,7 +249,7 @@ private fun ResumeRailItem(name: String, compact: Boolean, iconOnly: Boolean, on .padding(vertical = if (iconOnly) 15.dp else if (compact) 6.dp else 9.dp, horizontal = 4.dp), ) { Box(modifier = Modifier.size(14.dp), contentAlignment = Alignment.Center) { - Box(modifier = Modifier.size(14.dp).graphicsLayer { scaleX = ringScale; scaleY = ringScale; alpha = (1.6f - ringScale) / 1.2f }.border(1.5.dp, pal.good, CircleShape)) + if (!still) Box(modifier = Modifier.size(14.dp).graphicsLayer { scaleX = ringScale; scaleY = ringScale; alpha = (1.6f - ringScale) / 1.2f }.border(1.5.dp, pal.good, CircleShape)) Box(modifier = Modifier.size(7.dp).clip(CircleShape).background(pal.good)) } // Icons only: the live dot alone says something is running; its description says what. diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 68eaa9dec6..78561619fe 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -158,6 +158,10 @@ class FrontEndActions( internal object Motion { var scale = 1f + /** The system's animator scale, re-read on each resume so "Remove animations" applies without a restart. */ + fun refresh(context: android.content.Context) { + scale = Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) + } val Ease = CubicBezierEasing(0.2f, 0.8f, 0.2f, 1f) fun ms(base: Int) = (base * scale).roundToInt() fun tw(base: Int, delay: Int = 0): FiniteAnimationSpec = if (scale == 0f) snap() else tween(ms(base), ms(delay), Ease) @@ -328,7 +332,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com LaunchedEffect(s.steamGames.isEmpty()) { if (s.steamGames.isEmpty() && selected.startsWith("app:")) selected = "games" } - remember { Motion.scale = Settings.Global.getFloat(ctx.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f); true } + remember { Motion.refresh(ctx); true } val railSelection = when { s.pageKey == "performance" || s.pageKey == "protons" || s.pageKey == "controller-mapping" -> "setup" diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 36028b5f94..debd674448 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -69,7 +69,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.droiddeck.launcher.gpu.FrameGen import com.droiddeck.launcher.core.DeviceSupport import com.droiddeck.launcher.core.PhantomProcessLimit import com.droiddeck.launcher.core.PhantomProcessStatus diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 12486a19ae..bdd1b9dd45 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -223,7 +223,8 @@ private fun LoadSegments(count: Int, active: Int, percent: Int, modifier: Modifi val pal = LocalPalette.current val track = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.12f) val run = rememberInfiniteTransition(label = "segment") - .animateFloat(-0.4f, 1f, infiniteRepeatable(tween(1300, easing = FastOutSlowInEasing)), label = "run") + .animateFloat(-0.4f, 1f, infiniteRepeatable(tween(Motion.ms(1300).coerceAtLeast(1), easing = FastOutSlowInEasing)), label = "run") + val still = Motion.scale == 0f Row( horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier.semantics { contentDescription = "Step ${active + 1} of $count" }, @@ -235,6 +236,7 @@ private fun LoadSegments(count: Int, active: Int, percent: Int, modifier: Modifi .drawBehind { if (i != active) return@drawBehind if (percent >= 0) drawRect(pal.signal, size = Size(size.width * percent.coerceIn(0, 100) / 100f, size.height)) + else if (still) drawRect(pal.signal.copy(alpha = 0.5f)) else drawRect(pal.signal, topLeft = Offset(size.width * run.value, 0f), size = Size(size.width * 0.4f, size.height)) }, )