You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/03/13 02:17:33 UTC

[3/3] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr1061' into apache-master

Merge remote-tracking branch 'upstream/pr1061' into apache-master


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5bfcb7bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5bfcb7bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5bfcb7bc

Branch: refs/heads/master
Commit: 5bfcb7bc7176de66f7f08c56a04f762054e08007
Parents: 42aa126 1294abf
Author: misakuo <mi...@apache.org>
Authored: Tue Mar 13 09:47:57 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Mar 13 09:47:57 2018 +0800

----------------------------------------------------------------------
 android/playground/app/build.gradle             |   4 +-
 .../playground/app/src/main/AndroidManifest.xml |  14 ++
 .../java/com/alibaba/weex/IndexActivity.java    |   3 +
 .../alibaba/weex/update/CheckForUpdateUtil.java | 140 +++++++++++++++++++
 .../com/alibaba/weex/update/Downloader.java     | 112 +++++++++++++++
 .../com/alibaba/weex/update/UpdateService.java  | 108 ++++++++++++++
 .../res/layout/common_update_notify_dialog.xml  |  24 ++++
 .../app/src/main/res/values-zh-rCN/strings.xml  |   8 ++
 .../app/src/main/res/values/strings.xml         |   8 ++
 .../app/src/main/res/xml/filepaths.xml          |   6 +
 10 files changed, 425 insertions(+), 2 deletions(-)
----------------------------------------------------------------------