Skip to content

Commit 796122d

Browse files
committedJan 10, 2018
Revert "Automated fixups for Instagram"
This reverts commit dd016f3.
1 parent aebb34a commit 796122d

File tree

10 files changed

+22
-23
lines changed

10 files changed

+22
-23
lines changed
 

‎ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ android_library(
1212
provided_deps = [
1313
react_native_dep("third-party/android/support/v4:lib-support-v4"),
1414
],
15-
required_for_source_only_abi = True,
1615
visibility = [
1716
"PUBLIC",
1817
],

‎ReactAndroid/src/main/java/com/facebook/react/common/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ android_library(
1616
provided_deps = [
1717
react_native_dep("third-party/android/support/v4:lib-support-v4"),
1818
],
19-
required_for_source_only_abi = True,
2019
visibility = [
2120
"PUBLIC",
2221
],

‎ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99

1010
package com.facebook.react.devsupport;
1111

12+
import javax.annotation.Nullable;
13+
14+
import java.util.HashMap;
15+
import java.util.concurrent.Semaphore;
16+
import java.util.concurrent.atomic.AtomicInteger;
17+
1218
import android.os.Handler;
1319
import android.os.Looper;
20+
1421
import com.facebook.infer.annotation.Assertions;
1522
import com.facebook.react.bridge.JavaJSExecutor;
16-
import java.util.HashMap;
17-
import java.util.concurrent.Semaphore;
18-
import java.util.concurrent.atomic.AtomicInteger;
19-
import javax.annotation.Nullable;
2023

2124
/**
2225
* 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() {
157160
}
158161

159162
@Override
160-
public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyExecutorException {
163+
public void loadApplicationScript(String sourceURL)
164+
throws ProxyExecutorException {
161165
JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture();
162166
Assertions.assertNotNull(mWebSocketClient).loadApplicationScript(
163167
sourceURL,
@@ -172,7 +176,7 @@ public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyE
172176

173177
@Override
174178
public @Nullable String executeJSCall(String methodName, String jsonArgsArray)
175-
throws JavaJSExecutor.ProxyExecutorException {
179+
throws ProxyExecutorException {
176180
JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture();
177181
Assertions.assertNotNull(mWebSocketClient).executeJSCall(
178182
methodName,

‎ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS")
33
android_library(
44
name = "annotations",
55
srcs = glob(["**/*.java"]),
6-
required_for_source_only_abi = True,
76
visibility = [
87
"PUBLIC",
98
],

‎ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ android_library(
1414
provided_deps = [
1515
react_native_dep("third-party/android/support/v4:lib-support-v4"),
1616
],
17-
required_for_source_only_abi = True,
1817
visibility = [
1918
"PUBLIC",
2019
],

‎ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS")
33
android_library(
44
name = "annotations",
55
srcs = glob(["*.java"]),
6-
required_for_source_only_abi = True,
76
visibility = [
87
"PUBLIC",
98
],

‎ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
/* package */ class OpacityAnimation extends Animation {
1414

15-
static class OpacityAnimationListener implements Animation.AnimationListener {
15+
static class OpacityAnimationListener implements AnimationListener {
1616

1717
private final View mView;
1818
private boolean mLayerTypeChanged = false;

‎ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ android_library(
1111
react_native_dep("third-party/android/support-annotations:android-support-annotations"),
1212
react_native_dep("third-party/android/support/v4:lib-support-v4"),
1313
],
14-
required_for_source_only_abi = True,
1514
visibility = ["PUBLIC"],
1615
deps = [
1716
react_native_dep("third-party/java/jsr-305:jsr-305"),

‎ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public class ReactViewGroup extends ViewGroup implements
5454

5555
/**
5656
* This listener will be set for child views when removeClippedSubview property is enabled. When
57-
* children layout is updated, it will call {@link #updateSubviewClipStatus} to notify parent view
58-
* about that fact so that view can be attached/detached if necessary.
57+
* children layout is updated, it will call {@link #updateSubviewClipStatus} to notify parent
58+
* view about that fact so that view can be attached/detached if necessary.
5959
*
60-
* <p>TODO(7728005): Attach/detach views in batch - once per frame in case when multiple children
60+
* TODO(7728005): Attach/detach views in batch - once per frame in case when multiple children
6161
* update their layout.
6262
*/
63-
private static final class ChildrenLayoutChangeListener implements View.OnLayoutChangeListener {
63+
private static final class ChildrenLayoutChangeListener implements OnLayoutChangeListener {
6464

6565
private final ReactViewGroup mParent;
6666

@@ -422,7 +422,7 @@ protected void onAttachedToWindow() {
422422
}
423423

424424
@Override
425-
public void addView(View child, int index, ViewGroup.LayoutParams params) {
425+
public void addView(View child, int index, LayoutParams params) {
426426
// This will get called for every overload of addView so there is not need to override every method.
427427
mDrawingOrderHelper.handleAddView(child);
428428
setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
@@ -494,8 +494,7 @@ protected void dispatchSetPressed(boolean pressed) {
494494
addViewWithSubviewClippingEnabled(child, index, sDefaultLayoutParam);
495495
}
496496

497-
/*package*/ void addViewWithSubviewClippingEnabled(
498-
View child, int index, ViewGroup.LayoutParams params) {
497+
/*package*/ void addViewWithSubviewClippingEnabled(View child, int index, LayoutParams params) {
499498
Assertions.assertCondition(mRemoveClippedSubviews);
500499
Assertions.assertNotNull(mClippingRect);
501500
Assertions.assertNotNull(mAllChildren);

‎ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@
99

1010
package com.facebook.react.views.viewpager;
1111

12+
import java.util.ArrayList;
13+
import java.util.List;
14+
1215
import android.support.v4.view.PagerAdapter;
1316
import android.support.v4.view.ViewPager;
1417
import android.view.MotionEvent;
1518
import android.view.View;
1619
import android.view.ViewGroup;
20+
1721
import com.facebook.react.bridge.ReactContext;
1822
import com.facebook.react.uimanager.UIManagerModule;
1923
import com.facebook.react.uimanager.events.EventDispatcher;
2024
import com.facebook.react.uimanager.events.NativeGestureUtil;
21-
import java.util.ArrayList;
22-
import java.util.List;
2325

2426
/**
2527
* 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) {
116118
}
117119
}
118120

119-
private class PageChangeListener implements ViewPager.OnPageChangeListener {
121+
private class PageChangeListener implements OnPageChangeListener {
120122

121123
@Override
122124
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {

0 commit comments

Comments
 (0)
Please sign in to comment.