From a434e48fa0bf61ff8da78a16757fcb4d7d8e9f1f Mon Sep 17 00:00:00 2001 From: AndyG Date: Thu, 18 Aug 2022 15:25:29 -0700 Subject: [PATCH 1/3] changed to check against float --- .../modules/accessibilityinfo/AccessibilityInfoModule.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java index 0ea17b3b52cda6..94f3b2ae892f2c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java @@ -108,10 +108,10 @@ public String getName() { @TargetApi(Build.VERSION_CODES.LOLLIPOP) private boolean getIsReduceMotionEnabledValue() { - String value = + String rawValue = Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE); - - return value != null && value.equals("0.0"); + float floatValue = Float.parseFloat(rawValue); + return value != null && value == 0f; } @Override From 772f19ba2aa3199e0495c0e0b3754dc152876a8b Mon Sep 17 00:00:00 2001 From: AndyG Date: Thu, 18 Aug 2022 15:53:54 -0700 Subject: [PATCH 2/3] refactor --- .../modules/accessibilityinfo/AccessibilityInfoModule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java index 94f3b2ae892f2c..db86d5db3be342 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java @@ -110,8 +110,7 @@ public String getName() { private boolean getIsReduceMotionEnabledValue() { String rawValue = Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE); - float floatValue = Float.parseFloat(rawValue); - return value != null && value == 0f; + return rawValue != null && Float.parseFloat(rawValue) == 0f; } @Override From ea3b2e0579b64b676d6ff011a6fa3f9e6d9b91c4 Mon Sep 17 00:00:00 2001 From: AndyG Date: Mon, 22 Aug 2022 10:44:28 -0700 Subject: [PATCH 3/3] use parseFloat --- .../modules/accessibilityinfo/AccessibilityInfoModule.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java index db86d5db3be342..02800eeda895b8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java @@ -108,9 +108,9 @@ public String getName() { @TargetApi(Build.VERSION_CODES.LOLLIPOP) private boolean getIsReduceMotionEnabledValue() { - String rawValue = - Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE); - return rawValue != null && Float.parseFloat(rawValue) == 0f; + float defaultAnimationScale = Float.parseFloat(Settings.Global.TRANSITION_ANIMATION_SCALE); + float animationScale = Settings.Global.getFloat(mContentResolver, defaultAnimationScale); + return animationScale == 0f; } @Override