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

Merge change I075d2eae into eclair-sdk

Browse Source 
* changes:
  SDK Updater: UI polish
This commit is contained in:
Android (Google) Code Review
2009-10-20 18:18:18 -04:00
parent 7c1adfe76f 301eea2962
commit d58cd1b5d3
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
View File

@@ -397,7 +397,7 @@ public class Archive implements IDescription {
archiveFile = downloadFile(monitor, forceHttp);
if (archiveFile != null) {
if (unarchive(osSdkRoot, archiveFile, sdkManager, monitor)) {
monitor.setResult("Installed: %1$s", name);
monitor.setResult("Installed %1$s", name);
return true;
}
}
@@ -424,6 +424,7 @@ public class Archive implements IDescription {
String name = getParentPackage().getShortDescription();
String desc = String.format("Downloading %1$s", name);
monitor.setDescription(desc);
monitor.setResult(desc);
String link = getUrl();
if (!link.startsWith("http://") //$NON-NLS-1$
@@ -611,6 +612,7 @@ public class Archive implements IDescription {
String pkgName = getParentPackage().getShortDescription();
String pkgDesc = String.format("Installing %1$s", pkgName);
monitor.setDescription(pkgDesc);
monitor.setResult(pkgDesc);
// We always unzip in a temp folder which name depends on the package type
// (e.g. addon, tools, etc.) and then move the folder to the destination folder.

2
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java
View File

@@ -103,7 +103,7 @@ public class RemotePackagesPage extends Composite implements ISdkListener {
mColumnSource = new TreeColumn(mTreeSources, SWT.NONE);
mColumnSource.setWidth(289);
mColumnSource.setText("Sources, Packages and Archives");
mColumnSource.setText("Sites, Packages and Archives");
mDescriptionContainer = new Group(parent, SWT.NONE);
mDescriptionContainer.setLayout(new GridLayout(1, false));

9
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
View File

@@ -267,7 +267,9 @@ final class UpdateChooserDialog extends Dialog {
// Bottom buttons area
placeholder = new Label(mDialogShell, SWT.NONE);
placeholder = new Label(mDialogShell, SWT.NONE);
placeholder.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
placeholder.setText("[*] Something depends on this package");
placeholder.setEnabled(false);
// for MacOS, the Cancel button should be left.
@@ -522,8 +524,11 @@ final class UpdateChooserDialog extends Dialog {
String license = pNew.getLicense();
if (license != null) {
addSectionTitle("License\n");
addSectionTitle("License\n");
addText(license.trim(), "\n\n"); //$NON-NLS-1$
}
addSectionTitle("Site\n");
addText(pNew.getParentSource().getShortDescription());
}

6
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
View File

@@ -306,7 +306,7 @@ class UpdaterData {
}
ArchiveInfo adep = ai.getDependsOn();
if (adep != null && !installedArchives.contains(adep)) {
if (adep != null && !installedArchives.contains(adep.getNewArchive())) {
// This archive depends on another one that was not installed.
// Skip it.
monitor.setResult("Skipping '%1$s'; it depends on '%2$s' which was not installed.",
@@ -435,8 +435,8 @@ class UpdaterData {
public void run() {
MessageDialog.openInformation(mWindowShell,
"Android Tools Updated",
"The Android SDK tool that you are currently using has been updated. " +
"It is recommended that you now close the Android SDK window and re-open it. " +
"The Android SDK and AVD Manager that you are currently using has been updated. " +
"It is recommended that you now close the manager window and re-open it. " +
"If you started this window from Eclipse, please check if the Android " +
"plug-in needs to be updated.");
}