Setting to enable preview packages.

Change-Id: I7af78e81e5433396c7a1039782ab8ceda35187a0

10 files changed, 249 insertions, 52 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ISettingsPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ISettingsPage.java
index a14337d..6d15360 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ISettingsPage.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ISettingsPage.java
@@ -67,6 +67,13 @@ public interface ISettingsPage {
     public static final String KEY_USE_DOWNLOAD_CACHE = "sdkman.use.dl.cache";   //$NON-NLS-1$

 

     /**

+     * Setting to enabling previews in the package list

+     * Type: Boolean.

+     * Default: False.

+     */

+    public static final String KEY_ENABLE_PREVIEWS = "sdkman.enable.previews";   //$NON-NLS-1$

+

+    /**

      * Setting to set the density of the monitor.

      * Type: Integer.

      * Default: -1

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 8ccb688..09edca8 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
@@ -16,6 +16,7 @@
 

 package com.android.sdkuilib.internal.repository;

 

+import com.android.annotations.NonNull;

 import com.android.prefs.AndroidLocation;

 import com.android.prefs.AndroidLocation.AndroidLocationException;

 import com.android.sdklib.ISdkLog;

@@ -42,7 +43,7 @@ public class SettingsController {
     private static final String SETTINGS_FILENAME = "androidtool.cfg"; //$NON-NLS-1$

 

     private final ISdkLog mSdkLog;

-    private final Settings mSettings = new Settings();

+    private final Settings mSettings;

 

     public interface OnChangedListener {

         public void onSettingsChanged(SettingsController controller, Settings oldSettings);

@@ -52,9 +53,27 @@ public class SettingsController {
     /** The currently associated {@link ISettingsPage}. Can be null. */

     private ISettingsPage mSettingsPage;

 

+    /**

+     * Constructs a new default {@link SettingsController}.

+     *

+     * @param sdkLog A non-null logger to use.

+     */

+    public SettingsController(@NonNull ISdkLog sdkLog) {

+        mSdkLog = sdkLog;

+        mSettings = new Settings();

+    }

 

-    public SettingsController(ISdkLog sdkLog) {

+    /**

+     * Specialized constructor that wraps an existing {@link Settings} instance.

+     * This is mostly used in unit-tests to override settings that are being used.

+     * Normal usage should NOT need to call this constructor.

+     *

+     * @param sdkLog   A non-null logger to use.

+     * @param settings A non-null {@link Settings} to use as-is. It is not duplicated.

+     */

+    protected SettingsController(@NonNull ISdkLog sdkLog, @NonNull Settings settings) {

         mSdkLog = sdkLog;

+        mSettings = settings;

     }

 

     public Settings getSettings() {

@@ -77,20 +96,31 @@ public class SettingsController {
 

 

     public static class Settings {

-        private final Properties mProperties = new Properties();

+        private final Properties mProperties;

 

         /** Initialize an empty set of settings. */

         public Settings() {

+            mProperties = new Properties();

         }

 

         /** Duplicates a set of settings. */

         public Settings(Settings settings) {

+            this();

             for (Entry<Object, Object> entry : settings.mProperties.entrySet()) {

                 mProperties.put(entry.getKey(), entry.getValue());

             }

         }

 

         /**

+         * Specialized constructor for unit-tests that wraps an existing

+         * {@link Properties} instance. The properties instance is not duplicated,

+         * it's merely used as-is and changes will be reflected directly.

+         */

+        protected Settings(Properties properties) {

+            mProperties = properties;

+        }

+

+        /**

          * Returns the value of the {@link ISettingsPage#KEY_FORCE_HTTP} setting.

          *

          * @see ISettingsPage#KEY_FORCE_HTTP

@@ -133,6 +163,15 @@ public class SettingsController {
         }

 

         /**

+         * Returns the value of the {@link ISettingsPage#KEY_ENABLE_PREVIEWS} setting.

+         *

+         * @see ISettingsPage#KEY_ENABLE_PREVIEWS

+         */

+        public boolean getEnablePreviews() {

+            return Boolean.parseBoolean(mProperties.getProperty(ISettingsPage.KEY_ENABLE_PREVIEWS));

+        }

+

+        /**

          * Returns the value of the {@link ISettingsPage#KEY_MONITOR_DENSITY} setting

          * @see ISettingsPage#KEY_MONITOR_DENSITY

          */

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsDialog.java
index af7cc6e..350022e 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsDialog.java
@@ -18,7 +18,7 @@ package com.android.sdkuilib.internal.repository;
 

 import com.android.sdklib.internal.repository.DownloadCache;

 import com.android.sdklib.internal.repository.DownloadCache.Strategy;

-import com.android.sdklib.util.FormatUtil;

+import com.android.sdklib.util.FormatUtils;

 import com.android.sdkuilib.ui.GridDataBuilder;

 import com.android.sdkuilib.ui.GridLayoutBuilder;

 

@@ -47,9 +47,11 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
     // UI widgets

     private Text mTextProxyServer;

     private Text mTextProxyPort;

+    private Text mTextCacheSize;

     private Button mCheckUseCache;

     private Button mCheckForceHttp;

     private Button mCheckAskAdbRestart;

+    private Button mCheckEnablePreviews;

 

     private SelectionAdapter mApplyOnSelected = new SelectionAdapter() {

         @Override

@@ -64,7 +66,6 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
             applyNewSettings(); //$hide$

         }

     };

-    private Text mTextCacheSize;

 

     public SettingsDialog(Shell parentShell, UpdaterData updaterData) {

         super(parentShell, updaterData, "Settings" /*title*/);

@@ -85,7 +86,7 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
         Label label = new Label(group, SWT.NONE);

         GridDataBuilder.create(label).hRight().vCenter();

         label.setText("HTTP Proxy Server");

-        String tooltip = "The hostname or IP of the HTTP & HTTPS proxy server to use (e.g. proxy.example.com). " +

+        String tooltip = "The hostname or IP of the HTTP & HTTPS proxy server to use (e.g. proxy.example.com).\n" +

                          "When empty, the default Java proxy setting is used.";

         label.setToolTipText(tooltip);

 

@@ -97,7 +98,7 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
         label = new Label(group, SWT.NONE);

         GridDataBuilder.create(label).hRight().vCenter();

         label.setText("HTTP Proxy Port");

-        tooltip = "The port of the HTTP & HTTPS proxy server to use (e.g. 3128). " +

+        tooltip = "The port of the HTTP & HTTPS proxy server to use (e.g. 3128).\n" +

                   "When empty, the default Java proxy setting is used.";

         label.setToolTipText(tooltip);

 

@@ -133,8 +134,8 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
         mCheckUseCache = new Button(group, SWT.CHECK);

         GridDataBuilder.create(mCheckUseCache).vCenter().hSpan(1);

         mCheckUseCache.setText("Use download cache");

-        mCheckUseCache.setToolTipText("When checked, small manifest files are cached locally. " +

-                "Large binary files are never cached locally.");

+        mCheckUseCache.setToolTipText("When checked, small manifest files are cached locally.\n" +

+                                      "Large binary files are never cached locally.");

         mCheckUseCache.addSelectionListener(mApplyOnSelected);

 

         label = new Label(group, SWT.NONE);

@@ -154,7 +155,7 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
 

         // ----

         group = new Group(shell, SWT.NONE);

-        group.setText("Misc");

+        group.setText("Others");

         GridDataBuilder.create(group).fill().grab().hSpan(2);

         GridLayoutBuilder.create(group).columns(2);

 

@@ -162,18 +163,27 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
         GridDataBuilder.create(mCheckForceHttp).hFill().hGrab().vCenter().hSpan(2);

         mCheckForceHttp.setText("Force https://... sources to be fetched using http://...");

         mCheckForceHttp.setToolTipText(

-                "If you are not able to connect to the official Android repository " +

-                "using HTTPS, enable this setting to force accessing it via HTTP.");

+            "If you are not able to connect to the official Android repository using HTTPS,\n" +

+            "enable this setting to force accessing it via HTTP.");

         mCheckForceHttp.addSelectionListener(mApplyOnSelected);

 

         mCheckAskAdbRestart = new Button(group, SWT.CHECK);

         GridDataBuilder.create(mCheckAskAdbRestart).hFill().hGrab().vCenter().hSpan(2);

         mCheckAskAdbRestart.setText("Ask before restarting ADB");

         mCheckAskAdbRestart.setToolTipText(

-                "When checked, the user will be asked for permission " +

-                "to restart ADB after updating an addon-on package or a tool package.");

+                "When checked, the user will be asked for permission to restart ADB\n" +

+                "after updating an addon-on package or a tool package.");

         mCheckAskAdbRestart.addSelectionListener(mApplyOnSelected);

 

+        mCheckEnablePreviews = new Button(group, SWT.CHECK);

+        GridDataBuilder.create(mCheckEnablePreviews).hFill().hGrab().vCenter().hSpan(2);

+        mCheckEnablePreviews.setText("Enable Preview Tools");

+        mCheckEnablePreviews.setToolTipText(

+            "When checked, the package list will also display preview versions of the tools.\n" +

+            "These are optional future release candidates that the Android tools team\n" +

+            "publishes from time to time for early feedback.");

+        mCheckEnablePreviews.addSelectionListener(mApplyOnSelected);

+

         Label filler = new Label(shell, SWT.NONE);

         GridDataBuilder.create(filler).hFill().hGrab();

 

@@ -210,6 +220,9 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
                 Boolean.parseBoolean(inSettings.getProperty(KEY_ASK_ADB_RESTART)));

         mCheckUseCache.setSelection(

                 Boolean.parseBoolean(inSettings.getProperty(KEY_USE_DOWNLOAD_CACHE)));

+        mCheckEnablePreviews.setSelection(

+                Boolean.parseBoolean(inSettings.getProperty(KEY_ENABLE_PREVIEWS)));

+

     }

 

     /** Called by the application to retrieve settings from the UI and store them in

@@ -224,6 +237,9 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
                 Boolean.toString(mCheckAskAdbRestart.getSelection()));

         outSettings.setProperty(KEY_USE_DOWNLOAD_CACHE,

                 Boolean.toString(mCheckUseCache.getSelection()));

+        outSettings.setProperty(KEY_ENABLE_PREVIEWS,

+                Boolean.toString(mCheckEnablePreviews.getSelection()));

+

     }

 

     /**

@@ -249,7 +265,7 @@ public class SettingsDialog extends UpdaterBaseDialog implements ISettingsPage {
 

     private void updateDownloadCacheSize() {

         long size = mDownloadCache.getCurrentSize();

-        String str = FormatUtil.byteSizeToString(size);

+        String str = FormatUtils.byteSizeToString(size);

         mTextCacheSize.setText(str);

     }

 

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
index e64075a..cdf5e7b 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
@@ -114,33 +114,9 @@ public class UpdaterData implements IUpdaterData {
         mOsSdkRoot = osSdkRoot;

         mSdkLog = sdkLog;

 

-        mSettingsController = new SettingsController(sdkLog);

 

+        mSettingsController = initSettingsController();

         initSdk();

-

-        mSettingsController.registerOnChangedListener(new OnChangedListener() {

-            @Override

-            public void onSettingsChanged(

-                    SettingsController controller,

-                    SettingsController.Settings oldSettings) {

-

-                // Reset the download cache if it doesn't match the right strategy.

-                // The cache instance gets lazily recreated later in getDownloadCache().

-                if (mDownloadCache != null) {

-                    if (controller.getSettings().getUseDownloadCache() &&

-                            mDownloadCache.getStrategy() != DownloadCache.Strategy.FRESH_CACHE) {

-                        mDownloadCache = null;

-                    } else if (!controller.getSettings().getUseDownloadCache() &&

-                            mDownloadCache.getStrategy() != DownloadCache.Strategy.DIRECT) {

-                        mDownloadCache = null;

-                    }

-                }

-

-                if (oldSettings.getForceHttp() != controller.getSettings().getForceHttp()) {

-                    refreshSources(false /*forceFetching*/);

-                }

-            }

-        });

     }

 

     // ----- getters, setters ----

@@ -276,6 +252,7 @@ public class UpdaterData implements IUpdaterData {
 

     /**

      * Initializes the {@link SdkManager} and the {@link AvdManager}.

+     * Extracted so that we can override this in unit tests.

      */

     @VisibleForTesting(visibility=Visibility.PRIVATE)

     protected void initSdk() {

@@ -299,6 +276,35 @@ public class UpdaterData implements IUpdaterData {
         broadcastOnSdkReload();

     }

 

+    /**

+     * Initializes the {@link SettingsController}

+     * Extracted so that we can override this in unit tests.

+     */

+    @VisibleForTesting(visibility=Visibility.PRIVATE)

+    protected SettingsController initSettingsController() {

+        SettingsController settingsController = new SettingsController(mSdkLog);

+        settingsController.registerOnChangedListener(new OnChangedListener() {

+            @Override

+            public void onSettingsChanged(

+                    SettingsController controller,

+                    SettingsController.Settings oldSettings) {

+

+                // Reset the download cache if it doesn't match the right strategy.

+                // The cache instance gets lazily recreated later in getDownloadCache().

+                if (mDownloadCache != null) {

+                    if (controller.getSettings().getUseDownloadCache() &&

+                            mDownloadCache.getStrategy() != DownloadCache.Strategy.FRESH_CACHE) {

+                        mDownloadCache = null;

+                    } else if (!controller.getSettings().getUseDownloadCache() &&

+                            mDownloadCache.getStrategy() != DownloadCache.Strategy.DIRECT) {

+                        mDownloadCache = null;

+                    }

+                }

+            }

+        });

+        return settingsController;

+    }

+

     @VisibleForTesting(visibility=Visibility.PRIVATE)

     protected void setSdkManager(SdkManager sdkManager) {

         mSdkManager = sdkManager;

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
index 9e45748..0bda937 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
@@ -522,7 +522,16 @@ class PackagesDiffLogic {
         boolean hasChanged = false;
         List<PkgCategory> cats = op.getCategories();
 
+        boolean enablePreviews =
+            mUpdaterData.getSettingsController().getSettings().getEnablePreviews();
+
         nextPkg: for (Package newPkg : packages) {
+
+            if (!enablePreviews && newPkg.getRevision().isPreview()) {
+                // This is a preview and previews are not enabled. Ignore the package.
+                continue nextPkg;
+            }
+
             for (PkgCategory cat : cats) {
                 for (PkgState state : PKG_STATES) {
                     for (Iterator<PkgItem> currItemIt = cat.getItems().iterator();
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
index 40a3538..109c061 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
@@ -780,15 +780,29 @@ public class PackagesPage extends UpdaterPage implements ISdkChangeListener {
             return;
         }
         if (mTreeViewer != null && !mTreeViewer.getTree().isDisposed()) {
+
+            boolean enablePreviews =
+                mUpdaterData.getSettingsController().getSettings().getEnablePreviews();
+
             mTreeViewer.setExpandedState(elem, true);
-            for (Object pkg :
+            nextCategory: for (Object pkg :
                     ((ITreeContentProvider) mTreeViewer.getContentProvider()).getChildren(elem)) {
                 if (pkg instanceof PkgCategory) {
                     PkgCategory cat = (PkgCategory) pkg;
+
+                    // Always expand the Tools category (and the preview one, if enabled)
+                    if (cat.getKey().equals(PkgCategoryApi.KEY_TOOLS) ||
+                            (enablePreviews &&
+                                    cat.getKey().equals(PkgCategoryApi.KEY_TOOLS_PREVIEW))) {
+                        expandInitial(pkg);
+                        continue nextCategory;
+                    }
+
+
                     for (PkgItem item : cat.getItems()) {
                         if (item.getState() == PkgState.INSTALLED) {
                             expandInitial(pkg);
-                            break;
+                            continue nextCategory;
                         }
                     }
                 }
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategoryApi.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategoryApi.java
index d1e3a28..dbb5d31 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategoryApi.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgCategoryApi.java
@@ -75,7 +75,7 @@ class PkgCategoryApi extends PkgCategory {
             if (key.equals(KEY_TOOLS)) {
                 label = "Tools";
             } else if (key.equals(KEY_TOOLS_PREVIEW)) {
-                label = "Tools (Beta Channel)";
+                label = "Tools (Preview Channel)";
             } else if (key.equals(KEY_EXTRA)) {
                 label = "Extras";
             } else {
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 7a7a5b3..4376ec8 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
@@ -25,6 +25,7 @@ import com.android.sdkuilib.internal.repository.AboutDialog;
 import com.android.sdkuilib.internal.repository.ISdkUpdaterWindow;

 import com.android.sdkuilib.internal.repository.MenuBarWrapper;

 import com.android.sdkuilib.internal.repository.SettingsController;

+import com.android.sdkuilib.internal.repository.SettingsController.Settings;

 import com.android.sdkuilib.internal.repository.SettingsDialog;

 import com.android.sdkuilib.internal.repository.UpdaterData;

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

@@ -188,7 +189,6 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
     }

 

     private void createContents() {

-

         mPkgPage = new PackagesPage(mShell, SWT.NONE, mUpdaterData, mContext);

         mPkgPage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));

 

@@ -325,8 +325,23 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
                 new MenuBarWrapper(APP_NAME, menuTools) {

                     @Override

                     public void onPreferencesMenuSelected() {

+

+                        // capture a copy of the initial settings

+                        Settings settings1 = new Settings(mSettingsController.getSettings());

+

+                        // open the dialog and wait for it to close

                         SettingsDialog sd = new SettingsDialog(mShell, mUpdaterData);

                         sd.open();

+

+                        // get the new settings

+                        Settings settings2 = mSettingsController.getSettings();

+

+                        // We need to reload the package list if the http mode or the preview

+                        // modes have changed.

+                        if (settings1.getForceHttp() != settings2.getForceHttp() ||

+                                settings1.getEnablePreviews() != settings2.getEnablePreviews()) {

+                            mPkgPage.onSdkReload();

+                        }

                     }

 

                     @Override

diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java
index 2260739..0fc5b55 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java
@@ -16,6 +16,7 @@
 
 package com.android.sdkuilib.internal.repository;
 
+import com.android.sdklib.ISdkLog;
 import com.android.sdklib.NullSdkLog;
 import com.android.sdklib.SdkManager;
 import com.android.sdklib.internal.repository.DownloadCache;
@@ -27,6 +28,7 @@ import com.android.sdklib.internal.repository.NullTaskMonitor;
 import com.android.sdklib.internal.repository.archives.ArchiveInstaller;
 import com.android.sdklib.internal.repository.archives.ArchiveReplacement;
 import com.android.sdklib.mock.MockLog;
+import com.android.sdkuilib.internal.repository.SettingsController.Settings;
 import com.android.sdkuilib.internal.repository.icons.ImageFactory;
 
 import org.eclipse.swt.graphics.Image;
@@ -34,6 +36,7 @@ import org.eclipse.swt.graphics.Image;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 
 /** A mock UpdaterData that simply records what would have been installed. */
 public class MockUpdaterData extends UpdaterData {
@@ -60,11 +63,18 @@ public class MockUpdaterData extends UpdaterData {
         return mInstalled.toArray(new ArchiveReplacement[mInstalled.size()]);
     }
 
+    /** Overrides the sdk manager with our mock instance. */
     @Override
     protected void initSdk() {
         setSdkManager(new MockEmptySdkManager(SDK_PATH));
     }
 
+    /** Overrides the settings controller with our mock instance. */
+    @Override
+    protected SettingsController initSettingsController() {
+        return createSettingsController(getSdkLog());
+    }
+
     @Override
     public void reloadSdk() {
         // bypass original implementation
@@ -107,6 +117,48 @@ public class MockUpdaterData extends UpdaterData {
         return mMockDownloadCache;
     }
 
+    public void overrideSetting(String key, boolean boolValue) {
+        SettingsController sc = getSettingsController();
+        assert sc instanceof MockSettingsController;
+        ((MockSettingsController)sc).overrideSetting(key, boolValue);
+    }
+    //------------
+
+    public static SettingsController createSettingsController(ISdkLog sdkLog) {
+        Properties props = new Properties();
+        Settings settings = new Settings(props) {}; // this constructor is protected
+        MockSettingsController controller = new MockSettingsController(sdkLog, settings);
+        controller.setProperties(props);
+        return controller;
+    }
+
+    static class MockSettingsController extends SettingsController {
+
+        private Properties mProperties;
+
+        MockSettingsController(ISdkLog sdkLog, Settings settings) {
+            super(sdkLog, settings);
+        }
+
+        void setProperties(Properties properties) {
+            mProperties = properties;
+        }
+
+        public void overrideSetting(String key, boolean boolValue) {
+            mProperties.setProperty(key, Boolean.valueOf(boolValue).toString());
+        }
+
+        @Override
+        public void loadSettings() {
+            // This mock setting controller does not load live file settings.
+        }
+
+        @Override
+        public void saveSettings() {
+            // This mock setting controller does not save live file settings.
+        }
+    }
+
     //------------
 
     private class MockTaskFactory implements ITaskFactory {
diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
index 26b39ed..d139831 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
@@ -31,6 +31,7 @@ import com.android.sdklib.internal.repository.packages.Package;
 import com.android.sdklib.internal.repository.sources.SdkRepoSource;
 import com.android.sdklib.internal.repository.sources.SdkSource;
 import com.android.sdklib.repository.PkgProps;
+import com.android.sdkuilib.internal.repository.ISettingsPage;
 import com.android.sdkuilib.internal.repository.MockUpdaterData;
 
 import java.util.Properties;
@@ -1455,10 +1456,42 @@ public class PackagesDiffLogicTest extends TestCase {
                 getTree(m, false /*displaySortByApi*/));
     }
 
+    public void testToolsPreviewsDisabled() {
+        // Test: No local tools installed. The remote server has both tools and platforms
+        // in release and RC versions. However the settings "enable previews" is disabled
+        // (which is the default) so the previews are not actually loaded from the server.
+
+        SdkSource src1 = new SdkRepoSource("http://1.example.com/url1", "repo1");
+
+        m.updateStart();
+        m.updateSourcePackages(true /*sortByApi*/, src1, new Package[] {
+                new MockToolPackage(src1, new FullRevision(2, 0, 0), 3),          // Tools 2
+                new MockToolPackage(src1, new FullRevision(4, 0, 0, 1), 3),       // Tools 4 rc1
+                new MockPlatformToolPackage(src1, new FullRevision(3, 0, 0)),     // Plat-T 3
+                new MockPlatformToolPackage(src1, new FullRevision(5, 0, 0, 1)),  // Plat-T 5 rc1
+        });
+        m.updateEnd(true /*sortByApi*/);
+
+        assertEquals(
+                "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
+                "-- <NEW, pkg:Android SDK Tools, revision 2>\n" +
+                "-- <NEW, pkg:Android SDK Platform-tools, revision 3>\n" +
+                "PkgCategoryApi <API=EXTRAS, label=Extras, #items=0>\n",
+                getTree(m, true /*displaySortByApi*/));
+        assertEquals(
+                "PkgCategorySource <source=repo1 (1.example.com), #items=2>\n" +
+                "-- <NEW, pkg:Android SDK Tools, revision 2>\n" +
+                "-- <NEW, pkg:Android SDK Platform-tools, revision 3>\n",
+                getTree(m, false /*displaySortByApi*/));
+    }
+
     public void testToolsPreviews() {
         // Test: No local tools installed. The remote server has both tools and platforms
         // in release and RC versions.
 
+        // Enable previews in the settings
+        u.overrideSetting(ISettingsPage.KEY_ENABLE_PREVIEWS, true);
+
         SdkSource src1 = new SdkRepoSource("http://1.example.com/url1", "repo1");
 
         m.updateStart();
@@ -1474,7 +1507,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- <NEW, pkg:Android SDK Tools, revision 2>\n" +
                 "-- <NEW, pkg:Android SDK Platform-tools, revision 3>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- <NEW, pkg:Android SDK Tools, revision 4 rc1>\n" +
                 "-- <NEW, pkg:Android SDK Platform-tools, revision 5 rc1>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=0>\n",
@@ -1494,6 +1527,9 @@ public class PackagesDiffLogicTest extends TestCase {
         // => v3 is updated by 3.0.1
         // => v4.0.0rc1 does not update 3.0.0, instead it's a separate download.
 
+        // Enable previews in the settings
+        u.overrideSetting(ISettingsPage.KEY_ENABLE_PREVIEWS, true);
+
         SdkSource src1 = new SdkRepoSource("http://1.example.com/url1", "repo1");
 
         m.updateStart();
@@ -1515,7 +1551,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 3, updated by:Android SDK Tools, revision 3.0.1>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 3, updated by:Android SDK Platform-tools, revision 3.0.1>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- <NEW, pkg:Android SDK Tools, revision 4 rc1>\n" +
                 "-- <NEW, pkg:Android SDK Platform-tools, revision 4 rc1>\n" +
                 "PkgCategoryApi <API=API 1, label=Android android-1 (API 1), #items=1>\n" +
@@ -1543,7 +1579,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- < * INSTALLED, pkg:Android SDK Tools, revision 3, updated by:Android SDK Tools, revision 3.0.1>\n" +
                 "-- < * INSTALLED, pkg:Android SDK Platform-tools, revision 3, updated by:Android SDK Platform-tools, revision 3.0.1>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- <NEW, pkg:Android SDK Tools, revision 4 rc1>\n" +
                 "-- <NEW, pkg:Android SDK Platform-tools, revision 4 rc1>\n" +
                 "PkgCategoryApi <API=API 1, label=Android android-1 (API 1), #items=1>\n" +
@@ -1568,6 +1604,9 @@ public class PackagesDiffLogicTest extends TestCase {
         // => Installed 3.0.1rc1 can be updated by 3.0.1rc2
         // => There's a separate "new" download for 3.0.0, not installed and NOT updating 3.0.1rc1.
 
+        // Enable previews in the settings
+        u.overrideSetting(ISettingsPage.KEY_ENABLE_PREVIEWS, true);
+
         SdkSource src1 = new SdkRepoSource("http://1.example.com/url1", "repo1");
 
         m.updateStart();
@@ -1588,7 +1627,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- <NEW, pkg:Android SDK Tools, revision 3>\n" +
                 "-- <NEW, pkg:Android SDK Platform-tools, revision 4>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 3.0.1 rc1, updated by:Android SDK Tools, revision 3.0.1 rc2>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 4.0.1 rc1, updated by:Android SDK Platform-tools, revision 4.0.1 rc2>\n" +
                 "PkgCategoryApi <API=API 1, label=Android android-1 (API 1), #items=1>\n" +
@@ -1614,7 +1653,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- <NEW, pkg:Android SDK Tools, revision 3>\n" +
                 "-- <NEW, pkg:Android SDK Platform-tools, revision 4>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- < * INSTALLED, pkg:Android SDK Tools, revision 3.0.1 rc1, updated by:Android SDK Tools, revision 3.0.1 rc2>\n" +
                 "-- < * INSTALLED, pkg:Android SDK Platform-tools, revision 4.0.1 rc1, updated by:Android SDK Platform-tools, revision 4.0.1 rc2>\n" +
                 "PkgCategoryApi <API=API 1, label=Android android-1 (API 1), #items=1>\n" +
@@ -1658,7 +1697,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- <NEW, pkg:Android SDK Tools, revision 3.0.1>\n" +
                 "-- <NEW, pkg:Android SDK Platform-tools, revision 4.0.1>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 3.0.1 rc1>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 4.0.1 rc1>\n" +
                 "PkgCategoryApi <API=API 1, label=Android android-1 (API 1), #items=1>\n" +
@@ -1683,7 +1722,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- < * NEW, pkg:Android SDK Tools, revision 3.0.1>\n" +
                 "-- < * NEW, pkg:Android SDK Platform-tools, revision 4.0.1>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 3.0.1 rc1>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 4.0.1 rc1>\n" +
                 "PkgCategoryApi <API=API 1, label=Android android-1 (API 1), #items=1>\n" +
@@ -1699,7 +1738,7 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" +
                 "-- < * NEW, pkg:Android SDK Tools, revision 3.0.1>\n" +
                 "-- < * NEW, pkg:Android SDK Platform-tools, revision 4.0.1>\n" +
-                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Beta Channel), #items=2>\n" +
+                "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=2>\n" +
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 3.0.1 rc1>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 4.0.1 rc1>\n" +
                 "PkgCategoryApi <API=API 1, label=Android android-1 (API 1), #items=1>\n" +