From 81c184dce1a50a5c1635ea19df8247d00df7bff9 Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Fri, 23 Oct 2020 19:47:47 -0700 Subject: [PATCH] Followup to D24379607, update minsdk Summary: Followup to D24379607 (https://github.com/facebook/react-native/commit/a17ff44adcf003dd4e4ef2301e1f80b77913f712), update target SDK scattered throughout code Changelog: [Internal] Reviewed By: ejanzer Differential Revision: D24510634 fbshipit-source-id: 356e172027e48db498253dcb15373007f42db292 --- .../fabric/mounting/mountitems/UpdateLayoutMountItem.java | 2 +- .../accessibilityinfo/AccessibilityInfoModule.java | 8 ++++---- .../react/views/view/ReactViewBackgroundDrawable.java | 4 ++-- .../com/facebook/react/views/view/ReactViewGroup.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java index 3db91ed740c..cd8edd887e2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/UpdateLayoutMountItem.java @@ -33,7 +33,7 @@ public class UpdateLayoutMountItem implements MountItem { } // TODO move this from here - @TargetApi(Build.VERSION_CODES.KITKAT) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private static int convertLayoutDirection(int layoutDirection) { switch (layoutDirection) { case 0: 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 81f4a24c0c4..85a2ac54f2e 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 @@ -36,7 +36,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec public static final String NAME = "AccessibilityInfo"; - @TargetApi(Build.VERSION_CODES.KITKAT) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private class ReactTouchExplorationStateChangeListener implements AccessibilityManager.TouchExplorationStateChangeListener { @@ -87,7 +87,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec return "AccessibilityInfo"; } - @TargetApi(Build.VERSION_CODES.KITKAT) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private boolean getIsReduceMotionEnabledValue() { String value = Settings.Global.getString(mContentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE); @@ -134,7 +134,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec } @Override - @TargetApi(Build.VERSION_CODES.KITKAT) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) public void onHostResume() { mAccessibilityManager.addTouchExplorationStateChangeListener( mTouchExplorationStateChangeListener); @@ -147,7 +147,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec } @Override - @TargetApi(Build.VERSION_CODES.KITKAT) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) public void onHostPause() { mAccessibilityManager.removeTouchExplorationStateChangeListener( mTouchExplorationStateChangeListener); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java index add0c3e6163..9065f4bc49f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java @@ -7,7 +7,7 @@ package com.facebook.react.views.view; -import static android.os.Build.VERSION_CODES.KITKAT; +import static android.os.Build.VERSION_CODES.LOLLIPOP; import android.annotation.TargetApi; import android.content.Context; @@ -1235,7 +1235,7 @@ public class ReactViewBackgroundDrawable extends Drawable { return ReactViewBackgroundDrawable.colorFromAlphaAndRGBComponents(alpha, rgb); } - @TargetApi(KITKAT) + @TargetApi(LOLLIPOP) public RectF getDirectionAwareBorderInsets() { final float borderWidth = getBorderWidthOrDefaultTo(0, Spacing.ALL); final float borderTopWidth = getBorderWidthOrDefaultTo(borderWidth, Spacing.TOP); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java index 30d29b70f92..20e916290cf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java @@ -54,7 +54,7 @@ import com.facebook.yoga.YogaConstants; * Backing for a React View. Has support for borders, but since borders aren't common, lazy * initializes most of the storage needed for them. */ -@TargetApi(Build.VERSION_CODES.KITKAT) +@TargetApi(Build.VERSION_CODES.LOLLIPOP) public class ReactViewGroup extends ViewGroup implements ReactInterceptingViewGroup, ReactClippingViewGroup,