| commit | 185782e15be0a3e56e53e950f522c11d0bf3d7f0 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <ralf@android.com> | Thu Apr 28 20:07:49 2011 -0700 |
| committer | Raphael Moll <ralf@android.com> | Thu Apr 28 20:07:49 2011 -0700 |
| tree | 54f05d082cc61dce8c184a84d03292c0fcfc621e | |
| parent | 9058318f1052d7813e1c4989fdad49735d65b523 [diff] |
Fix image reousrces in HierarchyViewer application. Currently the HierarchyViewer application crashes when trying to run it from Eclipse. The issue is that the code looks for all the images in /images/ whereas the source code places them in /resources/images/ and the makefile was setup to "erase" the /resources part. The fix is: - move all images back to hierarchyviewerlib/src/images. - adjust the makefile accordingly. Another issue is that the about box JPEG files failed to load (at least on Eclipse 3.5 under Win7). That's OK we had a real icon in PNG that works, so we should be using it for the about box anyway. Change-Id: Id3edc3d714480d4251b190706371db2481a14b63
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk b/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk index ded20e1..3ca63dd 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk
@@ -16,7 +16,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_JAVA_RESOURCE_DIRS := resources +LOCAL_JAVA_RESOURCE_DIRS := ../src LOCAL_JAR_MANIFEST := ../manifest.txt
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/auto-refresh.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/auto-refresh.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/auto-refresh.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/auto-refresh.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/capture-psd.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/capture-psd.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/capture-psd.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/capture-psd.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view-selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view-selected.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view-selected.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view-selected.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/display.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/display.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/display.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/display.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/filtered.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/filtered.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/filtered.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/filtered.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/green.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/green.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/green.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/green.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/inspect-screenshot.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/inspect-screenshot.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/inspect-screenshot.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/inspect-screenshot.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/invalidate.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/invalidate.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/invalidate.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/invalidate.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-all-views.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-all-views.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-all-views.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-all-views.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-overlay.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-overlay.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-overlay.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-overlay.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-view-hierarchy.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-view-hierarchy.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-view-hierarchy.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-view-hierarchy.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/not-selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/not-selected.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/not-selected.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/not-selected.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-black.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-black.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-black.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-black.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-white.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-white.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-white.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-white.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view-selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view-selected.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view-selected.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view-selected.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/red.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/red.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/red.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/red.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/refresh-windows.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/refresh-windows.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/refresh-windows.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/refresh-windows.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/request-layout.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/request-layout.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/request-layout.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/request-layout.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/save.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/save.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/save.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/save.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-128.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-128.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png new file mode 100755 index 0000000..8c3c23d --- /dev/null +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered-small.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered-small.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered-small.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered-small.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-small.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-small.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-small.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-small.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-extras.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-extras.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-overlay.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-overlay.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-overlay.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-overlay.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view-selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view-selected.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view-selected.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view-selected.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/yellow.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/yellow.png similarity index 100% rename from hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/yellow.png rename to hierarchyviewer2/libs/hierarchyviewerlib/src/images/yellow.png Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about-small.jpg b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about-small.jpg deleted file mode 100644 index 6fe9291..0000000 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about-small.jpg +++ /dev/null Binary files differ
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about.jpg b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about.jpg deleted file mode 100644 index 8e10514..0000000 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/about.jpg +++ /dev/null Binary files differ
