From a9044b710f48c628ed42f2acfb9d3e95f23227a5 Mon Sep 17 00:00:00 2001
From: eranl <1707552+eranl@users.noreply.github.com>
Date: Wed, 11 Jun 2025 22:24:03 +0300
Subject: [PATCH] Use `ANIMATOR_DURATION_SCALE` only. Make local to
 `EmojiPalettesView`.

---
 .../keyboard/emoji/EmojiPalettesView.java        |  7 ++++++-
 .../keyboard/latin/settings/SettingsValues.java  | 16 ----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java b/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java
index d5a84eb4e..236f25b68 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java
+++ b/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java
@@ -403,7 +403,7 @@ public final class EmojiPalettesView extends LinearLayout
             if (mPager.getScrollState() != ViewPager2.SCROLL_STATE_DRAGGING) {
                 // Not swiping
                 mPager.setCurrentItem(mEmojiCategory.getTabIdFromCategoryId(
-                                mEmojiCategory.getCurrentCategoryId()), ! initial && ! Settings.getValues().mAnimationDisabled);
+                                mEmojiCategory.getCurrentCategoryId()), ! initial && ! isAnimationsDisabled());
             }
 
             if (Settings.getValues().mSecondaryStripVisible) {
@@ -418,6 +418,11 @@ public final class EmojiPalettesView extends LinearLayout
         }
     }
 
+    private boolean isAnimationsDisabled() {
+        return android.provider.Settings.Global.getFloat(getContext().getContentResolver(),
+                                                         android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f) == 0.0f;
+    }
+
     public void clearKeyboardCache() {
         if (!initialized) {
             return;
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java b/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
index ae6ee8b2e..689a63700 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
@@ -49,10 +49,6 @@ public class SettingsValues {
     public final Locale mLocale;
     public final boolean mHasHardwareKeyboard;
     public final int mDisplayOrientation;
-
-    // From system
-    public final boolean mAnimationDisabled;
-
     // From preferences
     public final boolean mAutoCap;
     public final boolean mVibrateOn;
@@ -163,8 +159,6 @@ public class SettingsValues {
         mDisplayOrientation = res.getConfiguration().orientation;
         final InputMethodSubtype selectedSubtype = SubtypeSettings.INSTANCE.getSelectedSubtype(prefs);
 
-        mAnimationDisabled = isAnimationDisabled(context);
-
         // Store the input attributes
         mInputAttributes = inputAttributes;
 
@@ -430,14 +424,4 @@ public class SettingsValues {
         sb.append("\n   mAppWorkarounds = ");
         return sb.toString();
     }
-
-    private static boolean isAnimationDisabled(Context context) {
-        return isZeroSetting(android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, context)
-            && isZeroSetting(android.provider.Settings.Global.TRANSITION_ANIMATION_SCALE, context)
-            && isZeroSetting(android.provider.Settings.Global.WINDOW_ANIMATION_SCALE, context);
-    }
-
-    private static boolean isZeroSetting(String name, Context context) {
-        return android.provider.Settings.Global.getFloat(context.getContentResolver(), name, 1.0f) == 0.0f;
-    }
 }