Merge "adtpackage: Update with new assets"

10 files changed, 27 insertions, 18 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/about.mappings b/eclipse/plugins/com.android.ide.eclipse.adt.package/about.mappings
new file mode 100644
index 0000000..c77017a
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/about.mappings
@@ -0,0 +1 @@
+0=buildId
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/adt-about.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/adt-about.png
new file mode 100644
index 0000000..7235e49
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/adt-about.png
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties
index 1e6342e..fdc91e1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties
@@ -2,7 +2,10 @@ bin.includes = META-INF/,\
                plugin.xml,\
                plugin_customization.ini,\
                ide.product,\
+               adt-about.png,\
+               about.mappings,\
                splash.bmp,\
-               introcontent.xml,\
+               icons/,\
                go.css,\
-               index.html
+               index.html,\
+               introcontent.xml
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.png
new file mode 100644
index 0000000..1f76f87
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt.png
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
new file mode 100644
index 0000000..014fb87
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt16.png
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
new file mode 100644
index 0000000..7e02ee3
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt32.png
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt48.png b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt48.png
new file mode 100644
index 0000000..ab846e1
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/icons/adt48.png
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml
index 3359ee0..ce6baf9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml
@@ -6,31 +6,35 @@
          point="org.eclipse.core.runtime.products">
       <product
             application="org.eclipse.ui.ide.workbench"
-            name="Eclipse IDE for Android">
+            description="Android Developer Tools"
+            name="ADT">
          <property
             name="preferenceCustomization"
             value="plugin_customization.ini" />
          <property
             name="appName"
-            value="Eclipse IDE for Android" />
+            value="ADT" />
          <property
-            name="introTitle"
-            value="Eclipse IDE for Android" />
+            name="aboutImage"
+            value="adt-about.png">
+         </property>
          <property
-            name="introBrandingImage"
-            value="product:eclipse.png" />
-         <property
-            name="introBrandingImageText"
-            value="AOSP" />
+            name="aboutText"
+            value="Android Developer Tools&#x0A;&#x0A;Build: {0}&#x0A;&#x0A;This product includes Eclipse Platform, JDT, CDT, EMF, GEF and WTP,&#x0A;all of which are Copyright (c) Eclipse contributors and others.&#x0A;Visit http://eclipse.org/&#x0A;&#x0A;Android Developer Tools are Copyright (c) The Android Open Source Project.&#x0A;Visit http://developer.android.com">
+         </property>
          <property
             name="startupProgressRect"
-            value="10,250,200,5" />
+            value="216,229,170,4" />
          <property
             name="startupMessageRect"
-            value="10,260,300,30" />
+            value="216,240,265,30" />
          <property
             name="startupForegroundColor"
-            value="AAAAAA" />
+            value="999999" />
+         <property
+               name="windowImages"
+               value="icons/adt16.png,icons/adt32.png,icons/adt48.png">
+         </property>
       </product>
    </extension>
    <extension
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini
index 50c3948..996af37 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin_customization.ini
@@ -1,7 +1,8 @@
 org.eclipse.ui/defaultPerspectiveId=org.eclipse.jdt.ui.JavaPerspective
 org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
 org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
-org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
-org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.slate
-org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES=overview,tutorials,samples,whatsnew,migrate,webresources
-org.eclipse.ui.intro.universal/INTRO_DATA = product:introData.xml
\ No newline at end of file
+org.eclipse.ui/PERSPECTIVE_BAR_EXTRAS=com.android.ide.eclipse.ddms.Perspective
+org.eclipse.ui/PERSPECTIVE_BAR_SIZE=250
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
+org.eclipse.ui.workbench/SHOW_BUILDID_ON_STARTUP=true
+org.eclipse.ui/SHOW_MEMORY_MONITOR=true
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/splash.bmp b/eclipse/plugins/com.android.ide.eclipse.adt.package/splash.bmp
index 80dd82e..0af8058 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/splash.bmp
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/splash.bmp