aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ddms/app/src/images/ddms-icon.pngbin3633 -> 17692 bytes
-rw-r--r--ddms/app/src/images/ddms-logo.pngbin3633 -> 17692 bytes
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/icons/android_32x32.pngbin1390 -> 2446 bytes
-rw-r--r--hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java2
-rw-r--r--hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.pngbin0 -> 17512 bytes
-rw-r--r--sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/android_icon_128.pngbin8713 -> 17715 bytes
-rw-r--r--traceview/src/com/android/traceview/MainWindow.java9
-rw-r--r--traceview/src/resources/icons/traceview128.pngbin0 -> 17131 bytes
8 files changed, 10 insertions, 1 deletions
diff --git a/ddms/app/src/images/ddms-icon.png b/ddms/app/src/images/ddms-icon.png
index 6390a2d..392a8f3 100644
--- a/ddms/app/src/images/ddms-icon.png
+++ b/ddms/app/src/images/ddms-icon.png
Binary files differ
diff --git a/ddms/app/src/images/ddms-logo.png b/ddms/app/src/images/ddms-logo.png
index 6390a2d..392a8f3 100644
--- a/ddms/app/src/images/ddms-logo.png
+++ b/ddms/app/src/images/ddms-logo.png
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_32x32.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_32x32.png
index a382aad..4e0cc13 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_32x32.png
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/icons/android_32x32.png
Binary files differ
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java
index 25943c4..3a0a0e9 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java
+++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java
@@ -150,7 +150,7 @@ public class HierarchyViewerApplication extends ApplicationWindow {
super.configureShell(shell);
shell.setText("Hierarchy Viewer");
ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class);
- Image image = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); //$NON-NLS-1$
+ Image image = imageLoader.loadImage("sdk-hierarchyviewer-128.png", Display.getDefault()); //$NON-NLS-1$
shell.setImage(image);
}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png
new file mode 100644
index 0000000..4535f22
--- /dev/null
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/sdk-hierarchyviewer-128.png
Binary files differ
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/android_icon_128.png b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/android_icon_128.png
index acc124d..830c04b 100644
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/android_icon_128.png
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/icons/android_icon_128.png
Binary files differ
diff --git a/traceview/src/com/android/traceview/MainWindow.java b/traceview/src/com/android/traceview/MainWindow.java
index 1a8e96c..46d0330 100644
--- a/traceview/src/com/android/traceview/MainWindow.java
+++ b/traceview/src/com/android/traceview/MainWindow.java
@@ -22,6 +22,7 @@ import org.eclipse.jface.window.ApplicationWindow;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
@@ -34,6 +35,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.channels.FileChannel;
import java.util.HashMap;
import java.util.Properties;
@@ -64,6 +66,13 @@ public class MainWindow extends ApplicationWindow {
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText("Traceview: " + mTraceName);
+
+ InputStream in = getClass().getClassLoader().getResourceAsStream(
+ "icons/traceview128.png");
+ if (in != null) {
+ shell.setImage(new Image(shell.getDisplay(), in));
+ }
+
shell.setBounds(100, 10, 1282, 900);
}
diff --git a/traceview/src/resources/icons/traceview128.png b/traceview/src/resources/icons/traceview128.png
new file mode 100644
index 0000000..5b4eff1
--- /dev/null
+++ b/traceview/src/resources/icons/traceview128.png
Binary files differ