From 4d94d9d9681bcfc723ffcad260921a6855afff25 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 9 Nov 2022 12:26:29 -0400 Subject: [PATCH] Utilize areAnimatorsEnabled on API levels that support it. --- .../securesms/util/ContentResolverExtensions.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt index a3fe969712..c750e30bcf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt @@ -1,11 +1,17 @@ package org.thoughtcrime.securesms.util +import android.animation.ValueAnimator import android.content.ContentResolver +import android.os.Build import android.provider.Settings fun ContentResolver.areSystemAnimationsDisabled(): Boolean { - val durationScale = Settings.System.getFloat(this, Settings.Global.ANIMATOR_DURATION_SCALE) - val transitionScale = Settings.System.getFloat(this, Settings.Global.TRANSITION_ANIMATION_SCALE) + return if (Build.VERSION.SDK_INT >= 26) { + !ValueAnimator.areAnimatorsEnabled() + } else { + val durationScale = Settings.System.getFloat(this, Settings.Global.ANIMATOR_DURATION_SCALE) + val transitionScale = Settings.System.getFloat(this, Settings.Global.TRANSITION_ANIMATION_SCALE) - return !(durationScale > 0f && transitionScale > 0f) + !(durationScale > 0f && transitionScale > 0f) + } }