Merge "SDK Manager: fix window width."

3 files changed, 18 insertions, 9 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AddonSitesDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AddonSitesDialog.java
index 6174ba6..2b9f072 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AddonSitesDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/AddonSitesDialog.java
@@ -134,7 +134,7 @@ public class AddonSitesDialog extends UpdaterBaseDialog {
         GridLayoutBuilder.create(root).columns(3);
 
         Label label = new Label(root, SWT.NONE);
-        GridDataBuilder.create(label).hLeft().vCenter().hSpan(3);
+        GridDataBuilder.create(label).hGrab().vCenter().hSpan(3);
         label.setText(
             "This lets select which official 3rd-party sites you want to load.\n" +
             "\n" +
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/PackagesPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/PackagesPage.java
index 025be46..d1fc6af 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/PackagesPage.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/PackagesPage.java
@@ -289,9 +289,9 @@ public final class PackagesPage extends Composite implements ISdkChangeListener
 
         mGroupOptions = new Composite(groupPackages, SWT.NONE);
         GridDataBuilder.create(mGroupOptions).hFill().vCenter().hGrab();
-        GridLayoutBuilder.create(mGroupOptions).columns(6).noMargins();
+        GridLayoutBuilder.create(mGroupOptions).columns(7).noMargins();
 
-        // Options line 1, 6 columns
+        // Options line 1, 7 columns
 
         Label label3 = new Label(mGroupOptions, SWT.NONE);
         label3.setText("Show:");
@@ -337,7 +337,7 @@ public final class PackagesPage extends Composite implements ISdkChangeListener
         linkSelectNew.setText(
                 String.format("Select <a>%1$s</a> or <a>%2$s</a>", strLinkNew, strLinkUpdates));
         linkSelectNew.setToolTipText("Selects all items that are either new or updates.");
-        GridDataBuilder.create(linkSelectNew).hFill().hGrab();
+        GridDataBuilder.create(linkSelectNew).hFill();
         linkSelectNew.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
@@ -347,10 +347,14 @@ public final class PackagesPage extends Composite implements ISdkChangeListener
             }
         });
 
+        // placeholder between "select all" and "install"
+        Label placeholder = new Label(mGroupOptions, SWT.NONE);
+        GridDataBuilder.create(placeholder).hFill().hGrab();
+
         mButtonInstall = new Button(mGroupOptions, SWT.NONE);
         mButtonInstall.setText("");  //$NON-NLS-1$  placeholder, filled in updateButtonsState()
         mButtonInstall.setToolTipText("Install one or more packages");
-        GridDataBuilder.create(mButtonInstall).hFill().vCenter().hGrab();
+        GridDataBuilder.create(mButtonInstall).vCenter().wHint(150);
         mButtonInstall.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
@@ -358,7 +362,7 @@ public final class PackagesPage extends Composite implements ISdkChangeListener
             }
         });
 
-        // Options line 2, 6 columns
+        // Options line 2, 7 columns
 
         Label label2 = new Label(mGroupOptions, SWT.NONE);
         label2.setText("Sort by:");
@@ -392,12 +396,13 @@ public final class PackagesPage extends Composite implements ISdkChangeListener
             }
         });
 
+        // placeholder between "repository" and "deselect"
         new Label(mGroupOptions, SWT.NONE);
 
         Link linkDeselect = new Link(mGroupOptions, SWT.NONE);
         linkDeselect.setText("<a>Deselect All</a>");
         linkDeselect.setToolTipText("Deselects all the currently selected items");
-        GridDataBuilder.create(linkDeselect).hFill().hGrab();
+        GridDataBuilder.create(linkDeselect).hFill();
         linkDeselect.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
@@ -406,10 +411,14 @@ public final class PackagesPage extends Composite implements ISdkChangeListener
             }
         });
 
+        // placeholder between "deselect" and "delete"
+        placeholder = new Label(mGroupOptions, SWT.NONE);
+        GridDataBuilder.create(placeholder).hFill().hGrab();
+
         mButtonDelete = new Button(mGroupOptions, SWT.NONE);
         mButtonDelete.setText("");  //$NON-NLS-1$  placeholder, filled in updateButtonsState()
         mButtonDelete.setToolTipText("Delete one ore more installed packages");
-        GridDataBuilder.create(mButtonDelete).hFill().vCenter().hGrab();
+        GridDataBuilder.create(mButtonDelete).vCenter().wHint(150);
         mButtonDelete.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/SdkUpdaterWindowImpl2.java
index 41235c6..ae1bf6b 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/SdkUpdaterWindowImpl2.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ui/SdkUpdaterWindowImpl2.java
@@ -181,7 +181,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
         glShell.marginHeight = 0;
         mShell.setLayout(glShell);
 
-        mShell.setMinimumSize(new Point(500, 300));
+        mShell.setMinimumSize(new Point(600, 300));
         mShell.setSize(700, 500);
         mShell.setText(APP_NAME);