You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/07/04 13:50:36 UTC

incubator-weex git commit: [WEEX-485][Android] fix slider bug: scroll when scrollable=false make index not work

Repository: incubator-weex
Updated Branches:
  refs/heads/master 35fd2057a -> 8ce1f1ee8


[WEEX-485][Android] fix slider bug: scroll when scrollable=false make index not work


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8ce1f1ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8ce1f1ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8ce1f1ee

Branch: refs/heads/master
Commit: 8ce1f1ee80d263d65fda91b8b5f54cdecc3ab01c
Parents: 35fd205
Author: qiyi <qi...@kaishiba.com>
Authored: Fri Jun 29 11:23:25 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Jul 4 21:50:27 2018 +0800

----------------------------------------------------------------------
 .../main/java/com/taobao/weex/ui/view/WXCircleViewPager.java    | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8ce1f1ee/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index f44f59a..4b51474 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -139,6 +139,11 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
   }
 
   @Override
+  public boolean onInterceptTouchEvent(MotionEvent ev) {
+    return scrollable && super.onInterceptTouchEvent(ev);
+  }
+
+  @Override
   public boolean onTouchEvent(MotionEvent ev) {
     if(!scrollable) {
       return true;