Merge branch 'android-feature-disable-layerType' of https://github.com/YorkShen/incubator-weex into 0.12-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/476e58c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/476e58c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/476e58c9 Branch: refs/heads/0.12-dev Commit: 476e58c9a5b5ce749494a3afbe1a15ad343b3c25 Parents: 02487c9 28dac6d Author: YorkShen <shenyua...@gmail.com> Authored: Wed Apr 12 10:41:27 2017 +0800 Committer: YorkShen <shenyua...@gmail.com> Committed: Wed Apr 12 10:41:27 2017 +0800 ---------------------------------------------------------------------- .../java/com/taobao/weex/WXSDKInstance.java | 25 ++++++++++++++++++++ .../taobao/weex/dom/action/AnimationAction.java | 3 ++- .../taobao/weex/ui/component/WXComponent.java | 14 ++++++++--- 3 files changed, 38 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/476e58c9/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java index d10a394,51903ea..b7aea32 mode 100644,100755..100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/476e58c9/android/sdk/src/main/java/com/taobao/weex/dom/action/AnimationAction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/476e58c9/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java index 42d9573,7b9bca1..e1b8e3b mode 100644,100755..100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java