Add preferences to DDMS (plug-in/standalone) for adb time out.

Change-Id: Ia48221e33ee5ffae4f381aa29bd99a62b148108e

tools/ddms/app/src/com/android/ddms/PrefsDialog.java

@@ -82,10 +82,9 @@ public final class PrefsDialog {
     private final static String PREFS_SELECTED_DEBUG_PORT = "debugSelectedPort"; //$NON-NLS-1$
     private final static String PREFS_DEFAULT_THREAD_UPDATE = "defaultThreadUpdateEnabled"; //$NON-NLS-1$
     private final static String PREFS_DEFAULT_HEAP_UPDATE = "defaultHeapUpdateEnabled"; //$NON-NLS-1$
-
     private final static String PREFS_THREAD_REFRESH_INTERVAL = "threadStatusInterval"; //$NON-NLS-1$
-
     private final static String PREFS_LOG_LEVEL = "ddmsLogLevel"; //$NON-NLS-1$
+    private final static String PREFS_TIMEOUT = "timeOut"; //$NON-NLS-1$
 
 
     /**
@@ -151,6 +150,7 @@ public final class PrefsDialog {
         DdmPreferences.setLogLevel(mPrefStore.getString(PREFS_LOG_LEVEL));
         DdmPreferences.setInitialThreadUpdate(mPrefStore.getBoolean(PREFS_DEFAULT_THREAD_UPDATE));
         DdmPreferences.setInitialHeapUpdate(mPrefStore.getBoolean(PREFS_DEFAULT_HEAP_UPDATE));
+        DdmPreferences.setTimeOut(mPrefStore.getInt(PREFS_TIMEOUT));
 
         // some static values
         String out = System.getenv("ANDROID_PRODUCT_OUT"); //$NON-NLS-1$
@@ -195,6 +195,8 @@ public final class PrefsDialog {
 
         mPrefStore.setDefault(PREFS_LOG_LEVEL, "info"); //$NON-NLS-1$
 
+        mPrefStore.setDefault(PREFS_TIMEOUT, DdmPreferences.DEFAULT_TIMEOUT);
+
         // choose a default font for the text output
         FontData fdat = new FontData("Courier", 10, SWT.NORMAL); //$NON-NLS-1$
         mPrefStore.setDefault("textOutputFont", fdat.toString()); //$NON-NLS-1$
@@ -235,7 +237,8 @@ public final class PrefsDialog {
             } else if (changed.equals("imageSaveDir")) {
                 mPrefStore.setValue("lastImageSaveDir",
                     (String) event.getNewValue());
-
+            } else if (changed.equals(PREFS_TIMEOUT)) {
+                DdmPreferences.setTimeOut(mPrefStore.getInt(PREFS_TIMEOUT));
             } else {
                 Log.v("ddms", "Preference change: " + event.getProperty()
                     + ": '" + event.getOldValue()
@@ -259,20 +262,17 @@ public final class PrefsDialog {
         //PreferenceNode app = new PreferenceNode("app", "Application", null,
         //    AppPrefs.class.getName());
 
-        node = new PreferenceNode("client", new ClientPrefs());
+        node = new PreferenceNode("debugger", new DebuggerPrefs());
         prefMgr.addToRoot(node);
 
         subNode = new PreferenceNode("panel", new PanelPrefs());
         //prefMgr.addTo(node.getId(), subNode);
         prefMgr.addToRoot(subNode);
 
-        node = new PreferenceNode("device", new DevicePrefs());
-        prefMgr.addToRoot(node);
-
         node = new PreferenceNode("LogCat", new LogCatPrefs());
         prefMgr.addToRoot(node);
 
-        node = new PreferenceNode("app", new AppPrefs());
+        node = new PreferenceNode("misc", new MiscPrefs());
         prefMgr.addToRoot(node);
 
         node = new PreferenceNode("stats", new UsageStatsPrefs());
@@ -297,16 +297,16 @@ public final class PrefsDialog {
     }
 
     /**
-     * "Client Scan" prefs page.
+     * "Debugger" prefs page.
      */
-    private static class ClientPrefs extends FieldEditorPreferencePage {
+    private static class DebuggerPrefs extends FieldEditorPreferencePage {
 
         /**
          * Basic constructor.
          */
-        public ClientPrefs() {
+        public DebuggerPrefs() {
             super(GRID);        // use "grid" layout so edit boxes line up
-            setTitle("Client Scan");
+            setTitle("Debugger");
         }
 
          /**
@@ -317,11 +317,11 @@ public final class PrefsDialog {
             IntegerFieldEditor ife;
 
             ife = new PortFieldEditor(PREFS_DEBUG_PORT_BASE,
-                "ADB debugger base:", getFieldEditorParent());
+                "Starting value for local port:", getFieldEditorParent());
             addField(ife);
 
             ife = new PortFieldEditor(PREFS_SELECTED_DEBUG_PORT,
-                "Debug selected VM:", getFieldEditorParent());
+                "Port of Selected VM:", getFieldEditorParent());
             addField(ife);
         }
     }
@@ -362,41 +362,6 @@ public final class PrefsDialog {
         }
     }
 
-    /**
-     * "Device" prefs page.
-     */
-    private static class DevicePrefs extends FieldEditorPreferencePage {
-
-        /**
-         * Basic constructor.
-         */
-        public DevicePrefs() {
-            super(FLAT);        // use "flat" layout
-            setTitle("Device");
-        }
-
-        /**
-         * Create field editors.
-         */
-        @Override
-        protected void createFieldEditors() {
-            DirectoryFieldEditor dfe;
-            FontFieldEditor ffe;
-
-            dfe = new DirectoryFieldEditor("textSaveDir",
-                "Default text save dir:", getFieldEditorParent());
-            addField(dfe);
-
-            dfe = new DirectoryFieldEditor("imageSaveDir",
-                "Default image save dir:", getFieldEditorParent());
-            addField(dfe);
-
-            ffe = new FontFieldEditor("textOutputFont", "Text output font:",
-                getFieldEditorParent());
-            addField(ffe);
-        }
-    }
-
     /**
      * "logcat" prefs page.
      */
@@ -431,18 +396,17 @@ public final class PrefsDialog {
         }
     }
 
-
     /**
-     * "Application" prefs page.
+     * "misc" prefs page.
      */
-    private static class AppPrefs extends FieldEditorPreferencePage {
+    private static class MiscPrefs extends FieldEditorPreferencePage {
 
         /**
          * Basic constructor.
          */
-        public AppPrefs() {
+        public MiscPrefs() {
             super(FLAT);        // use "flat" layout
-            setTitle("DDMS");
+            setTitle("Misc");
         }
 
         /**
@@ -450,6 +414,25 @@ public final class PrefsDialog {
          */
         @Override
         protected void createFieldEditors() {
+            DirectoryFieldEditor dfe;
+            FontFieldEditor ffe;
+
+            IntegerFieldEditor ife = new IntegerFieldEditor(PREFS_TIMEOUT,
+                    "ADB connection time out (ms):", getFieldEditorParent());
+            addField(ife);
+
+            dfe = new DirectoryFieldEditor("textSaveDir",
+                "Default text save dir:", getFieldEditorParent());
+            addField(dfe);
+
+            dfe = new DirectoryFieldEditor("imageSaveDir",
+                "Default image save dir:", getFieldEditorParent());
+            addField(dfe);
+
+            ffe = new FontFieldEditor("textOutputFont", "Text output font:",
+                getFieldEditorParent());
+            addField(ffe);
+
             RadioGroupFieldEditor rgfe;
 
             rgfe = new RadioGroupFieldEditor(PREFS_LOG_LEVEL,

tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java

@@ -217,6 +217,9 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL
                 } else if (PreferenceInitializer.ATTR_LOG_LEVEL.equals(property)) {
                     DdmPreferences.setLogLevel(
                             eclipseStore.getString(PreferenceInitializer.ATTR_LOG_LEVEL));
+                } else if (PreferenceInitializer.ATTR_TIME_OUT.equals(property)) {
+                    DdmPreferences.setTimeOut(
+                            eclipseStore.getInt(PreferenceInitializer.ATTR_TIME_OUT));
                 }
             }
         });

tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java

@@ -61,6 +61,9 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
     public final static String ATTR_HPROF_ACTION =
         DdmsPlugin.PLUGIN_ID + ".hprofAction"; //$NON-NLS-1$
 
+    public final static String ATTR_TIME_OUT =
+        DdmsPlugin.PLUGIN_ID + ".timeOut"; //$NON-NLS-1$
+
     /*
      * (non-Javadoc)
      *
@@ -90,6 +93,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
                 new FontData("Courier", 10, SWT.NORMAL).toString()); //$NON-NLS-1$
 
         store.setDefault(ATTR_HPROF_ACTION, HProfHandler.ACTION_OPEN);
+
+        store.setDefault(ATTR_TIME_OUT, DdmPreferences.DEFAULT_TIMEOUT);
     }
 
     /**
@@ -104,5 +109,6 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
         DdmPreferences.setInitialThreadUpdate(store.getBoolean(ATTR_DEFAULT_THREAD_UPDATE));
         DdmPreferences.setInitialHeapUpdate(store.getBoolean(ATTR_DEFAULT_HEAP_UPDATE));
         DdmUiPreferences.setThreadRefreshInterval(store.getInt(ATTR_THREAD_INTERVAL));
+        DdmPreferences.setTimeOut(store.getInt(ATTR_TIME_OUT));
     }
 }

tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java

@@ -47,7 +47,7 @@ public class PreferencePage extends FieldEditorPreferencePage implements
         IntegerFieldEditor ife;
 
         ife = new PortFieldEditor(PreferenceInitializer.ATTR_DEBUG_PORT_BASE,
-            "ADB debugger base port:", getFieldEditorParent());
+            "Base local debugger port:", getFieldEditorParent());
         addField(ife);
 
         BooleanFieldEditor bfe;
@@ -72,6 +72,10 @@ public class PreferencePage extends FieldEditorPreferencePage implements
                 }, getFieldEditorParent());
         addField(cfe);
 
+        ife = new IntegerFieldEditor(PreferenceInitializer.ATTR_TIME_OUT,
+                "ADB connection time out (ms):", getFieldEditorParent());
+            addField(ife);
+
         RadioGroupFieldEditor rgfe = new RadioGroupFieldEditor(PreferenceInitializer.ATTR_LOG_LEVEL,
                 "Logging Level", 1, new String[][] {
                     { "Verbose", LogLevel.VERBOSE.getStringValue() },