From 796122d8f3b825c0bf0c138c662f3477f8bab123 Mon Sep 17 00:00:00 2001 From: Mike Grabowski Date: Wed, 10 Jan 2018 15:24:16 +0100 Subject: [PATCH] Revert "Automated fixups for Instagram" This reverts commit dd016f334cef26f393b1a3c1e052e89a69502a56. --- .../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, 22 insertions(+), 23 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index e853d9cb477ac4..4e331f8cc7372d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -12,7 +12,6 @@ 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 d6db0ab25fe831..8fdc365010c729 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK @@ -16,7 +16,6 @@ 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 858f7e004c790a..49d8bc08bf28df 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java @@ -9,14 +9,17 @@ 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. @@ -157,7 +160,8 @@ public void close() { } @Override - public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyExecutorException { + public void loadApplicationScript(String sourceURL) + throws ProxyExecutorException { JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture(); Assertions.assertNotNull(mWebSocketClient).loadApplicationScript( sourceURL, @@ -172,7 +176,7 @@ public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyE @Override public @Nullable String executeJSCall(String methodName, String jsonArgsArray) - throws JavaJSExecutor.ProxyExecutorException { + throws 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 e664393351539a..02e0158396ddb5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK @@ -3,7 +3,6 @@ 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 5f528cb784c29f..98ae5be6058e5b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK @@ -14,7 +14,6 @@ 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 0e29b5df43580a..32582caafa05b3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK @@ -3,7 +3,6 @@ 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 033b6a4ae15ff7..a7ad690023c500 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 Animation.AnimationListener { + static class OpacityAnimationListener implements 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 116dce94d27412..95a7e964cc610b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -11,7 +11,6 @@ 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 e0984f86e09cac..2c7900d0a6d3bf 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 View.OnLayoutChangeListener { + private static final class ChildrenLayoutChangeListener implements OnLayoutChangeListener { private final ReactViewGroup mParent; @@ -422,7 +422,7 @@ protected void onAttachedToWindow() { } @Override - public void addView(View child, int index, ViewGroup.LayoutParams params) { + public void addView(View child, int index, 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()); @@ -494,8 +494,7 @@ protected void dispatchSetPressed(boolean pressed) { addViewWithSubviewClippingEnabled(child, index, sDefaultLayoutParam); } - /*package*/ void addViewWithSubviewClippingEnabled( - View child, int index, ViewGroup.LayoutParams params) { + /*package*/ void addViewWithSubviewClippingEnabled(View child, int index, 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 9a76bace545907..7ed36557135dd0 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,17 +9,19 @@ 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 @@ -116,7 +118,7 @@ public boolean isViewFromObject(View view, Object object) { } } - private class PageChangeListener implements ViewPager.OnPageChangeListener { + private class PageChangeListener implements OnPageChangeListener { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {