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/12 06:48:22 UTC
[8/9] 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/b258ab11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b258ab11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b258ab11
Branch: refs/heads/master
Commit: b258ab11259e93576db971f881613aaa515bc0bd
Parents: 7c5ef1c 1294abf
Author: misakuo <mi...@apache.org>
Authored: Mon Mar 12 14:45:31 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Mar 12 14:45:31 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(-)
----------------------------------------------------------------------