From cf0a0eff1b965bbbfb0f6c1323054ddc9d4ec210 Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Mon, 27 Jun 2022 14:45:40 -0700 Subject: [PATCH] Add two more version checks for ReactTextView recycling Summary: setFocusable(int) was added in Android O, and setHyphenationFreqauency was added in M. Changelog: [Internal] Reviewed By: kacieb Differential Revision: D37462117 fbshipit-source-id: e59d2de49dbdcddfdba25def6bb39695c65efe89 --- .../java/com/facebook/react/views/text/ReactTextView.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java index 1541c4e6ecb..e5e405682f0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java @@ -140,9 +140,13 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie // mViewFlags = SOUND_EFFECTS_ENABLED | HAPTIC_FEEDBACK_ENABLED | // LAYOUT_DIRECTION_INHERIT; setEnabled(true); - setFocusable(View.FOCUSABLE_AUTO); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + setFocusable(View.FOCUSABLE_AUTO); + } - setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE); + } updateView(); // call after changing ellipsizeLocation in particular }