LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 9535 into donut

Browse Source 
* changes:
  Fix the DeviceChooserDialog table issues.
This commit is contained in:
Android (Google) Code Review
2009-08-03 14:26:37 -07:00
parent bd13370117 2f39cedad3
commit 8ebbef7eff
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java
View File

@@ -36,7 +36,6 @@ import com.android.sdkuilib.internal.widgets.AvdSelector.IAvdFilter;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -68,12 +67,6 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
private final static int ICON_WIDTH = 16; private final static int ICON_WIDTH = 16;
private final static String PREFS_COL_SERIAL = "deviceChooser.serial"; //$NON-NLS-1$
private final static String PREFS_COL_STATE = "deviceChooser.state"; //$NON-NLS-1$
private final static String PREFS_COL_AVD = "deviceChooser.avd"; //$NON-NLS-1$
private final static String PREFS_COL_TARGET = "deviceChooser.target"; //$NON-NLS-1$
private final static String PREFS_COL_DEBUG = "deviceChooser.debug"; //$NON-NLS-1$
private Table mDeviceTable; private Table mDeviceTable;
private TableViewer mViewer; private TableViewer mViewer;
private AvdSelector mPreferredAvdSelector; private AvdSelector mPreferredAvdSelector;
@@ -334,7 +327,6 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
layout.marginLeft = 30; layout.marginLeft = 30;
offsetComp.setLayout(layout); offsetComp.setLayout(layout);
IPreferenceStore store = AdtPlugin.getDefault().getPreferenceStore();
mDeviceTable = new Table(offsetComp, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER); mDeviceTable = new Table(offsetComp, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
GridData gd; GridData gd;
mDeviceTable.setLayoutData(gd = new GridData(GridData.FILL_BOTH)); mDeviceTable.setLayoutData(gd = new GridData(GridData.FILL_BOTH));
@@ -345,23 +337,23 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
TableHelper.createTableColumn(mDeviceTable, "Serial Number", TableHelper.createTableColumn(mDeviceTable, "Serial Number",
SWT.LEFT, "AAA+AAAAAAAAAAAAAAAAAAA", //$NON-NLS-1$ SWT.LEFT, "AAA+AAAAAAAAAAAAAAAAAAA", //$NON-NLS-1$
PREFS_COL_SERIAL, store); null /* prefs name */, null /* prefs store */);
TableHelper.createTableColumn(mDeviceTable, "AVD Name", TableHelper.createTableColumn(mDeviceTable, "AVD Name",
SWT.LEFT, "engineering", //$NON-NLS-1$ SWT.LEFT, "AAAAAAAAAAAAAAAAAAA", //$NON-NLS-1$
PREFS_COL_AVD, store); null /* prefs name */, null /* prefs store */);
TableHelper.createTableColumn(mDeviceTable, "Target", TableHelper.createTableColumn(mDeviceTable, "Target",
SWT.LEFT, "AAA+Android 9.9.9", //$NON-NLS-1$ SWT.LEFT, "AAA+Android 9.9.9", //$NON-NLS-1$
PREFS_COL_TARGET, store); null /* prefs name */, null /* prefs store */);
TableHelper.createTableColumn(mDeviceTable, "Debug", TableHelper.createTableColumn(mDeviceTable, "Debug",
SWT.LEFT, "Debug", //$NON-NLS-1$ SWT.LEFT, "Debug", //$NON-NLS-1$
PREFS_COL_DEBUG, store); null /* prefs name */, null /* prefs store */);
TableHelper.createTableColumn(mDeviceTable, "State", TableHelper.createTableColumn(mDeviceTable, "State",
SWT.LEFT, "bootloader", //$NON-NLS-1$ SWT.LEFT, "bootloader", //$NON-NLS-1$
PREFS_COL_STATE, store); null /* prefs name */, null /* prefs store */);
// create the viewer for it // create the viewer for it
mViewer = new TableViewer(mDeviceTable); mViewer = new TableViewer(mDeviceTable);