This is an automated email from the ASF dual-hosted git repository.
dongyayun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new 20c034b Revert "[Android] fix Android9 inaccurate ScreenHeight
problem (#2536)" (#2544)
20c034b is described below
commit 20c034bd5be0122aeed1d7e18ec69ebf27bda8dc
Author: YorkShen <[email protected]>
AuthorDate: Thu Jun 13 15:18:37 2019 +0800
Revert "[Android] fix Android9 inaccurate ScreenHeight problem (#2536)"
(#2544)
This reverts commit 73c55cb9ff0cb68a74155ac862f89484b31f327b.
---
.../src/main/java/com/taobao/weex/utils/WXViewUtils.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
index 8d55daf..1f11344 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
@@ -24,7 +24,6 @@ import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Path;
import android.graphics.PixelFormat;
-import android.graphics.Point;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
@@ -37,8 +36,6 @@ import android.util.DisplayMetrics;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
-import android.view.WindowManager;
-
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
@@ -209,17 +206,8 @@ public class WXViewUtils {
public static int getScreenHeight(Context cxt) {
if(cxt!=null){
- WindowManager wm;
Resources res = cxt.getResources();
- if(Build.VERSION.SDK_INT >= 28 && (wm =
(WindowManager)cxt.getSystemService(Context.WINDOW_SERVICE)) != null
- && wm.getDefaultDisplay() != null){
- Point size = new Point();
- wm.getDefaultDisplay().getRealSize(size);
- mScreenHeight = size.y;
- }
- else {
- mScreenHeight = cxt.getResources().getDisplayMetrics().heightPixels;
- }
+ mScreenHeight =cxt.getResources().getDisplayMetrics().heightPixels;
if(WXEnvironment.SETTING_FORCE_VERTICAL_SCREEN){
mScreenWidth = res
.getDisplayMetrics()