diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-11-03 09:43:04 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-11-03 09:43:04 -0800 |
| commit | 9206aea946a1c7ffac5aa79e3c04ed1be19f3611 (patch) | |
| tree | d70f02be093a8519f9cca2cd9f1354cf8582f2c2 /android/ultimate/src | |
| parent | e3ba6cd8791118ddb35bf322236bf37877039ef8 (diff) | |
| parent | 70176c159c92ed7e90f3710599ddde5f19bedee6 (diff) | |
| download | idea-9206aea946a1c7ffac5aa79e3c04ed1be19f3611.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge-upstream
Conflicts:
adt-branding/src/idea/AndroidStudioApplicationInfo.xml
android/android.iml
android/src/META-INF/plugin.xml
android/src/com/android/tools/idea/ddms/screenshot/DeviceArtPainter.java
android/src/com/android/tools/idea/run/InstalledApks.java
android/src/com/android/tools/idea/startup/AndroidStudioSpecificInitializer.java
android/src/com/android/tools/idea/wizard/ImportWizardModuleBuilder.java
android/src/org/jetbrains/android/AndroidPlugin.java
android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java
android/src/org/jetbrains/android/facet/AndroidRootUtil.java
android/src/org/jetbrains/android/run/AndroidRunningState.java
android/ultimate/src/org/jetbrains/android/database/AndroidDataSource.java
android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
Change-Id: I3534d3797cc6081a9312e054fccb830b87b35bd5
Diffstat (limited to 'android/ultimate/src')
| -rw-r--r-- | android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java index d86b8853204..17ce986b9ad 100644 --- a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java +++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java @@ -4,7 +4,7 @@ import com.android.ddmlib.AndroidDebugBridge; import com.android.ddmlib.FileListingService; import com.android.ddmlib.IDevice; import com.android.ddmlib.MultiLineReceiver; -import com.android.tools.idea.ddms.DeviceComboBoxRenderer; +import com.android.tools.idea.ddms.DeviceRenderer; import com.intellij.database.dataSource.AbstractDataSourceConfigurable; import com.intellij.database.dataSource.DatabaseDriver; import com.intellij.database.util.DbImplUtil; @@ -45,7 +45,8 @@ import java.util.concurrent.TimeUnit; /** * @author Eugene.Kudelevsky */ -public class AndroidDataSourcePropertiesDialog extends AbstractDataSourceConfigurable<AndroidDbManager, AndroidDataSource> implements Disposable { +public class AndroidDataSourcePropertiesDialog extends AbstractDataSourceConfigurable<AndroidDbManager, AndroidDataSource> implements + Disposable { private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.database.AndroidDataSourcePropertiesDialog"); private static final String[] DEFAULT_EXTERNAL_DB_PATTERNS = new String[]{"files/"}; @@ -82,7 +83,7 @@ public class AndroidDataSourcePropertiesDialog extends AbstractDataSourceConfigu } }); - myDeviceComboBox.setRenderer(new DeviceComboBoxRenderer() { + myDeviceComboBox.setRenderer(new DeviceRenderer.DeviceComboBoxRenderer() { @Override protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof String) { |