Merge branch 'master' into feature-font-padding Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a59ddfe8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a59ddfe8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a59ddfe8
Branch: refs/heads/master Commit: a59ddfe8d2f221f212441c3a20262cf6985518de Parents: 9baf4da 6a5a621 Author: moxun <[email protected]> Authored: Thu Mar 1 16:21:41 2018 +0800 Committer: GitHub <[email protected]> Committed: Thu Mar 1 16:21:41 2018 +0800 ---------------------------------------------------------------------- .../app/src/main/assets/weex_config_search.json | 36 +++++ .../java/com/alibaba/weex/WXApplication.java | 2 + .../main/java/com/taobao/weex/InitConfig.java | 21 ++- .../main/java/com/taobao/weex/WXSDKEngine.java | 5 +- .../main/java/com/taobao/weex/WXSDKManager.java | 10 ++ .../taobao/weex/adapter/ClassLoaderAdapter.java | 56 +++++++ .../com/taobao/weex/bridge/WXModuleManager.java | 8 +- .../java/com/taobao/weex/common/Constants.java | 5 +- .../java/com/taobao/weex/dom/WXDomObject.java | 2 +- .../taobao/weex/dom/WXRecyclerDomObject.java | 49 +++++- .../weex/ui/ExternalLoaderComponentHolder.java | 2 +- .../taobao/weex/ui/SimpleComponentHolder.java | 6 +- .../taobao/weex/ui/component/WXComponent.java | 4 +- .../com/taobao/weex/ui/component/WXText.java | 17 +- .../ui/component/list/BasicListComponent.java | 5 + .../ui/component/list/GapItemDecoration.java | 71 ++++++++ .../weex/ui/component/list/WXListComponent.java | 34 ++++ .../list/template/WXRecyclerTemplateList.java | 18 +++ .../weex/ui/config/AutoScanConfigRegister.java | 112 +++++++++++++ .../weex/ui/config/ConfigComponentHolder.java | 161 +++++++++++++++++++ .../weex/ui/config/ConfigModuleFactory.java | 156 ++++++++++++++++++ .../taobao/weex/ui/module/WXLocaleModule.java | 4 - .../com/taobao/weex/ui/view/WXEditText.java | 2 - .../com/taobao/weex/ui/view/WXTextView.java | 42 +++++ .../taobao/weex/ui/view/gesture/WXGesture.java | 11 +- 25 files changed, 801 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a59ddfe8/android/sdk/src/main/java/com/taobao/weex/common/Constants.java ---------------------------------------------------------------------- diff --cc android/sdk/src/main/java/com/taobao/weex/common/Constants.java index 44924da,5e16fbb..a994663 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@@ -201,7 -203,7 +203,8 @@@ public class Constants String STRATEGY = "strategy"; String ALLOW_COPY_PASTE = "allowCopyPaste"; + String INCLUDE_FONT_PADDING = "includeFontPadding"; + String ENABLE_COPY = "enableCopy";
