Merge remote-tracking branch 'upstream/pr685' into apache-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/0e9760ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0e9760ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0e9760ac

Branch: refs/heads/master
Commit: 0e9760ac6a760efacfe57eb7d426ab347584ce9c
Parents: cfc4393 7b2150a
Author: misakuo <misa...@apache.org>
Authored: Mon Sep 25 11:11:30 2017 +0800
Committer: misakuo <misa...@apache.org>
Committed: Mon Sep 25 11:11:30 2017 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/common/Constants.java  |   1 +
 .../taobao/weex/ui/component/WXComponent.java   |  63 ++-
 .../com/taobao/weex/utils/BoxShadowUtil.java    | 510 +++++++++++++++++++
 .../com/taobao/weex/utils/WXResourceUtils.java  |   4 +
 test/screenshot/border-android.png              | Bin 162929 -> 0 bytes
 5 files changed, 575 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0e9760ac/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0e9760ac/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------

Reply via email to