YorkShen closed pull request #1427: * [Android] Fix duplicate resource name.
URL: https://github.com/apache/incubator-weex/pull/1427
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
index bc34dabade..18c90b4465 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
@@ -118,7 +118,7 @@ public void onException(NestedContainer container, String
errCode, String msg) {
WX_DEGRAD_ERR_NETWORK_BUNDLE_DOWNLOAD_FAILED.getErrorCode()) &&
container instanceof WXEmbed) {
final WXEmbed comp = ((WXEmbed)container);
final ImageView imageView = new ImageView(comp.getContext());
- imageView.setImageResource(R.drawable.error);
+ imageView.setImageResource(R.drawable.weex_error);
FrameLayout.LayoutParams layoutParams = new
FrameLayout.LayoutParams(ERROR_IMG_WIDTH, ERROR_IMG_HEIGHT);
layoutParams.gravity = Gravity.CENTER;
imageView.setLayoutParams(layoutParams);
diff --git a/android/sdk/src/main/res/drawable/error.png
b/android/sdk/src/main/res/drawable/weex_error.png
similarity index 100%
rename from android/sdk/src/main/res/drawable/error.png
rename to android/sdk/src/main/res/drawable/weex_error.png
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
