You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/13 05:16:41 UTC
[11/50] incubator-weex git commit: Merge branch 'android-color' of
github.com:YorkShen/incubator-weex into 0.12-dev
Merge branch 'android-color' of 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/70f42aa9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/70f42aa9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/70f42aa9
Branch: refs/heads/dev
Commit: 70f42aa9ecfb910507b1a79cabe4a67218436cd5
Parents: 953c607 2d59d14
Author: sospartan <so...@apache.org>
Authored: Wed Apr 12 10:39:11 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Apr 12 10:39:11 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/utils/WXResourceUtils.java | 105 +++++++++----------
.../taobao/weex/utils/WXResourceUtilsTest.java | 13 +--
2 files changed, 50 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/70f42aa9/android/sdk/src/main/java/com/taobao/weex/utils/WXResourceUtils.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/utils/WXResourceUtils.java
index 08324f3,4be2fbd..4690fb2
mode 100644,100755..100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXResourceUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXResourceUtils.java
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/70f42aa9/android/sdk/src/test/java/com/taobao/weex/utils/WXResourceUtilsTest.java
----------------------------------------------------------------------