diff options
| author | Raphael Moll <ralf@android.com> | 2011-05-17 14:34:34 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2011-05-20 12:04:11 -0700 |
| commit | e5b42425c143f4a0aa0990b288d9b846851c4d59 (patch) | |
| tree | 63d7d27ab627e3c16de6709baa8612a3c0382980 /sdkmanager/app/src/com | |
| parent | de9fedbd8b1e705c9052a98dea4aca5049260d19 (diff) | |
| download | sdk-e5b42425c143f4a0aa0990b288d9b846851c4d59.zip sdk-e5b42425c143f4a0aa0990b288d9b846851c4d59.tar.gz sdk-e5b42425c143f4a0aa0990b288d9b846851c4d59.tar.bz2 | |
Mechanism to disable SwtMenuBar in SdkMan2
The SDK Manager 2 should not try to change the
menu bar when invoked from Eclipse. Actually it
can't because the SwtMenuBar lib isn't even present
to it crashes with a NoClassDef exception.
This CL adds the notion of "invocation context" so
that we know what is invoking the manager and we can
change the UI accordingly.
Change-Id: I606850a20fbc5f9d2d1d4fd0e16aa0bd71ef41c7
Diffstat (limited to 'sdkmanager/app/src/com')
| -rw-r--r-- | sdkmanager/app/src/com/android/sdkmanager/Main.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 8dce9b1..ccac9b7 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java @@ -44,6 +44,7 @@ import com.android.sdkuilib.internal.repository.UpdateNoWindow; import com.android.sdkuilib.internal.repository.UpdaterPage; import com.android.sdkuilib.internal.widgets.MessageBoxLog; import com.android.sdkuilib.repository.UpdaterWindow; +import com.android.sdkuilib.repository.UpdaterWindow.InvocationContext; import com.android.util.Pair; import org.eclipse.swt.widgets.Display; @@ -314,7 +315,8 @@ public class Main { UpdaterWindow window = new UpdaterWindow( null /* parentShell */, errorLogger, - mOsSdkFolder); + mOsSdkFolder, + InvocationContext.STANDALONE); window.registerPage(SettingsPage.class, UpdaterPage.Purpose.SETTINGS); window.registerPage(AboutPage.class, UpdaterPage.Purpose.ABOUT_BOX); if (autoUpdate) { |