From bd1560430a9bdc7debb17b1169dec2227f2d3083 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 2 Feb 2019 12:56:38 +0800 Subject: [PATCH 1/2] remove deprecated setBackgroundDrawable use --- .../com/facebook/react/views/common/ViewHelper.java | 10 ++-------- .../com/facebook/react/views/view/ReactViewGroup.java | 6 +----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java index b827ff629db4c1..ee536db52667e8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/ViewHelper.java @@ -6,7 +6,6 @@ package com.facebook.react.views.common; import android.graphics.drawable.Drawable; -import android.os.Build; import android.view.View; /** Helper class for Views */ @@ -14,18 +13,13 @@ public class ViewHelper { /** * Set the background to a given Drawable, or remove the background. It calls {@link - * View#setBackground(Drawable)} or {@link View#setBackgroundDrawable(Drawable)} based on the sdk - * version. + * View#setBackground(Drawable)}. * * @param view {@link View} to apply the background. * @param drawable {@link Drawable} The Drawable to use as the background, or null to remove the * background */ public static void setBackground(View view, Drawable drawable) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - view.setBackground(drawable); - } else { - view.setBackgroundDrawable(drawable); - } + view.setBackground(drawable); } } 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 d06f1b0395edd7..3efb88ebee646c 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 @@ -674,11 +674,7 @@ public void setOverflow(String overflow) { * background */ private void updateBackgroundDrawable(Drawable drawable) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - super.setBackground(drawable); - } else { - super.setBackgroundDrawable(drawable); - } + super.setBackground(drawable); } @Override From 184549a31289c70e1bcf44e1a9c8ae5ece5c70b0 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 2 Feb 2019 13:01:06 +0800 Subject: [PATCH 2/2] remove comment mentioning setBackgroundDrawable --- .../main/java/com/facebook/react/views/view/ReactViewGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3efb88ebee646c..eda4bb190611af 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 @@ -668,7 +668,7 @@ public void setOverflow(String overflow) { /** * Set the background for the view or remove the background. It calls {@link - * #setBackground(Drawable)} or {@link #setBackgroundDrawable(Drawable)} based on the sdk version. + * #setBackground(Drawable)}. * * @param drawable {@link Drawable} The Drawable to use as the background, or null to remove the * background