From 1604f1088959428fab8cd4d3c451585d914464a9 Mon Sep 17 00:00:00 2001 From: leeight Date: Fri, 18 Nov 2016 05:57:29 -0800 Subject: [PATCH] Cleanup import * Summary: Cleanup import * from some java files. **Test plan (required)** manually run `./scripts/run-android-local-unit-tests.sh` Closes https://github.com/facebook/react-native/pull/11009 Differential Revision: D4204415 Pulled By: javache fbshipit-source-id: 52579c05f44471988671e7dcdcf6109203e20929 --- .../facebook/react/cxxbridge/CallbackImpl.java | 3 ++- .../facebook/react/views/view/ReactViewGroup.java | 15 ++++++++------- .../react/views/view/ReactViewManager.java | 6 +++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CallbackImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CallbackImpl.java index 6c5f27ae3..76d83ea32 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CallbackImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CallbackImpl.java @@ -4,7 +4,8 @@ package com.facebook.react.cxxbridge; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.*; +import com.facebook.react.bridge.Callback; +import com.facebook.react.bridge.NativeArray; import static com.facebook.react.bridge.Arguments.*; 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 957503447..f69abaf02 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 @@ -26,15 +26,18 @@ import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.touch.ReactHitSlopView; import com.facebook.react.touch.ReactInterceptingViewGroup; import com.facebook.react.touch.OnInterceptTouchEventListener; -import com.facebook.react.uimanager.*; +import com.facebook.react.uimanager.MeasureSpecAssertions; +import com.facebook.react.uimanager.PointerEvents; +import com.facebook.react.uimanager.ReactClippingViewGroup; import com.facebook.react.uimanager.ReactClippingViewGroupHelper; +import com.facebook.react.uimanager.ReactPointerEventsView; /** * Backing for a React View. Has support for borders, but since borders aren't common, lazy * initializes most of the storage needed for them. */ public class ReactViewGroup extends ViewGroup implements - ReactInterceptingViewGroup, com.facebook.react.uimanager.ReactClippingViewGroup, ReactPointerEventsView, ReactHitSlopView { + ReactInterceptingViewGroup, ReactClippingViewGroup, ReactPointerEventsView, ReactHitSlopView { private static final int ARRAY_CAPACITY_INCREMENT = 12; private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT; @@ -224,8 +227,7 @@ public class ReactViewGroup extends ViewGroup implements mRemoveClippedSubviews = removeClippedSubviews; if (removeClippedSubviews) { mClippingRect = new Rect(); - com.facebook.react.uimanager.ReactClippingViewGroupHelper - .calculateClippingRect(this, mClippingRect); + ReactClippingViewGroupHelper.calculateClippingRect(this, mClippingRect); mAllChildrenCount = getChildCount(); int initialSize = Math.max(12, mAllChildrenCount); mAllChildren = new View[initialSize]; @@ -315,11 +317,10 @@ public class ReactViewGroup extends ViewGroup implements needUpdateClippingRecursive = true; } if (needUpdateClippingRecursive) { - if (child instanceof com.facebook.react.uimanager.ReactClippingViewGroup) { + if (child instanceof ReactClippingViewGroup) { // we don't use {@link sHelperRect} until the end of this loop, therefore it's safe // to call this method that may write to the same {@link sHelperRect} object. - com.facebook.react.uimanager.ReactClippingViewGroup - clippingChild = (com.facebook.react.uimanager.ReactClippingViewGroup) child; + ReactClippingViewGroup clippingChild = (ReactClippingViewGroup) child; if (clippingChild.getRemoveClippedSubviews()) { clippingChild.updateClippingRect(); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java index a04ea4839..450e24085 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java @@ -27,7 +27,11 @@ import com.facebook.react.bridge.ReadableMap; import com.facebook.react.common.MapBuilder; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.module.annotations.ReactModule; -import com.facebook.react.uimanager.*; +import com.facebook.react.uimanager.PixelUtil; +import com.facebook.react.uimanager.PointerEvents; +import com.facebook.react.uimanager.ThemedReactContext; +import com.facebook.react.uimanager.ViewGroupManager; +import com.facebook.react.uimanager.ViewProps; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.annotations.ReactPropGroup;