@@ -0,0 +1,17 @@
+package org.androidannotations.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Use this annotation to enable the use of HierarchyViewer inside the
+ * application.
+ * 
+ * @author Thomas Fondrillon
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
+public @interface HierarchyViewerSupport {
+}
@@ -55,6 +55,7 @@
 import org.androidannotations.annotations.FragmentByTag;
 import org.androidannotations.annotations.FromHtml;
 import org.androidannotations.annotations.Fullscreen;
+import org.androidannotations.annotations.HierarchyViewerSupport;
 import org.androidannotations.annotations.HttpsClient;
 import org.androidannotations.annotations.InstanceState;
 import org.androidannotations.annotations.ItemClick;
@@ -125,6 +126,7 @@
 import org.androidannotations.processing.BeanProcessor;
 import org.androidannotations.processing.BeforeTextChangeProcessor;
 import org.androidannotations.processing.ClickProcessor;
+import org.androidannotations.processing.HierarchyViewerSupportProcessor;
 import org.androidannotations.processing.EActivityProcessor;
 import org.androidannotations.processing.EApplicationProcessor;
 import org.androidannotations.processing.EBeanProcessor;
@@ -189,6 +191,7 @@
 import org.androidannotations.validation.BeanValidator;
 import org.androidannotations.validation.BeforeTextChangeValidator;
 import org.androidannotations.validation.ClickValidator;
+import org.androidannotations.validation.HierarchyViewerSupportValidator;
 import org.androidannotations.validation.EActivityValidator;
 import org.androidannotations.validation.EApplicationValidator;
 import org.androidannotations.validation.EBeanValidator;
@@ -316,7 +319,8 @@
 		OrmLiteDao.class, //
 		HttpsClient.class, //
 		FragmentArg.class, //
-		OnActivityResult.class //
+		OnActivityResult.class, //
+		HierarchyViewerSupport.class //
 })
 @SupportedSourceVersion(SourceVersion.RELEASE_6)
 public class AndroidAnnotationProcessor extends AnnotatedAbstractProcessor {
@@ -497,6 +501,7 @@ private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices
 		modelValidator.register(new OrmLiteDaoValidator(processingEnv, rClass));
 		modelValidator.register(new HttpsClientValidator(processingEnv, rClass));
 		modelValidator.register(new OnActivityResultValidator(processingEnv, rClass));
+		modelValidator.register(new HierarchyViewerSupportValidator(processingEnv, androidManifest));
 		return modelValidator;
 	}
 
@@ -587,6 +592,7 @@ private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices
 		modelProcessor.register(new InstanceStateProcessor(processingEnv));
 		modelProcessor.register(new HttpsClientProcessor(rClass));
 		modelProcessor.register(new OnActivityResultProcessor(processingEnv, rClass));
+		modelProcessor.register(new HierarchyViewerSupportProcessor());
 		return modelProcessor;
 	}