You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/11/16 10:12:39 UTC
[1/2] incubator-weex git commit: revert clip path targetview judge.
Repository: incubator-weex
Updated Branches:
refs/heads/master 6561069f7 -> fb6673727
revert clip path targetview judge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d1af84c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d1af84c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d1af84c4
Branch: refs/heads/master
Commit: d1af84c41402c5671aaa03644afcc33689f765c4
Parents: 3c3536a
Author: 行久 <yi...@alibaba-inc.com>
Authored: Thu Nov 16 17:44:19 2017 +0800
Committer: 行久 <yi...@alibaba-inc.com>
Committed: Thu Nov 16 17:44:19 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/utils/WXViewUtils.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1af84c4/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
----------------------------------------------------------------------
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 da90490..3a9f73b 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
@@ -432,22 +432,9 @@ public class WXViewUtils {
private static boolean clipCanvasIfAnimationExist(View targetView) {
if (Build.VERSION.SDK_INT != VERSION_CODES.N) {
return true;
+ } else {
+ return false;
}
- if(targetView != null &&
- targetView.getScaleX() == 1 &&
- targetView.getScaleY() == 1 &&
- targetView.getTranslationX() == 0 &&
- targetView.getTranslationY() == 0 &&
- targetView.getRotation() == 0 &&
- targetView.getRotationX() == 0 &&
- targetView.getRotationY() == 0) {
- if(Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && targetView.getTranslationZ() != 0 ) {
- return false;
- } else {
- return true;
- }
- }
- return false;
}
/**
[2/2] incubator-weex git commit: * [android] revert clip path
targetview judge.
Posted by gu...@apache.org.
* [android] revert clip path targetview judge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fb667372
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fb667372
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fb667372
Branch: refs/heads/master
Commit: fb6673727774421e38aef9f2138b47a55899993f
Parents: 6561069 d1af84c
Author: gurisxie <27...@qq.com>
Authored: Thu Nov 16 18:11:52 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Thu Nov 16 18:12:29 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/utils/WXViewUtils.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------