Add the Screen Record toolbar button to the Running Devices window

Also:
- Move video-capture and screenshot icons from icons/logcat/toolbar to icons/common
- Adjust some UI labels for consistency
- Use AndroidAdbUiBundle instead of AndroidAdbBundle in ScreenshotViewer and remove AndroidAdbBundle

Test: DeviceToolWindowPanelTest, EmulatorToolWindowPanelTest
Bug: 218601935
Change-Id: I885350cfdeabe096cb20e7f5e8c3a991fb5b48c8

2 files changed, 6 insertions, 9 deletions

diff --git a/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt b/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt
index e6d3493abe3..ffec8fe5d95 100644
--- a/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt
+++ b/logcat/src/com/android/tools/idea/logcat/LogcatMainPanel.kt
@@ -93,7 +93,6 @@ import com.intellij.openapi.actionSystem.ActionGroup
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR
-import com.intellij.openapi.actionSystem.CommonDataKeys.PROJECT
 import com.intellij.openapi.actionSystem.DataProvider
 import com.intellij.openapi.actionSystem.Separator
 import com.intellij.openapi.application.ModalityState
@@ -443,7 +442,7 @@ internal class LogcatMainPanel(
       add(LogcatSplitterActions(splitterPopupActionGroup))
       add(Separator.create())
       add(ScreenshotAction())
-      add(ScreenRecorderAction(this@LogcatMainPanel, project))
+      add(ScreenRecorderAction())
     }
   }
 
@@ -507,11 +506,10 @@ internal class LogcatMainPanel(
     return when (dataId) {
       LOGCAT_PRESENTER_ACTION.name -> this
       ScreenshotAction.SCREENSHOT_OPTIONS_KEY.name -> device?.let { DeviceArtScreenshotOptions(it.serialNumber, it.sdk, it.model) }
-      ScreenRecorderAction.SERIAL_NUMBER_KEY.name -> device?.serialNumber
-      ScreenRecorderAction.AVD_NAME_KEY.name -> if (device?.isEmulator == true) device.deviceId else null
-      ScreenRecorderAction.SDK_KEY.name -> device?.sdk
+      ScreenRecorderAction.SCREEN_RECORDER_PARAMETERS_KEY.name -> device?.let {
+        ScreenRecorderAction.Parameters(it.serialNumber, it.sdk, if (it.isEmulator) it.deviceId else null, this)
+      }
       EDITOR.name -> editor
-      PROJECT.name -> project
       else -> null
     }
   }
diff --git a/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt b/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt
index 8dbef5e7150..63293bf399c 100644
--- a/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt
+++ b/logcat/testSrc/com/android/tools/idea/logcat/LogcatMainPanelTest.kt
@@ -20,7 +20,6 @@ import com.android.adblib.DeviceState
 import com.android.adblib.testing.FakeAdbLibSession
 import com.android.testutils.MockitoKt.eq
 import com.android.testutils.MockitoKt.mock
-import com.android.testutils.MockitoKt.whenever
 import com.android.tools.adtui.TreeWalker
 import com.android.tools.adtui.swing.FakeMouse.Button.CTRL_LEFT
 import com.android.tools.adtui.swing.FakeUi
@@ -175,8 +174,8 @@ class LogcatMainPanelTest {
       "Split Panels",
       "  Splitter Action",
       "-",
-      "Screen Capture",
-      "Screen Record",
+      "Take Screenshot",
+      "Record Screen",
       "-", // ActionManager.createActionToolbar() seems to add a separator at the end
     ).inOrder()
     toolbar.actions.forEach {