Rename Unpair to "View paired device(s)" in device list

Bug: 222480401
Test: Not applicable
Change-Id: I9563732b9c142bb81bea2bc81aa87815adba15e8

3 files changed, 6 insertions, 5 deletions

diff --git a/device-manager/src/com/android/tools/idea/devicemanager/PopUpMenuButtonTableCellEditor.java b/device-manager/src/com/android/tools/idea/devicemanager/PopUpMenuButtonTableCellEditor.java
index cd494c98f6b..e4138bf7a54 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/PopUpMenuButtonTableCellEditor.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/PopUpMenuButtonTableCellEditor.java
@@ -75,7 +75,7 @@ public abstract class PopUpMenuButtonTableCellEditor extends IconButtonTableCell
     return item;
   }
 
-  protected final @NotNull Optional<@NotNull JComponent> newUnpairDeviceItem(@NotNull EventKind kind) {
+  protected final @NotNull Optional<@NotNull JComponent> newViewPairedDevicesItem(@NotNull EventKind kind) {
     String key = myDevice.getKey().toString();
     List<PhoneWearPair> pairs = myManager.getPairsForDevice(key);
 
@@ -83,7 +83,8 @@ public abstract class PopUpMenuButtonTableCellEditor extends IconButtonTableCell
       return Optional.empty();
     }
 
-    AbstractButton item = new JBMenuItem("Unpair Device");
+    boolean enabled = StudioFlags.PAIRED_DEVICES_TAB_ENABLED.get();
+    AbstractButton item = new JBMenuItem(enabled ? "View Paired Device(s)" : "Unpair Device");
 
     item.addActionListener(actionEvent -> {
       DeviceManagerEvent deviceManagerEvent = DeviceManagerEvent.newBuilder()
@@ -92,7 +93,7 @@ public abstract class PopUpMenuButtonTableCellEditor extends IconButtonTableCell
 
       DeviceManagerUsageTracker.log(deviceManagerEvent);
 
-      if (StudioFlags.PAIRED_DEVICES_TAB_ENABLED.get()) {
+      if (enabled) {
         myPanel.viewDetails(DetailsPanel.PAIRED_DEVICES_TAB_INDEX);
       }
       else {
diff --git a/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePopUpMenuButtonTableCellEditor.java b/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePopUpMenuButtonTableCellEditor.java
index 1acad29cb16..1ab275dc7ab 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePopUpMenuButtonTableCellEditor.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/physicaltab/PhysicalDevicePopUpMenuButtonTableCellEditor.java
@@ -37,7 +37,7 @@ final class PhysicalDevicePopUpMenuButtonTableCellEditor extends PopUpMenuButton
   @Override
   public @NotNull List<@NotNull JComponent> newItems() {
     List<JComponent> items = new ArrayList<>();
-    Optional<JComponent> optionalItem = newUnpairDeviceItem(EventKind.PHYSICAL_UNPAIR_DEVICE_ACTION);
+    Optional<JComponent> optionalItem = newViewPairedDevicesItem(EventKind.PHYSICAL_UNPAIR_DEVICE_ACTION);
 
     items.add(MenuItems.newViewDetailsItem(myPanel));
     optionalItem.ifPresent(item -> items.add(new Separator()));
diff --git a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java
index 64a1acb9026..6531cbea013 100644
--- a/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java
+++ b/device-manager/src/com/android/tools/idea/devicemanager/virtualtab/VirtualDevicePopUpMenuButtonTableCellEditor.java
@@ -149,7 +149,7 @@ final class VirtualDevicePopUpMenuButtonTableCellEditor extends PopUpMenuButtonT
       case PHONE:
       case WEAR_OS:
         items.add(newPairDeviceItem());
-        newUnpairDeviceItem(EventKind.VIRTUAL_UNPAIR_DEVICE_ACTION).ifPresent(items::add);
+        newViewPairedDevicesItem(EventKind.VIRTUAL_UNPAIR_DEVICE_ACTION).ifPresent(items::add);
         items.add(new Separator());
 
         break;