LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add menu + bigger icons for MacOS. Also added name to shell (macos also)

Browse Source
This commit is contained in:
Xavier Ducrohet
2009-06-08 18:27:03 -07:00
parent 34fb7ecf1b
commit 66c2833c5d
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/sdkmanager/app/src/Android.mk
View File

@@ -4,6 +4,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_RESOURCE_DIRS := .
LOCAL_JAR_MANIFEST := ../etc/manifest.txt LOCAL_JAR_MANIFEST := ../etc/manifest.txt
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \

1
tools/sdkmanager/libs/sdklib/src/Android.mk
View File

@@ -17,6 +17,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_RESOURCE_DIRS := .
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
androidprefs androidprefs

2
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
View File

@@ -279,7 +279,7 @@ public final class SdkConstants {
* @return one of {@link #PLATFORM_WINDOWS}, {@link #PLATFORM_DARWIN}, * @return one of {@link #PLATFORM_WINDOWS}, {@link #PLATFORM_DARWIN},
* {@link #PLATFORM_LINUX} or {@link #PLATFORM_UNKNOWN}. * {@link #PLATFORM_LINUX} or {@link #PLATFORM_UNKNOWN}.
*/ */
private static int currentPlatform() { public static int currentPlatform() {
String os = System.getProperty("os.name"); //$NON-NLS-1$ String os = System.getProperty("os.name"); //$NON-NLS-1$
if (os.startsWith("Mac OS")) { //$NON-NLS-1$ if (os.startsWith("Mac OS")) { //$NON-NLS-1$
return PLATFORM_DARWIN; return PLATFORM_DARWIN;

4
tools/sdkmanager/libs/sdkuilib/src/Android.mk
View File

@@ -4,9 +4,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_RESOURCE_DIRS := .
# no resources yet.
# LOCAL_JAVA_RESOURCE_DIRS := resources
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
sdklib \ sdklib \

18
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
View File

@@ -18,6 +18,7 @@ package com.android.sdkuilib.internal.repository;
import com.android.sdklib.ISdkLog; import com.android.sdklib.ISdkLog;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.internal.repository.Archive; import com.android.sdklib.internal.repository.Archive;
import com.android.sdklib.internal.repository.ITask; import com.android.sdklib.internal.repository.ITask;
import com.android.sdklib.internal.repository.ITaskMonitor; 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.Composite;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.List; 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 org.eclipse.swt.widgets.Shell;
import java.io.InputStream; import java.io.InputStream;
@@ -86,13 +89,15 @@ public class UpdaterWindowImpl {
* @wbp.parser.entryPoint * @wbp.parser.entryPoint
*/ */
public void open() { public void open() {
Display display = Display.getDefault(); Display.setAppName("Android"); //$hide$ (hide from SWT designer)
createContents(); createContents();
mAndroidSdkUpdater.open(); mAndroidSdkUpdater.open();
mAndroidSdkUpdater.layout(); mAndroidSdkUpdater.layout();
firstInit(); //$hide$ (hide from SWT designer) firstInit(); //$hide$ (hide from SWT designer)
Display display = Display.getDefault();
while (!mAndroidSdkUpdater.isDisposed()) { while (!mAndroidSdkUpdater.isDisposed()) {
if (!display.readAndDispatch()) { if (!display.readAndDispatch()) {
display.sleep(); 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.setMinimumSize(new Point(200, 50));
mAndroidSdkUpdater.setSize(745, 433); mAndroidSdkUpdater.setSize(745, 433);
mAndroidSdkUpdater.setText("Android SDK Updater"); mAndroidSdkUpdater.setText("Android SDK Updater");
@@ -136,7 +143,6 @@ public class UpdaterWindowImpl {
mSashForm.setWeights(new int[] {150, 576}); mSashForm.setWeights(new int[] {150, 576});
} }
// -- Start of internal part ---------- // -- Start of internal part ----------
// Hide everything down-below from SWT designer // Hide everything down-below from SWT designer
//$hide>>$ //$hide>>$
@@ -184,7 +190,11 @@ public class UpdaterWindowImpl {
* The icon is disposed by {@link #onAndroidSdkUpdaterDispose()}. * The icon is disposed by {@link #onAndroidSdkUpdaterDispose()}.
*/ */
private void setWindowImage(Shell androidSdkUpdater) { 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) { if (stream != null) {
try { try {
ImageData imgData = new ImageData(stream); ImageData imgData = new ImageData(stream);