You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/12 06:35:15 UTC
[12/12] incubator-weex git commit: Merge branch '0.12-dev' into
feature-android-irender-result
Merge branch '0.12-dev' into feature-android-irender-result
* 0.12-dev:
* [android] recycler test case bug fix
* [test] fix js lint
* [android] Change compiling error due to enableLayerType
* [android] Fix layerType name in WXComponent
* [ios] remove the overflow:hidden limit for border-x-x-radius on image component
* [test] use '@ignore-' in test case description to ignore in run script
* [all] add DISCLAIMER
* [all] update LICENSE
* [ios] fix issue that image's frame can not be changed
* [ios] move UIGraphicsEndImageContext() to override endDrawContext:
+ [ios] delete no use code
+ [ios] update height type
+ [ios] picker support custom title title color background color and etc
* [ios] bug fix: customMonitorInfo only deal dictionary and string
* [android] Use Pair instead of Exception in WXResourceUtils to imply an error occur.
* [doc] Change doc of toast.
* [Android] Add the ability of disable changing layerType
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/03f44343
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/03f44343
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/03f44343
Branch: refs/heads/0.12-dev
Commit: 03f44343e232695a9c31d865297a4760b0904aa4
Parents: cc45cdc 33932c4
Author: zshshr <zh...@gmail.com>
Authored: Wed Apr 12 14:34:48 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Apr 12 14:34:48 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/WXDiv.java | 4 +-
.../com/taobao/weex/ui/view/IRenderResult.java | 213 +++++++++++++++++++
.../com/taobao/weex/ui/view/WXFrameLayout.java | 19 +-
.../com/taobao/weex/ui/view/WXImageView.java | 9 +-
.../com/taobao/weex/ui/view/WXTextView.java | 9 +-
5 files changed, 250 insertions(+), 4 deletions(-)
----------------------------------------------------------------------