SDK Updter: change window title to match ADT

Also change the name displayed by the "android" wrapping scripts.

Change-Id: I663e1dcadfef7caf2e42138e39b1237f08091c77

3 files changed, 6 insertions, 2 deletions

diff --git a/tools/sdkmanager/app/etc/android b/tools/sdkmanager/app/etc/android
index ee21b0ef3..6a2e961b5 100755
--- a/tools/sdkmanager/app/etc/android
+++ b/tools/sdkmanager/app/etc/android
@@ -105,6 +105,10 @@ else
     exit 1
 fi
 
+if [ -z "$1" ]; then
+    echo "Starting Android SDK and AVD Manager"
+fi
+
 # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
 # might need more memory, e.g. -Xmx128M
 exec "$java_cmd" -Xmx256M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Dcom.android.sdkmanager.toolsdir="$progdir" -jar "$jarpath" "$@"
diff --git a/tools/sdkmanager/app/etc/android.bat b/tools/sdkmanager/app/etc/android.bat
index 032985de4..5a75dfa20 100755
--- a/tools/sdkmanager/app/etc/android.bat
+++ b/tools/sdkmanager/app/etc/android.bat
@@ -33,7 +33,7 @@ rem Set SWT.Jar path based on current architecture (x86 or x86_64)
 for /f %%a in ('java -jar lib\archquery.jar') do set swt_path=lib\%%a
 
 if not "%1"=="" goto EndTempCopy
-    echo Starting Android SDK Updater
+    echo Starting Android SDK and AVD Manager
 
     rem We're now going to create a temp dir to hold all the Jar files needed
     rem to run the android tool, copy them in the temp dir and finally execute
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
index b9cf0a494..247f0a681 100755
--- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
@@ -121,7 +121,7 @@ public class UpdaterWindowImpl {
         fl.marginHeight = fl.marginWidth = 5;

         mAndroidSdkUpdater.setMinimumSize(new Point(200, 50));

         mAndroidSdkUpdater.setSize(745, 433);

-        mAndroidSdkUpdater.setText("Android SDK");

+        mAndroidSdkUpdater.setText("Android SDK and AVD Manager");

 

         mSashForm = new SashForm(mAndroidSdkUpdater, SWT.NONE);