[go: up one dir, main page]
Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

* [Android] Fix duplicate resource name. #1427

Merged
merged 1 commit into from
Aug 23, 2018
Merged

* [Android] Fix duplicate resource name. #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
* [Android] Fix duplicate resource name. 
(cherry picked from commit d4d2613)
  • Loading branch information
@YorkShen
YorkShen committed Aug 13, 2018
commit 00b8c71c4e9c51ef09bf95d966f5fef7eb8ba47f
2 changes: 1 addition & 1 deletion android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
0 android/sdk/src/main/res/drawable/error.png → .../sdk/src/main/res/drawable/weex_error.png
View file
Open in desktop
File renamed without changes