Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7d9492af Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7d9492af Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7d9492af Branch: refs/heads/0.16-dev Commit: 7d9492afe0ce032bd0bd5f13a73a5a0c572f5657 Parents: 64bb75d 77fff9f Author: misakuo <misa...@apache.org> Authored: Wed Aug 16 12:08:44 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Wed Aug 16 12:08:44 2017 +0800 ---------------------------------------------------------------------- android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes .../java/com/taobao/weex/common/Constants.java | 1 + .../weex/dom/action/GetComponentRectAction.java | 12 ---- .../weex/ui/component/ContentMeasurable.java | 29 ---------- .../taobao/weex/ui/component/WXScroller.java | 16 +----- .../com/taobao/weex/ui/component/WXSlider.java | 6 +- .../ui/component/list/BasicListComponent.java | 18 +----- .../weex/ui/view/WXBaseCircleIndicator.java | 3 +- .../taobao/weex/ui/view/WXCircleViewPager.java | 57 ++++++++----------- .../ui/view/refresh/core/WXSwipeLayout.java | 15 ++++- .../ui/view/refresh/wrapper/BaseBounceView.java | 2 +- examples/vue/market/gcanvas.vue | 10 +++- test/run.sh | 6 +- 13 files changed, 57 insertions(+), 118 deletions(-) ----------------------------------------------------------------------
