From 9b261dbc94e6aa0e208d5f0ad07143e272e40ad6 Mon Sep 17 00:00:00 2001 From: Andrei Coman Date: Fri, 30 Sep 2016 03:09:29 -0700 Subject: [PATCH] Modal statusbar cleanup Summary: The hack for the status bar height is not necessary any longer, so we can remove all code related to it Reviewed By: lexs Differential Revision: D3943770 fbshipit-source-id: 2d70f4ea10dd76ea6e6a73bb6edccae388bde1c0 --- .../react/shell/MainReactPackage.java | 2 +- .../views/modal/ReactModalHostManager.java | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java index bf65ce84112..04bf5866adb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java +++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java @@ -233,7 +233,7 @@ public class MainReactPackage extends LazyReactPackage { new ReactDropdownPickerManager(), new ReactHorizontalScrollViewManager(), new ReactImageManager(), - new ReactModalHostManager(reactContext), + new ReactModalHostManager(), new ReactProgressBarViewManager(), new ReactRawTextManager(), new ReactScrollViewManager(), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java index 49b6d63e8ab..a505f80c5b0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java @@ -9,16 +9,12 @@ package com.facebook.react.views.modal; -import javax.annotation.Nullable; - import java.util.Map; import android.content.DialogInterface; -import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.common.MapBuilder; import com.facebook.react.uimanager.LayoutShadowNode; -import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.ViewGroupManager; @@ -32,12 +28,6 @@ public class ReactModalHostManager extends ViewGroupManager private static final String REACT_CLASS = "RCTModalHostView"; - private final ReactApplicationContext mContext; - - public ReactModalHostManager(ReactApplicationContext context) { - mContext = context; - } - @Override public String getName() { return REACT_CLASS; @@ -104,17 +94,6 @@ public class ReactModalHostManager extends ViewGroupManager .build(); } - @Override - public @Nullable Map getExportedViewConstants() { - final int heightResId = mContext.getResources().getIdentifier("status_bar_height", "dimen", "android"); - final float height = heightResId > 0 ? - PixelUtil.toDIPFromPixel(mContext.getResources().getDimensionPixelSize(heightResId)) : - 0; - - return MapBuilder.of( - "StatusBarHeight", height); - } - @Override protected void onAfterUpdateTransaction(ReactModalHostView view) { super.onAfterUpdateTransaction(view);