Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite animation loop when system animations are disabled.

Browse Source
This commit is contained in:
Alex Hart
2022-11-08 09:51:06 -04:00
committed by Greyson Parrelli
parent 2cfa31a9b0
commit b1d1aee373
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/stories/StoryFirstTimeNavigationView.kt
View File

@@ -19,6 +19,7 @@ import com.bumptech.glide.request.target.Target
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.blurhash.BlurHash import org.thoughtcrime.securesms.blurhash.BlurHash
import org.thoughtcrime.securesms.mms.GlideApp import org.thoughtcrime.securesms.mms.GlideApp
import org.thoughtcrime.securesms.util.areSystemAnimationsDisabled
import org.thoughtcrime.securesms.util.visible import org.thoughtcrime.securesms.util.visible
class StoryFirstTimeNavigationView @JvmOverloads constructor( class StoryFirstTimeNavigationView @JvmOverloads constructor(
@@ -118,6 +119,10 @@ class StoryFirstTimeNavigationView @JvmOverloads constructor(
} }
private fun startLottieAnimations() { private fun startLottieAnimations() {
if (context.contentResolver.areSystemAnimationsDisabled()) {
return
}
isPlayingAnimations = true isPlayingAnimations = true
tapToAdvance.addAnimatorListener(object : AnimatorListenerAdapter() { tapToAdvance.addAnimatorListener(object : AnimatorListenerAdapter() {
override fun onAnimationEnd(animation: Animator?) { override fun onAnimationEnd(animation: Animator?) {

11
app/src/main/java/org/thoughtcrime/securesms/util/ContentResolverExtensions.kt Normal file
View File

@@ -0,0 +1,11 @@
package org.thoughtcrime.securesms.util
import android.content.ContentResolver
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 !(durationScale > 0f && transitionScale > 0f)
}