aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/plugins
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2012-10-22 13:02:35 -0700
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-10-22 13:02:36 -0700
commit47939d944da560e2780529b4641b66d25df1a0a9 (patch)
treedcf17b75ee2643ef493f924c5214f8f7abb45413 /eclipse/plugins
parent1be0786bde147fb94482f99682b4c3ba52feb42b (diff)
parent7393553d2eb244c7d8852537f111b47f277f151a (diff)
downloadsdk-47939d944da560e2780529b4641b66d25df1a0a9.zip
sdk-47939d944da560e2780529b4641b66d25df1a0a9.tar.gz
sdk-47939d944da560e2780529b4641b66d25df1a0a9.tar.bz2
Merge "adtpackage: Update 16 and 32 bit icons"
Diffstat (limited to 'eclipse/plugins')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.icnsbin0 -> 211430 bytes
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.pngbin804 -> 1778 bytes
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.pngbin1908 -> 2074 bytes
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product5
4 files changed, 1 insertions, 4 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.icns b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.icns
new file mode 100644
index 0000000..b29e329
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.icns
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png
index 014fb87..bbd14be 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png
index 7e02ee3..0ef9fdf 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product
index 645beaf..599bf0f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product
@@ -3,14 +3,13 @@
<product name="Eclipse IDE for Android" uid="com.android.ide.eclipse.adt.package.product" id="com.android.ide.eclipse.adt.package.product" application="org.eclipse.ui.ide.workbench" version="20.0.0.qualifier" useFeatures="true" includeLaunchers="true">
-
<configIni use="default">
</configIni>
<launcherArgs>
<programArgs>-product com.android.ide.eclipse.adt.package.product</programArgs>
<programArgsWin>--launcher.XXMaxPermSize 256M</programArgsWin>
- <vmArgs>-Dosgi.requiredJavaVersion=1.6 -Xms40m -Xmx512m</vmArgs>
+ <vmArgs>-Dosgi.requiredJavaVersion=1.6 -Xms40m -Xmx768m</vmArgs>
<vmArgsLin>-XX:MaxPermSize=256m</vmArgsLin>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
@@ -26,14 +25,12 @@
</win>
</launcher>
-
<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
</vm>
-
<plugins>
</plugins>