diff options
Diffstat (limited to 'sdkmanager')
3 files changed, 21 insertions, 11 deletions
diff --git a/sdkmanager/app/etc/android b/sdkmanager/app/etc/android index 75c9485..8feb5f2 100755 --- a/sdkmanager/app/etc/android +++ b/sdkmanager/app/etc/android @@ -71,6 +71,10 @@ else os_opts= fi +if [ `uname` = "Linux" ]; then + export GDK_NATIVE_WINDOWS=true +fi + if [ "$OSTYPE" = "cygwin" ] ; then jarpath=`cygpath -w "$frameworkdir/$jarfile"` progdir=`cygpath -w "$progdir"` diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java index fe94d86..7c793e4 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java @@ -21,8 +21,6 @@ import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.sdklib.ISdkLog;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
import java.io.File;
import java.io.FileInputStream;
@@ -248,6 +246,10 @@ public class SettingsController { mSettingsPage.retrieveSettings(mProperties);
applySettings();
saveSettings();
+
+ // In case the HTTP/HTTPS setting change, force sources to be reloaded
+ // (this only refreshes sources that the user has already tried to open.)
+ mUpdaterData.refreshSources(false /*forceFetching*/);
}
/**
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java index 3d669f6..a2a9218 100644 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java @@ -424,6 +424,7 @@ final class AvdStartDialog extends GridDialog { mSize2 = Integer.parseInt(m.group(2)); mSkinDisplay = skinName; mEnableScaling = true; + return; } } @@ -431,15 +432,18 @@ final class AvdStartDialog extends GridDialog { mEnableScaling = false; // default to false for now. // path to the skin layout file. - File skinFolder = new File(mSdkLocation, prop.get(AvdManager.AVD_INI_SKIN_PATH)); - if (skinFolder.isDirectory()) { - File layoutFile = new File(skinFolder, "layout"); - if (layoutFile.isFile()) { - if (parseLayoutFile(layoutFile)) { - mSkinDisplay = String.format("%1$s (%2$dx%3$d)", skinName, mSize1, mSize2); - mEnableScaling = true; - } else { - mSkinDisplay = skinName; + String skinPath = prop.get(AvdManager.AVD_INI_SKIN_PATH); + if (skinPath != null) { + File skinFolder = new File(mSdkLocation, skinPath); + if (skinFolder.isDirectory()) { + File layoutFile = new File(skinFolder, "layout"); + if (layoutFile.isFile()) { + if (parseLayoutFile(layoutFile)) { + mSkinDisplay = String.format("%1$s (%2$dx%3$d)", skinName, mSize1, mSize2); + mEnableScaling = true; + } else { + mSkinDisplay = skinName; + } } } } |