From 3e3ee0245ddbe206e2c99a5faeffe5a3f63c252b Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Wed, 4 Apr 2012 17:23:00 +0400
Subject: [PATCH] Show palette only for design page

---
 .../android/designer/palette/ViewsPaletteProvider.java       | 5 +++--
 .../intellij/designer/palette/AbstractPaletteProvider.java   | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/android-designer/src/com/intellij/android/designer/palette/ViewsPaletteProvider.java b/plugins/android-designer/src/com/intellij/android/designer/palette/ViewsPaletteProvider.java
index 583dfa915b29..a2cee8d4ca5a 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/palette/ViewsPaletteProvider.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/palette/ViewsPaletteProvider.java
@@ -17,11 +17,11 @@ package com.intellij.android.designer.palette;
 
 import com.intellij.android.designer.AndroidDesignerEditorProvider;
 import com.intellij.android.designer.model.ViewsMetaManager;
+import com.intellij.designer.DesignerToolWindowManager;
 import com.intellij.designer.model.MetaManager;
 import com.intellij.designer.palette.AbstractPaletteProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Alexander Lobas
@@ -35,7 +35,8 @@ public class ViewsPaletteProvider extends AbstractPaletteProvider {
 
   @Override
   protected boolean accept(VirtualFile virtualFile) {
-    return AndroidDesignerEditorProvider.acceptLayout(myProject, virtualFile);
+    return AndroidDesignerEditorProvider.acceptLayout(myProject, virtualFile) &&
+           DesignerToolWindowManager.getInstance(myProject).getActiveDesigner() != null;
   }
 
   @Override
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/AbstractPaletteProvider.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/AbstractPaletteProvider.java
index ea9d96101c4e..53b6dccf6c6f 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/AbstractPaletteProvider.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/AbstractPaletteProvider.java
@@ -20,7 +20,6 @@ import com.intellij.ide.palette.PaletteGroup;
 import com.intellij.ide.palette.PaletteItemProvider;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.annotations.NotNull;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;