SDK Manager: fix window resize issue.

SDK Bug: 20939

Incidentally, this also fixes the fact that the window
for the SDK/AVD manager can't be resized at all on Windows
when started from ADT. SWT is quite magical.

Change-Id: I282ebdac3e42e39ee41247de5591cfcb61cd4ac8

2 files changed, 3 insertions, 3 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java
index 301239c..61f0140 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java
@@ -28,9 +28,9 @@ import com.android.sdkuilib.internal.repository.UpdaterPage;
 import com.android.sdkuilib.internal.repository.UpdaterPage.Purpose;

 import com.android.sdkuilib.internal.repository.icons.ImageFactory;

 import com.android.sdkuilib.internal.repository.sdkman1.AvdManagerPage;

-import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;

 import com.android.sdkuilib.repository.ISdkChangeListener;

 import com.android.sdkuilib.repository.SdkUpdaterWindow;

+import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;

 import com.android.sdkuilib.ui.GridDataBuilder;

 import com.android.sdkuilib.ui.GridLayoutBuilder;

 import com.android.sdkuilib.ui.SwtBaseDialog;

@@ -154,7 +154,7 @@ public class AvdManagerWindowImpl1 {
         // or a dialog trim when invoked from somewhere else.

         int style = SWT.SHELL_TRIM;

         if (mContext != AvdInvocationContext.STANDALONE) {

-            style = SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL;

+            style |= SWT.APPLICATION_MODAL;

         }

 

         mShell = new Shell(mParentShell, style);

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java
index 6740dbb..7873700 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java
@@ -169,7 +169,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
         // or a dialog trim when invoked from somewhere else.

         int style = SWT.SHELL_TRIM;

         if (mContext != SdkInvocationContext.STANDALONE) {

-            style = SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL;

+            style |= SWT.APPLICATION_MODAL;

         }

 

         mShell = new Shell(mParentShell, style);