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/01/06 07:15:48 UTC
[3/5] incubator-weex git commit: * [android] support add typeface
from native app
* [android] support add typeface from native app
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f39a4020
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f39a4020
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f39a4020
Branch: refs/heads/master
Commit: f39a40204da45564006b4be4b6aa210045f73da4
Parents: 4a655b2
Author: misakuo <mi...@apache.org>
Authored: Fri Nov 17 15:38:23 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Fri Nov 17 15:38:23 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f39a4020/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 825bc7f..9dc2091 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -1349,7 +1349,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
}
- private RippleDrawable prepareBackgroundRipple() {
+ private Drawable prepareBackgroundRipple() {
try {
if (getDomObject().getStyles() != null && getDomObject().getStyles().getPesudoResetStyles() != null) {
Map<String, Object> resetStyles = getDomObject().getStyles().getPesudoResetStyles();