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

Change-Id: Ia48221e33ee5ffae4f381aa29bd99a62b148108e

3 files changed, 14 insertions, 1 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
index 76b005e9d..63dc662db 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
+++ b/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));
                 }
             }
         });
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java
index 4f91da0ee..751bc4f1b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferenceInitializer.java
+++ b/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));
     }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java
index 87addf6e1..fb852f5bd 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/preferences/PreferencePage.java
+++ b/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() },