diff options
| author | Siva Velusamy <vsiva@google.com> | 2012-10-01 10:26:49 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-01 10:26:50 -0700 |
| commit | 4caaf5a119a92faa7a9ef91c3e53c67491686140 (patch) | |
| tree | 7a81f43519e6cb4dd441a2e087b9a8c74f6e444f /eclipse | |
| parent | 47e70507cd7dd7e2f77ab7db252a0db131203a4e (diff) | |
| parent | 6e027a0e0eadcc6ce20aa86a512e5b7d20adb114 (diff) | |
| download | sdk-4caaf5a119a92faa7a9ef91c3e53c67491686140.zip sdk-4caaf5a119a92faa7a9ef91c3e53c67491686140.tar.gz sdk-4caaf5a119a92faa7a9ef91c3e53c67491686140.tar.bz2 | |
Merge "ddms-plugin: Add preference for method profiler buffer size"
Diffstat (limited to 'eclipse')
2 files changed, 18 insertions, 4 deletions
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 2415e20..254b2c5 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 @@ -16,13 +16,13 @@ package com.android.ide.eclipse.ddms.preferences; +import com.android.ddmlib.DdmPreferences; +import com.android.ddmlib.Log.LogLevel; +import com.android.ddmuilib.DdmUiPreferences; import com.android.ide.eclipse.ddms.DdmsPlugin; import com.android.ide.eclipse.ddms.LogCatMonitor; import com.android.ide.eclipse.ddms.views.DeviceView.HProfHandler; import com.android.ide.eclipse.ddms.views.LogCatView; -import com.android.ddmlib.DdmPreferences; -import com.android.ddmlib.Log.LogLevel; -import com.android.ddmuilib.DdmUiPreferences; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; @@ -81,6 +81,9 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { public final static String ATTR_PERSPECTIVE_ID = DdmsPlugin.PLUGIN_ID + ".perspectiveId"; //$NON-NLS-1$ + public static final String ATTR_PROFILER_BUFSIZE_MB = + DdmsPlugin.PLUGIN_ID + ".profilerBufferSizeMb"; //$NON-NLS-1$ + /* * (non-Javadoc) * @@ -99,6 +102,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { store.setDefault(ATTR_DEFAULT_HEAP_UPDATE, DdmPreferences.DEFAULT_INITIAL_HEAP_UPDATE); + store.setDefault(ATTR_PROFILER_BUFSIZE_MB, DdmPreferences.DEFAULT_PROFILER_BUFFER_SIZE_MB); + store.setDefault(ATTR_THREAD_INTERVAL, DdmUiPreferences.DEFAULT_THREAD_REFRESH_INTERVAL); String homeDir = System.getProperty("user.home"); //$NON-NLS-1$ @@ -141,6 +146,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { DdmPreferences.setLogLevel(store.getString(ATTR_LOG_LEVEL)); DdmPreferences.setInitialThreadUpdate(store.getBoolean(ATTR_DEFAULT_THREAD_UPDATE)); DdmPreferences.setInitialHeapUpdate(store.getBoolean(ATTR_DEFAULT_HEAP_UPDATE)); + DdmPreferences.setProfilerBufferSizeMb(store.getInt(ATTR_PROFILER_BUFSIZE_MB)); DdmUiPreferences.setThreadRefreshInterval(store.getInt(ATTR_THREAD_INTERVAL)); DdmPreferences.setTimeOut(store.getInt(ATTR_TIME_OUT)); DdmPreferences.setUseAdbHost(store.getBoolean(ATTR_USE_ADBHOST)); 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 c3c705c..e469dfd 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 @@ -16,6 +16,7 @@ package com.android.ide.eclipse.ddms.preferences; +import com.android.ddmlib.DdmPreferences; import com.android.ddmlib.Log.LogLevel; import com.android.ddmuilib.PortFieldEditor; import com.android.ide.eclipse.base.InstallDetails; @@ -38,6 +39,7 @@ public class PreferencePage extends FieldEditorPreferencePage implements private BooleanFieldEditor mUseAdbHost; private StringFieldEditor mAdbHostValue; + private IntegerFieldEditor mProfilerBufsize; public PreferencePage() { super(GRID); @@ -85,6 +87,11 @@ public class PreferencePage extends FieldEditorPreferencePage implements addField(cfe); } + mProfilerBufsize = new IntegerFieldEditor(PreferenceInitializer.ATTR_PROFILER_BUFSIZE_MB, + "Method Profiler buffer size (MB):", + getFieldEditorParent()); + addField(mProfilerBufsize); + ife = new IntegerFieldEditor(PreferenceInitializer.ATTR_TIME_OUT, Messages.PreferencePage_ADB_Connection_Time_Out, getFieldEditorParent()); addField(ife); @@ -129,9 +136,10 @@ public class PreferencePage extends FieldEditorPreferencePage implements @Override public void propertyChange(PropertyChangeEvent event) { - // TODO Auto-generated method stub if (event.getSource().equals(mUseAdbHost)) { mAdbHostValue.setEnabled(mUseAdbHost.getBooleanValue(), getFieldEditorParent()); + } else if (event.getSource().equals(mProfilerBufsize)) { + DdmPreferences.setProfilerBufferSizeMb(mProfilerBufsize.getIntValue()); } } |