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

35 files changed, 1 insertions, 1 deletions

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 @@ LOCAL_PATH := $(call my-dir)
 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
index 240862f..240862f 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/auto-refresh.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/auto-refresh.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/capture-psd.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/capture-psd.png
index 0f25426..0f25426 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/capture-psd.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/capture-psd.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view-selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view-selected.png
index fd107ed..fd107ed 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view-selected.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view-selected.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view.png
index 9a7eed4..9a7eed4 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/device-view.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/device-view.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/display.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/display.png
index a9de0ec..a9de0ec 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/display.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/display.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/filtered.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/filtered.png
index 4fcab3f..4fcab3f 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/filtered.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/filtered.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/green.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/green.png
index 800000d..800000d 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/green.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/green.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/inspect-screenshot.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/inspect-screenshot.png
index 6e51701..6e51701 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/inspect-screenshot.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/inspect-screenshot.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/invalidate.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/invalidate.png
index ee75f69..ee75f69 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/invalidate.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/invalidate.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-all-views.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-all-views.png
index 3329ec9..3329ec9 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-all-views.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-all-views.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-overlay.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-overlay.png
index 4817252..4817252 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-overlay.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-overlay.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-view-hierarchy.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-view-hierarchy.png
index 8f01dda..8f01dda 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/load-view-hierarchy.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/load-view-hierarchy.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/not-selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/not-selected.png
index db6f13b..db6f13b 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/not-selected.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/not-selected.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-black.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-black.png
index cd88803..cd88803 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-black.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-black.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-white.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-white.png
index 5f05662..5f05662 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/on-white.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/on-white.png
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
index 1e44000..1e44000 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view-selected.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view-selected.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view.png
index ec51cec..ec51cec 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/pixel-perfect-view.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/pixel-perfect-view.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/red.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/red.png
index a2ab855..a2ab855 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/red.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/red.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/refresh-windows.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/refresh-windows.png
index 8fddcae..8fddcae 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/refresh-windows.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/refresh-windows.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/request-layout.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/request-layout.png
index 92a78c8..92a78c8 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/request-layout.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/request-layout.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/save.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/save.png
index 2c0bab1..2c0bab1 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/save.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/save.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-128.png
index 4535f22..4535f22 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-128.png
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
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered-small.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered-small.png
index 9ef6b34..9ef6b34 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered-small.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered-small.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered.png
index 1f59685..1f59685 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-filtered.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-filtered.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-small.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-small.png
index 538e385..538e385 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected-small.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected-small.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected.png
index 5cd5c3f..5cd5c3f 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/selected.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/selected.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-extras.png
index ba9c305..ba9c305 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-extras.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-overlay.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-overlay.png
index e39e90a..e39e90a 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-overlay.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/show-overlay.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view-selected.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view-selected.png
index 175ad1f..175ad1f 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view-selected.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view-selected.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view.png
index 23aa424..23aa424 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/tree-view.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/tree-view.png
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/yellow.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/yellow.png
index e9b5781..e9b5781 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/yellow.png
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/images/yellow.png
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
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