From 406a1b3ca23cb565a7a7018314b0addb0d7dd5a4 Mon Sep 17 00:00:00 2001 From: Aaron Chiu Date: Mon, 12 Sep 2016 05:46:15 -0700 Subject: [PATCH] move com.facebook.react.Lifecycle to com.facebook.react.common.Lifecycle Reviewed By: lexs Differential Revision: D3849487 fbshipit-source-id: 3f21969e092ccef9cad610ae86198de41b2f6552 --- .../com/facebook/react/testing/ReactAppTestActivity.java | 6 +++--- .../main/java/com/facebook/react/ReactInstanceManager.java | 3 ++- .../src/main/java/com/facebook/react/ReactNativeHost.java | 1 + .../java/com/facebook/react/XReactInstanceManagerImpl.java | 1 + .../com/facebook/react/{ => common}/LifecycleState.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) rename ReactAndroid/src/main/java/com/facebook/react/{ => common}/LifecycleState.java (95%) diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java index e3799fda8..4e84fdab2 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java @@ -21,11 +21,11 @@ import android.view.ViewTreeObserver; import android.widget.FrameLayout; import com.facebook.infer.annotation.Assertions; -import com.facebook.react.bridge.ReactContext; -import com.facebook.react.LifecycleState; -import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactRootView; +import com.facebook.react.bridge.ReactContext; +import com.facebook.react.common.LifecycleState; +import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.shell.MainReactPackage; import com.facebook.react.uimanager.UIImplementationProvider; diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index cd5774fce..d5c2c739c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -23,8 +23,9 @@ import com.facebook.react.bridge.NativeModuleCallExceptionHandler; import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContext; -import com.facebook.react.cxxbridge.JSBundleLoader; import com.facebook.react.common.annotations.VisibleForTesting; +import com.facebook.react.common.LifecycleState; +import com.facebook.react.cxxbridge.JSBundleLoader; import com.facebook.react.devsupport.DevSupportManager; import com.facebook.react.devsupport.RedBoxHandler; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java index 0639b8067..2e341460c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java @@ -16,6 +16,7 @@ import java.util.List; import android.app.Application; import com.facebook.infer.annotation.Assertions; +import com.facebook.react.common.LifecycleState; import com.facebook.react.devsupport.RedBoxHandler; import com.facebook.react.uimanager.UIImplementationProvider; diff --git a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java index a464ecb2a..618cf61a5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java @@ -45,6 +45,7 @@ import com.facebook.react.bridge.WritableMap; import com.facebook.react.bridge.WritableNativeMap; import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec; import com.facebook.react.common.ApplicationHolder; +import com.facebook.react.common.LifecycleState; import com.facebook.react.common.ReactConstants; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.cxxbridge.Arguments; diff --git a/ReactAndroid/src/main/java/com/facebook/react/LifecycleState.java b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java similarity index 95% rename from ReactAndroid/src/main/java/com/facebook/react/LifecycleState.java rename to ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java index 068bd063f..f6e4843b0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/LifecycleState.java +++ b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -package com.facebook.react; +package com.facebook.react.common; /** * Lifecycle state for an Activity. The state right after pause and right before resume are the