Revert "Automated fixups for Instagram"

This reverts commit dd016f3.
facebook · Jan 10, 2018 · 796122d · 796122d
1 parent aebb34a
commit 796122d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...tAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java b/...tAndroid/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
@@ -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
@@ -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.
    *
-   * <p>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
@@ -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) {