Remove the Device section for now

Bug: Not applicable
Test: Not applicable
Change-Id: Icac2e8589890962b40e1e271e83277122f08c1f4

2 files changed, 2 insertions, 77 deletions

diff --git a/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java b/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java
index 93fa1c69a2f..34ffa7a9cc3 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanel.java
@@ -30,7 +30,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.concurrency.EdtExecutorService;
 import java.awt.Component;
-import java.util.concurrent.Executor;
 import javax.swing.GroupLayout;
 import javax.swing.GroupLayout.Group;
 import javax.swing.JLabel;
@@ -39,9 +38,7 @@ import org.jetbrains.annotations.Nullable;
 
 final class PhysicalDeviceDetailsPanel extends DetailsPanel {
   private final boolean myOnline;
-
   private final @Nullable SummarySection mySummarySection;
-  private final @Nullable DeviceSection myDeviceSection;
 
   @VisibleForTesting
   static final class SummarySection extends InfoSection {
@@ -88,34 +85,6 @@ final class PhysicalDeviceDetailsPanel extends DetailsPanel {
     }
   }
 
-  @VisibleForTesting
-  static final class DeviceSection extends InfoSection {
-    @VisibleForTesting final @NotNull JLabel myNameLabel;
-
-    private DeviceSection() {
-      super("Device");
-
-      myNameLabel = addNameAndValueLabels("Name");
-      setLayout();
-    }
-  }
-
-  @VisibleForTesting
-  static final class DeviceSectionCallback extends MyFutureCallback {
-    private final @NotNull DeviceSection mySection;
-
-    @VisibleForTesting
-    DeviceSectionCallback(@NotNull DeviceSection section) {
-      mySection = section;
-    }
-
-    @Override
-    public void onSuccess(@Nullable PhysicalDevice device) {
-      assert device != null;
-      InfoSection.setText(mySection.myNameLabel, device.getName());
-    }
-  }
-
   private abstract static class MyFutureCallback implements FutureCallback<PhysicalDevice> {
     @Override
     public void onFailure(@NotNull Throwable throwable) {
@@ -136,32 +105,24 @@ final class PhysicalDeviceDetailsPanel extends DetailsPanel {
   PhysicalDeviceDetailsPanel(@NotNull PhysicalDevice device,
                              @NotNull ListenableFuture<@NotNull PhysicalDevice> future,
                              boolean addPairedDevices) {
-    this(device, future, SummarySectionCallback::new, DeviceSectionCallback::new, WearPairingManager.INSTANCE, addPairedDevices);
+    this(device, future, SummarySectionCallback::new, WearPairingManager.INSTANCE, addPairedDevices);
   }
 
   @VisibleForTesting
   PhysicalDeviceDetailsPanel(@NotNull PhysicalDevice device,
                              @NotNull ListenableFuture<@NotNull PhysicalDevice> future,
                              @NotNull NewInfoSectionCallback<@NotNull SummarySection> newSummarySectionCallback,
-                             @NotNull NewInfoSectionCallback<@NotNull DeviceSection> newDeviceSectionCallback,
                              @NotNull WearPairingManager manager,
                              boolean addPairedDevices) {
     super(device.getName());
     myOnline = device.isOnline();
 
     if (myOnline) {
-      Executor executor = EdtExecutorService.getInstance();
-
       mySummarySection = new SummarySection();
-      Futures.addCallback(future, newSummarySectionCallback.apply(mySummarySection), executor);
-
-      // myDeviceSection = new DeviceSection();
-      // Futures.addCallback(future, newDeviceSectionCallback.apply(myDeviceSection), executor);
-      myDeviceSection = null;
+      Futures.addCallback(future, newSummarySectionCallback.apply(mySummarySection), EdtExecutorService.getInstance());
 
       myInfoSections.add(mySummarySection);
       InfoSection.newPairedDeviceSection(device, manager).ifPresent(myInfoSections::add);
-      // myInfoSections.add(myDeviceSection);
 
       if (addPairedDevices && StudioFlags.PAIRED_DEVICES_TAB_ENABLED.get() && device.getType().equals(DeviceType.PHONE)) {
         myPairedDevicesPanel = new PairedDevicesPanel(device.getKey(), this);
@@ -169,7 +130,6 @@ final class PhysicalDeviceDetailsPanel extends DetailsPanel {
     }
     else {
       mySummarySection = null;
-      myDeviceSection = null;
     }
 
     init();
@@ -206,10 +166,4 @@ final class PhysicalDeviceDetailsPanel extends DetailsPanel {
     assert mySummarySection != null;
     return mySummarySection;
   }
-
-  @VisibleForTesting
-  @NotNull DeviceSection getDeviceSection() {
-    assert myDeviceSection != null;
-    return myDeviceSection;
-  }
 }
diff --git a/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java b/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java
index 4a849e773e5..2e07b453b48 100644
--- a/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java
+++ b/device-manager/testSrc/com/android/tools/idea/devicemanager/physicaltab/PhysicalDeviceDetailsPanelTest.java
@@ -23,8 +23,6 @@ import com.android.tools.idea.devicemanager.CountDownLatchFutureCallback;
 import com.android.tools.idea.devicemanager.DetailsPanel;
 import com.android.tools.idea.devicemanager.Resolution;
 import com.android.tools.idea.devicemanager.SerialNumber;
-import com.android.tools.idea.devicemanager.physicaltab.PhysicalDeviceDetailsPanel.DeviceSection;
-import com.android.tools.idea.devicemanager.physicaltab.PhysicalDeviceDetailsPanel.DeviceSectionCallback;
 import com.android.tools.idea.devicemanager.physicaltab.PhysicalDeviceDetailsPanel.SummarySection;
 import com.android.tools.idea.devicemanager.physicaltab.PhysicalDeviceDetailsPanel.SummarySectionCallback;
 import com.android.tools.idea.wearpairing.WearPairingManager;
@@ -36,7 +34,6 @@ import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import javax.swing.JLabel;
 import org.jetbrains.annotations.NotNull;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -63,7 +60,6 @@ public final class PhysicalDeviceDetailsPanelTest {
     PhysicalDeviceDetailsPanel panel = new PhysicalDeviceDetailsPanel(TestPhysicalDevices.ONLINE_GOOGLE_PIXEL_3,
                                                                       future,
                                                                       section -> newSummarySectionCallback(section, latch),
-                                                                      DeviceSectionCallback::new,
                                                                       WearPairingManager.INSTANCE,
                                                                       false);
 
@@ -83,31 +79,6 @@ public final class PhysicalDeviceDetailsPanelTest {
     return new CountDownLatchFutureCallback<>(new SummarySectionCallback(section), latch);
   }
 
-  @Ignore
-  @Test
-  public void deviceSectionCallbackOnSuccess() throws InterruptedException {
-    // Arrange
-    ListenableFuture<PhysicalDevice> future = Futures.immediateFuture(TestPhysicalDevices.GOOGLE_PIXEL_3);
-    CountDownLatch latch = new CountDownLatch(1);
-
-    // Act
-    PhysicalDeviceDetailsPanel panel = new PhysicalDeviceDetailsPanel(TestPhysicalDevices.ONLINE_GOOGLE_PIXEL_3,
-                                                                      future,
-                                                                      SummarySectionCallback::new,
-                                                                      section -> newDeviceSectionCallback(section, latch),
-                                                                      WearPairingManager.INSTANCE,
-                                                                      false);
-
-    // Assert
-    CountDownLatchAssert.await(latch);
-    assertEquals("Google Pixel 3", panel.getDeviceSection().myNameLabel.getText());
-  }
-
-  private static @NotNull FutureCallback<@NotNull PhysicalDevice> newDeviceSectionCallback(@NotNull DeviceSection section,
-                                                                                           @NotNull CountDownLatch latch) {
-    return new CountDownLatchFutureCallback<>(new DeviceSectionCallback(section), latch);
-  }
-
   @Test
   public void setInfoSectionPanelLayout() {
     // Act