From dd016f334cef26f393b1a3c1e052e89a69502a56 Mon Sep 17 00:00:00 2001 From: Jonathan Keljo Date: Fri, 27 Oct 2017 00:46:03 -0700 Subject: [PATCH] Automated fixups for Instagram Reviewed By: dreiss Differential Revision: D6168048 fbshipit-source-id: 0e51319d93fd697db01ea3933f48cd06a6ffac12 --- .../src/main/java/com/facebook/react/bridge/BUCK | 1 + .../src/main/java/com/facebook/react/common/BUCK | 1 + .../devsupport/WebsocketJavaScriptExecutor.java | 16 ++++++---------- .../com/facebook/react/module/annotations/BUCK | 1 + .../main/java/com/facebook/react/uimanager/BUCK | 1 + .../facebook/react/uimanager/annotations/BUCK | 1 + .../layoutanimation/OpacityAnimation.java | 2 +- .../java/com/facebook/react/views/image/BUCK | 1 + .../react/views/view/ReactViewGroup.java | 13 +++++++------ .../react/views/viewpager/ReactViewPager.java | 8 +++----- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index 4e331f8cc7372d..e853d9cb477ac4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -12,6 +12,7 @@ android_library( provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], + required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK index 8fdc365010c729..d6db0ab25fe831 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK @@ -16,6 +16,7 @@ android_library( provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], + required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java index 49d8bc08bf28df..858f7e004c790a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java @@ -9,17 +9,14 @@ package com.facebook.react.devsupport; -import javax.annotation.Nullable; - -import java.util.HashMap; -import java.util.concurrent.Semaphore; -import java.util.concurrent.atomic.AtomicInteger; - import android.os.Handler; import android.os.Looper; - import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.JavaJSExecutor; +import java.util.HashMap; +import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nullable; /** * Executes JS remotely via the react nodejs server as a proxy to a browser on the host machine. @@ -160,8 +157,7 @@ public void close() { } @Override - public void loadApplicationScript(String sourceURL) - throws ProxyExecutorException { + public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyExecutorException { JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture(); Assertions.assertNotNull(mWebSocketClient).loadApplicationScript( sourceURL, @@ -176,7 +172,7 @@ public void loadApplicationScript(String sourceURL) @Override public @Nullable String executeJSCall(String methodName, String jsonArgsArray) - throws ProxyExecutorException { + throws JavaJSExecutor.ProxyExecutorException { JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture(); Assertions.assertNotNull(mWebSocketClient).executeJSCall( methodName, diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK index 02e0158396ddb5..e664393351539a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK @@ -3,6 +3,7 @@ include_defs("//ReactAndroid/DEFS") android_library( name = "annotations", srcs = glob(["**/*.java"]), + required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK index 98ae5be6058e5b..5f528cb784c29f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK @@ -14,6 +14,7 @@ android_library( provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], + required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK index 32582caafa05b3..0e29b5df43580a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK @@ -3,6 +3,7 @@ include_defs("//ReactAndroid/DEFS") android_library( name = "annotations", srcs = glob(["*.java"]), + required_for_source_only_abi = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java index a7ad690023c500..033b6a4ae15ff7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java @@ -12,7 +12,7 @@ */ /* package */ class OpacityAnimation extends Animation { - static class OpacityAnimationListener implements AnimationListener { + static class OpacityAnimationListener implements Animation.AnimationListener { private final View mView; private boolean mLayerTypeChanged = false; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK index 95a7e964cc610b..116dce94d27412 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -11,6 +11,7 @@ android_library( react_native_dep("third-party/android/support-annotations:android-support-annotations"), react_native_dep("third-party/android/support/v4:lib-support-v4"), ], + required_for_source_only_abi = True, visibility = ["PUBLIC"], deps = [ react_native_dep("third-party/java/jsr-305:jsr-305"), 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 5eb69711286c89..592f328e9663ff 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,13 +54,13 @@ public class ReactViewGroup extends ViewGroup implements /** * This listener will be set for child views when removeClippedSubview property is enabled. When - * children layout is updated, it will call {@link #updateSubviewClipStatus} to notify parent - * view about that fact so that view can be attached/detached if necessary. + * children layout is updated, it will call {@link #updateSubviewClipStatus} to notify parent view + * about that fact so that view can be attached/detached if necessary. * - * TODO(7728005): Attach/detach views in batch - once per frame in case when multiple children + *

TODO(7728005): Attach/detach views in batch - once per frame in case when multiple children * update their layout. */ - private static final class ChildrenLayoutChangeListener implements OnLayoutChangeListener { + private static final class ChildrenLayoutChangeListener implements View.OnLayoutChangeListener { private final ReactViewGroup mParent; @@ -396,7 +396,7 @@ protected void onAttachedToWindow() { } @Override - public void addView(View child, int index, LayoutParams params) { + public void addView(View child, int index, ViewGroup.LayoutParams params) { // This will get called for every overload of addView so there is not need to override every method. mDrawingOrderHelper.handleAddView(child); setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder()); @@ -468,7 +468,8 @@ protected void dispatchSetPressed(boolean pressed) { addViewWithSubviewClippingEnabled(child, index, sDefaultLayoutParam); } - /*package*/ void addViewWithSubviewClippingEnabled(View child, int index, LayoutParams params) { + /*package*/ void addViewWithSubviewClippingEnabled( + View child, int index, ViewGroup.LayoutParams params) { Assertions.assertCondition(mRemoveClippedSubviews); Assertions.assertNotNull(mClippingRect); Assertions.assertNotNull(mAllChildren); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java index 7ed36557135dd0..9a76bace545907 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java @@ -9,19 +9,17 @@ package com.facebook.react.views.viewpager; -import java.util.ArrayList; -import java.util.List; - import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; - import com.facebook.react.bridge.ReactContext; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.react.uimanager.events.NativeGestureUtil; +import java.util.ArrayList; +import java.util.List; /** * Wrapper view for {@link ViewPager}. It's forwarding calls to {@link ViewGroup#addView} to add @@ -118,7 +116,7 @@ public boolean isViewFromObject(View view, Object object) { } } - private class PageChangeListener implements OnPageChangeListener { + private class PageChangeListener implements ViewPager.OnPageChangeListener { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {