From 66c2833c5dfee3d79588ab9b9a089476f0c87908 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Mon, 8 Jun 2009 18:27:03 -0700
Subject: [PATCH] Add menu + bigger icons for MacOS. Also added name to shell
 (macos also)

---
 tools/sdkmanager/app/src/Android.mk            |  1 +
 tools/sdkmanager/libs/sdklib/src/Android.mk    |  1 +
 .../src/com/android/sdklib/SdkConstants.java   |  2 +-
 tools/sdkmanager/libs/sdkuilib/src/Android.mk  |  4 +---
 .../internal/repository/UpdaterWindowImpl.java | 18 ++++++++++++++----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tools/sdkmanager/app/src/Android.mk b/tools/sdkmanager/app/src/Android.mk
index b67bf6a9c..b51a113ba 100644
--- a/tools/sdkmanager/app/src/Android.mk
+++ b/tools/sdkmanager/app/src/Android.mk
@@ -4,6 +4,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_JAVA_RESOURCE_DIRS := .
 
 LOCAL_JAR_MANIFEST := ../etc/manifest.txt
 LOCAL_JAVA_LIBRARIES := \
diff --git a/tools/sdkmanager/libs/sdklib/src/Android.mk b/tools/sdkmanager/libs/sdklib/src/Android.mk
index a059a466b..25c712672 100644
--- a/tools/sdkmanager/libs/sdklib/src/Android.mk
+++ b/tools/sdkmanager/libs/sdklib/src/Android.mk
@@ -17,6 +17,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_JAVA_RESOURCE_DIRS := .
 
 LOCAL_JAVA_LIBRARIES := \
         androidprefs
diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
index 32b9a2e01..2c71e0feb 100644
--- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
@@ -279,7 +279,7 @@ public final class SdkConstants {
      * @return one of {@link #PLATFORM_WINDOWS}, {@link #PLATFORM_DARWIN},
      * {@link #PLATFORM_LINUX} or {@link #PLATFORM_UNKNOWN}.
      */
-    private static int currentPlatform() {
+    public static int currentPlatform() {
         String os = System.getProperty("os.name");          //$NON-NLS-1$
         if (os.startsWith("Mac OS")) {                      //$NON-NLS-1$
             return PLATFORM_DARWIN;
diff --git a/tools/sdkmanager/libs/sdkuilib/src/Android.mk b/tools/sdkmanager/libs/sdkuilib/src/Android.mk
index 357a60dae..282de28e9 100644
--- a/tools/sdkmanager/libs/sdkuilib/src/Android.mk
+++ b/tools/sdkmanager/libs/sdkuilib/src/Android.mk
@@ -4,9 +4,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-# no resources yet.
-# LOCAL_JAVA_RESOURCE_DIRS := resources
+LOCAL_JAVA_RESOURCE_DIRS := .
 
 LOCAL_JAVA_LIBRARIES := \
 	sdklib \
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 ead8d6175..506a2f082 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
@@ -18,6 +18,7 @@ package com.android.sdkuilib.internal.repository;
 
 
 import com.android.sdklib.ISdkLog;
+import com.android.sdklib.SdkConstants;
 import com.android.sdklib.internal.repository.Archive;
 import com.android.sdklib.internal.repository.ITask;
 import com.android.sdklib.internal.repository.ITaskMonitor;
@@ -39,6 +40,8 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
 
 import java.io.InputStream;
@@ -86,13 +89,15 @@ public class UpdaterWindowImpl {
      * @wbp.parser.entryPoint
      */
     public void open() {
-        Display display = Display.getDefault();
+        Display.setAppName("Android"); //$hide$ (hide from SWT designer)
+
         createContents();
         mAndroidSdkUpdater.open();
         mAndroidSdkUpdater.layout();
 
         firstInit();    //$hide$ (hide from SWT designer)
 
+        Display display = Display.getDefault();
         while (!mAndroidSdkUpdater.isDisposed()) {
             if (!display.readAndDispatch()) {
                 display.sleep();
@@ -112,7 +117,9 @@ public class UpdaterWindowImpl {
             }
         });
 
-        mAndroidSdkUpdater.setLayout(new FillLayout(SWT.HORIZONTAL));
+        FillLayout fl;
+        mAndroidSdkUpdater.setLayout(fl = new FillLayout(SWT.HORIZONTAL));
+        fl.marginHeight = fl.marginWidth = 5;
         mAndroidSdkUpdater.setMinimumSize(new Point(200, 50));
         mAndroidSdkUpdater.setSize(745, 433);
         mAndroidSdkUpdater.setText("Android SDK Updater");
@@ -136,7 +143,6 @@ public class UpdaterWindowImpl {
         mSashForm.setWeights(new int[] {150, 576});
     }
 
-
     // -- Start of internal part ----------
     // Hide everything down-below from SWT designer
     //$hide>>$
@@ -184,7 +190,11 @@ public class UpdaterWindowImpl {
      * The icon is disposed by {@link #onAndroidSdkUpdaterDispose()}.
      */
     private void setWindowImage(Shell androidSdkUpdater) {
-        InputStream stream = getClass().getResourceAsStream("android_icon_16.png");  //$NON-NLS-1$
+        String image = "android_icon_16.png"; //$NON-NLS-1$
+        if (SdkConstants.currentPlatform() == SdkConstants.PLATFORM_DARWIN) {
+            image = "android_icon_128.png"; //$NON-NLS-1$
+        }
+        InputStream stream = getClass().getResourceAsStream(image);
         if (stream != null) {
             try {
                 ImageData imgData = new ImageData(stream);