Merge remote-tracking branch 'upstream/pr1037' 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/c20aad50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c20aad50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c20aad50 Branch: refs/heads/master Commit: c20aad50aed3548cb06d9a4cdf0ba5831cf22541 Parents: a7bfb9a d67a3af Author: misakuo <misa...@apache.org> Authored: Thu Mar 1 16:19:26 2018 +0800 Committer: misakuo <misa...@apache.org> Committed: Thu Mar 1 16:19:26 2018 +0800 ---------------------------------------------------------------------- .../java/com/taobao/weex/common/Constants.java | 1 + .../com/taobao/weex/ui/component/WXText.java | 17 ++++---- .../com/taobao/weex/ui/view/WXTextView.java | 42 ++++++++++++++++++++ 3 files changed, 50 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c20aad50/android/sdk/src/main/java/com/taobao/weex/common/Constants.java ----------------------------------------------------------------------
