Remove the legacy Layout Inspector

Fixes: 207568525
Test: N/A
Change-Id: I8946b3d6c0b9bab272c75adc9f54c2dcaacd9e36

6 files changed, 59 insertions, 14 deletions

diff --git a/layout-inspector/src/META-INF/layout-inspector.xml b/layout-inspector/src/META-INF/layout-inspector.xml
index 024d49bc059..9c532b06894 100644
--- a/layout-inspector/src/META-INF/layout-inspector.xml
+++ b/layout-inspector/src/META-INF/layout-inspector.xml
@@ -22,6 +22,9 @@
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
+    <fileType name="Layout Inspector" extensions="li"
+              implementationClass="com.android.tools.idea.layoutinspector.snapshots.LayoutInspectorFileType" fieldName="INSTANCE"/>
+
     <facet.toolWindow id="Layout Inspector"
                       facetIdList="android"
                       anchor="bottom"
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/LayoutInspectorToolWindowFactory.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/LayoutInspectorToolWindowFactory.kt
index 87665380373..7f3780b7ff2 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/LayoutInspectorToolWindowFactory.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/LayoutInspectorToolWindowFactory.kt
@@ -32,7 +32,6 @@ import com.android.tools.idea.layoutinspector.ui.DeviceViewPanel
 import com.android.tools.idea.layoutinspector.ui.InspectorBanner
 import com.android.tools.idea.layoutinspector.ui.InspectorBannerService
 import com.android.tools.idea.layoutinspector.ui.InspectorDeviceViewSettings
-import com.android.tools.idea.ui.enableLiveLayoutInspector
 import com.google.common.annotations.VisibleForTesting
 import com.google.wireless.android.sdk.stats.DynamicLayoutInspectorEvent.DynamicLayoutInspectorEventType
 import com.intellij.ide.DataManager
@@ -66,8 +65,6 @@ fun dataProviderForLayoutInspector(layoutInspector: LayoutInspector, deviceViewP
  */
 class LayoutInspectorToolWindowFactory : ToolWindowFactory {
 
-  override fun isApplicable(project: Project): Boolean = enableLiveLayoutInspector
-
   override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
     val workbench = WorkBench<LayoutInspector>(project, LAYOUT_INSPECTOR_TOOL_WINDOW_ID, null, project)
     val viewSettings = InspectorDeviceViewSettings()
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/ShowLayoutInspectorAction.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/ShowLayoutInspectorAction.kt
index bbba51eb16a..0b78961eff8 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/ShowLayoutInspectorAction.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/ShowLayoutInspectorAction.kt
@@ -15,7 +15,6 @@
  */
 package com.android.tools.idea.layoutinspector
 
-import com.android.tools.idea.ui.enableLiveLayoutInspector
 import com.intellij.facet.ProjectFacetManager
 import com.intellij.facet.ui.FacetDependentToolWindow
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -31,8 +30,6 @@ class ShowLayoutInspectorAction : DumbAwareAction(
   StudioIcons.Shell.Menu.LAYOUT_INSPECTOR
 ) {
   override fun update(e: AnActionEvent) {
-    e.presentation.isVisible = enableLiveLayoutInspector
-
     val project = e.project
     e.presentation.isEnabled = project != null && ProjectFacetManager.getInstance(project).hasFacets(AndroidFacet.ID)
   }
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/CaptureSnapshotAction.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/CaptureSnapshotAction.kt
index b20f96f6b08..2ae85dffe69 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/CaptureSnapshotAction.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/CaptureSnapshotAction.kt
@@ -15,7 +15,6 @@
  */
 package com.android.tools.idea.layoutinspector.snapshots
 
-import com.android.tools.idea.editors.layoutInspector.LayoutInspectorFileType
 import com.android.tools.idea.layoutinspector.LAYOUT_INSPECTOR_DATA_KEY
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnAction
@@ -43,8 +42,7 @@ object CaptureSnapshotAction: AnAction(AllIcons.ToolbarDecorator.Export), Toolti
     val outputDir = VfsUtil.getUserHomeDir()
 
     // Configure title, description and extension
-    val descriptor = FileSaverDescriptor("Save Layout Snapshot", "Save layout inspector snapshot",
-                                         LayoutInspectorFileType.EXT_LAYOUT_INSPECTOR)
+    val descriptor = FileSaverDescriptor("Save Layout Snapshot", "Save layout inspector snapshot", EXT_LAYOUT_INSPECTOR)
 
     // Open the Dialog which returns a VirtualFileWrapper when closed
     val saveFileDialog: FileSaverDialog =
@@ -54,7 +52,7 @@ object CaptureSnapshotAction: AnAction(AllIcons.ToolbarDecorator.Export), Toolti
                            SimpleDateFormat("yyyy.MM.dd_HH.mm", Locale.US).format(Date())
     fileName = fileName.replace(Regex("[^._A-Za-z0-9]"), "")
     // Append extension manually to file name on MacOS because FileSaverDialog does not do it automatically.
-    fileName += if (SystemInfo.isMac) LayoutInspectorFileType.DOT_EXT_LAYOUT_INSPECTOR else ""
+    fileName += if (SystemInfo.isMac) DOT_EXT_LAYOUT_INSPECTOR else ""
     val result = saveFileDialog.save(outputDir, fileName) ?: return
 
     val path = result.getVirtualFile(true)?.toNioPath() ?: return
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt
index 2da01438e67..29b27bb98b9 100644
--- a/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileEditor.kt
@@ -17,7 +17,6 @@ package com.android.tools.idea.layoutinspector.snapshots
 
 import com.android.tools.adtui.actions.ZoomType
 import com.android.tools.adtui.workbench.WorkBench
-import com.android.tools.idea.editors.layoutInspector.LayoutInspectorFileType
 import com.android.tools.idea.flags.StudioFlags
 import com.android.tools.idea.layoutinspector.LayoutInspector
 import com.android.tools.idea.layoutinspector.dataProviderForLayoutInspector
@@ -34,7 +33,6 @@ import com.android.tools.idea.layoutinspector.tree.LayoutInspectorTreePanelDefin
 import com.android.tools.idea.layoutinspector.ui.DeviceViewPanel
 import com.android.tools.idea.layoutinspector.ui.EditorDeviceViewSettings
 import com.android.tools.idea.layoutinspector.ui.InspectorBanner
-import com.android.tools.idea.ui.enableLiveLayoutInspector
 import com.google.wireless.android.sdk.stats.DynamicLayoutInspectorEvent
 import com.google.wireless.android.sdk.stats.DynamicLayoutInspectorEvent.DynamicLayoutInspectorEventType.SNAPSHOT_LOADED
 import com.google.wireless.android.sdk.stats.DynamicLayoutInspectorEvent.DynamicLayoutInspectorEventType.SNAPSHOT_LOAD_ERROR
@@ -196,8 +194,8 @@ class LayoutInspectorFileEditor(val project: Project, private val path: Path) :
    */
   class Provider : FileEditorProvider, DumbAware {
     override fun accept(project: Project, file: VirtualFile): Boolean {
-      return FileTypeRegistry.getInstance().getFileTypeByExtension(file.extension ?: "") == LayoutInspectorFileType.INSTANCE &&
-             StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_ENABLE_SNAPSHOTS.get() && enableLiveLayoutInspector
+      return FileTypeRegistry.getInstance().getFileTypeByExtension(file.extension ?: "") == LayoutInspectorFileType &&
+             StudioFlags.DYNAMIC_LAYOUT_INSPECTOR_ENABLE_SNAPSHOTS.get()
     }
 
     override fun createEditor(project: Project, file: VirtualFile) = LayoutInspectorFileEditor(project, file.toNioPath())
diff --git a/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileType.kt b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileType.kt
new file mode 100644
index 00000000000..8d56b8474dc
--- /dev/null
+++ b/layout-inspector/src/com/android/tools/idea/layoutinspector/snapshots/LayoutInspectorFileType.kt
@@ -0,0 +1,52 @@
+/*
+  * Copyright (C) 2021 The Android Open Source Project
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+package com.android.tools.idea.layoutinspector.snapshots
+
+import com.intellij.openapi.fileTypes.FileType
+import icons.StudioIcons
+import javax.swing.Icon
+
+const val EXT_LAYOUT_INSPECTOR = "li"
+const val DOT_EXT_LAYOUT_INSPECTOR = ".li"
+
+object LayoutInspectorFileType : FileType {
+  // For reference from META-INF:
+  val INSTANCE: FileType = this
+
+  override fun getName(): String {
+    return "Layout Inspector"
+  }
+
+  override fun getDescription(): String {
+    return "Layout Inspector Snapshot"
+  }
+
+  override fun getDefaultExtension(): String {
+    return EXT_LAYOUT_INSPECTOR
+  }
+
+  override fun getIcon(): Icon? {
+    return StudioIcons.Shell.Menu.LAYOUT_INSPECTOR
+  }
+
+  override fun isBinary(): Boolean {
+    return true
+  }
+
+  override fun isReadOnly(): Boolean {
+    return true
+  }
+}