From ae3dad86c5f10d454884ed041c0a6539f34441cd Mon Sep 17 00:00:00 2001 From: Martin Konicek Date: Thu, 31 Mar 2016 06:40:23 -0700 Subject: [PATCH] Revert "Android support for perspective transform" Summary:This reverts "Android support for perspective transform": 3e760f48c5a28b592cb60c4060ca28a1574f6274, PR https://github.com/facebook/react-native/pull/6159, D3053532. It broke negative scale transforms: https://github.com/facebook/react-native/issues/6622 Reviewed By: bestander Differential Revision: D3120627 fb-gh-sync-id: 727528d39c049180fe4862d006f2089c997afd45 fbshipit-source-id: 727528d39c049180fe4862d006f2089c997afd45 --- .../react/uimanager/BaseViewManager.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java index 12fbae977..9a697ce3a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -6,10 +6,8 @@ import android.graphics.Color; import android.os.Build; import android.view.View; -import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.uimanager.annotations.ReactProp; -import com.facebook.react.uimanager.DisplayMetricsHolder; /** * Base class that should be suitable for the majority of subclasses of {@link ViewManager}. @@ -27,7 +25,6 @@ public abstract class BaseViewManager PERSPECTIVE_ARRAY_INVERTED_CAMERA_DISTANCE_INDEX) { - float cameraDistance = (float)(-1 / perspectiveArray.getDouble(PERSPECTIVE_ARRAY_INVERTED_CAMERA_DISTANCE_INDEX)); - float scale = DisplayMetricsHolder.getScreenDisplayMetrics().density; - - // The following converts the matrix's perspective to a camera distance - // such that the camera perspective looks the same on Android and iOS - float normalizedCameraDistance = scale * cameraDistance * CAMERA_DISTANCE_NORMALIZATION_MULTIPLIER; - - view.setCameraDistance(normalizedCameraDistance); - } - } } private static void resetTransformMatrix(View view) { @@ -194,4 +175,4 @@ public abstract class BaseViewManager