Clean up zoom actions

- Make them into objects
- Remove some workaround code that was waiting for jdk11
- Remove unused types

Test: no behavior change -> no test change
Bug: 149212539
Bug: 150939617
Bug: 139432440
Change-Id: I660480ab44152fd36b1d6aa35d1dbf5e61023415

2 files changed, 6 insertions, 8 deletions

diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt
index c74c921662a..1f48ecd55b8 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanel.kt
@@ -415,9 +415,7 @@ class DeviceViewPanel(
       val root = layoutInspector.layoutInspectorModel.root
       viewportLayoutManager.currentZoomOperation = type
       when (type) {
-        ZoomType.FIT, ZoomType.FIT_INTO, ZoomType.SCREEN -> {
-          newZoom = getFitZoom(root)
-        }
+        ZoomType.FIT -> newZoom = getFitZoom(root)
         ZoomType.ACTUAL -> newZoom = 100
         ZoomType.IN -> newZoom += 10
         ZoomType.OUT -> newZoom -= 10
@@ -574,7 +572,7 @@ class MyViewportLayoutManager(
       }
       currentZoomOperation != null -> {
         viewport.viewPosition = when (currentZoomOperation) {
-          ZoomType.FIT, ZoomType.FIT_INTO, ZoomType.SCREEN -> {
+          ZoomType.FIT -> {
             origLayout.layoutContainer(parent)
             val bounds = viewport.extentSize
             val size = viewport.view.preferredSize
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanelActionsToolbarProvider.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanelActionsToolbarProvider.kt
index 55ab6dec2e9..163757e83f3 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanelActionsToolbarProvider.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/ui/DeviceViewPanelActionsToolbarProvider.kt
@@ -153,7 +153,7 @@ object Toggle3dAction : AnAction(MODE_3D), TooltipLinkProvider, TooltipDescripti
 object LayoutInspectorToolbarGroups : EditorActionsToolbarActionGroups {
   override val zoomLabelGroup = DefaultActionGroup().apply {
     add(ZoomLabelAction)
-    add(ZoomResetAction())
+    add(ZoomResetAction)
   }
 
   val toggle3dGroup = DefaultActionGroup().apply { add(Toggle3dAction) }
@@ -161,8 +161,8 @@ object LayoutInspectorToolbarGroups : EditorActionsToolbarActionGroups {
   override val otherGroups: List<ActionGroup> = listOf(DefaultActionGroup().apply { add(PanSurfaceAction) }, toggle3dGroup)
 
   override val zoomControlsGroup = DefaultActionGroup().apply {
-    add(ZoomInAction.getInstance())
-    add(ZoomOutAction.getInstance())
-    add(ZoomToFitAction.getInstance())
+    add(ZoomInAction)
+    add(ZoomOutAction)
+    add(ZoomToFitAction)
   }
 }
\ No newline at end of file