From b13342777856bc4024d8489de790e7f90cd6b33b Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 31 Jul 2020 10:41:20 -0700 Subject: [PATCH] Cleanup unsed code on AccessibilityInfoModule Summary: This diff cleansup unused code on AccessibilityInfoModule class changelog: [Android][Deprecated] Remove code used by deprecated Android API levels Reviewed By: JoshuaGross Differential Revision: D22771912 fbshipit-source-id: f32808fa93f75c10324e8875b85fe4e541b284b8 --- .../AccessibilityInfoModule.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 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 1b8998a5977f18..8ecb0d81f44168 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 @@ -90,12 +90,10 @@ public String getName() { return "AccessibilityInfo"; } + @TargetApi(Build.VERSION_CODES.KITKAT) private boolean getIsReduceMotionEnabledValue() { String value = - Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1 - ? null - : Settings.Global.getString( - mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE); + Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE); return value != null && value.equals("0.0"); } @@ -139,11 +137,10 @@ private void updateAndSendTouchExplorationChangeEvent(boolean enabled) { } @Override + @TargetApi(Build.VERSION_CODES.KITKAT) public void onHostResume() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - mAccessibilityManager.addTouchExplorationStateChangeListener( - mTouchExplorationStateChangeListener); - } + mAccessibilityManager.addTouchExplorationStateChangeListener( + mTouchExplorationStateChangeListener); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { Uri transitionUri = Settings.Global.getUriFor(Settings.Global.TRANSITION_ANIMATION_SCALE); @@ -155,15 +152,12 @@ public void onHostResume() { } @Override + @TargetApi(Build.VERSION_CODES.KITKAT) public void onHostPause() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - mAccessibilityManager.removeTouchExplorationStateChangeListener( - mTouchExplorationStateChangeListener); - } + mAccessibilityManager.removeTouchExplorationStateChangeListener( + mTouchExplorationStateChangeListener); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - mContentResolver.unregisterContentObserver(animationScaleObserver); - } + mContentResolver.unregisterContentObserver(animationScaleObserver); } @Override