From 3b9604feda8f9e8fe3dd884912ec7d9be67d7f1d Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 5 Feb 2019 12:06:31 -0800 Subject: [PATCH] ReactActivity extends AppCompatActivity (#23278) Summary: Google recommends to extend AppCompatActivity. and This PR changes ReactActivity to extend AppCompatActivity [Android] [Changed] - ReactActivity extends AppCompatActivity Pull Request resolved: https://github.com/facebook/react-native/pull/23278 Reviewed By: fkgozali Differential Revision: D13937917 Pulled By: mdvacca fbshipit-source-id: 4216482b30349b24e3cbf2bdc24d9a890744132f --- ReactAndroid/src/main/java/com/facebook/react/BUCK | 2 +- .../src/main/java/com/facebook/react/ReactActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK index bab7db08b..311580f08 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK @@ -4,8 +4,8 @@ rn_android_library( name = "react", srcs = glob(["*.java"]), provided_deps = [ + react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), react_native_dep("third-party/android/support/v4:lib-support-v4"), - react_native_dep("third-party/android/support-annotations:android-support-annotations"), ], visibility = [ "PUBLIC", diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java index 05609205a..62283794e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java @@ -11,7 +11,7 @@ import javax.annotation.Nullable; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import android.support.v7.app.AppCompatActivity; import android.view.KeyEvent; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; @@ -21,7 +21,7 @@ import com.facebook.react.modules.core.PermissionListener; /** * Base Activity for React Native applications. */ -public abstract class ReactActivity extends FragmentActivity +public abstract class ReactActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, PermissionAwareActivity { private final ReactActivityDelegate mDelegate;