WonderCsabo · Nov 9, 2014 · Apr 30, 2015 · May 5, 2015 · dodgex · May 6, 2015
diff --git a/...ndroidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java b/...ndroidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
@@ -111,6 +111,8 @@ public final class CanonicalNameConstants {
 	public static final String BUILD_VERSION_CODES = "android.os.Build.VERSION_CODES";
 	public static final String PREFERENCE_ACTIVITY = "android.preference.PreferenceActivity";
 	public static final String PREFERENCE_FRAGMENT = "android.preference.PreferenceFragment";
+	public static final String SUPPORT_V4_PREFERENCE_FRAGMENT = "android.support.v4.preference.PreferenceFragment";
+	public static final String MACHINARIUS_V4_PREFERENCE_FRAGMENT = "com.github.machinarius.preferencefragment.PreferenceFragment";
 	public static final String ACTIVITY_COMPAT = "android.support.v4.app.ActivityCompat";
 	public static final String PREFERENCE = "android.preference.Preference";
 	public static final String PREFERENCE_CHANGE_LISTENER = "android.preference.Preference.OnPreferenceChangeListener";

diff --git a/...tions/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java b/...tions/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
@@ -116,7 +116,7 @@ public class ValidatorHelper {
 	private static final List<Receiver.RegisterAt> VALID_SERVICE_REGISTER_AT = Arrays.asList(Receiver.RegisterAt.OnCreateOnDestroy);
 	private static final List<Receiver.RegisterAt> VALID_FRAGMENT_REGISTER_AT = Arrays.asList(Receiver.RegisterAt.OnCreateOnDestroy, Receiver.RegisterAt.OnResumeOnPause, Receiver.RegisterAt.OnStartOnStop, Receiver.RegisterAt.OnAttachOnDetach);
 
-	private static final List<String> VALID_PREFERENCE_CLASSES = asList(CanonicalNameConstants.PREFERENCE_ACTIVITY, CanonicalNameConstants.PREFERENCE_FRAGMENT);
+	private static final List<String> VALID_PREFERENCE_CLASSES = asList(CanonicalNameConstants.PREFERENCE_ACTIVITY, CanonicalNameConstants.PREFERENCE_FRAGMENT, CanonicalNameConstants.SUPPORT_V4_PREFERENCE_FRAGMENT, CanonicalNameConstants.MACHINARIUS_V4_PREFERENCE_FRAGMENT);
 
 	protected final TargetAnnotationHelper annotationHelper;
 

diff --git a/...ns/androidannotations/src/test/java/android/support/v4/preference/PreferenceFragment.java b/...ns/androidannotations/src/test/java/android/support/v4/preference/PreferenceFragment.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 android.support.v4.preference;
+
+import android.app.Fragment; // for the test it is OK to extend normal Fragment
+
+public abstract class PreferenceFragment extends Fragment {
+
+	public void addPreferencesFromResource(int preferencesResId) {
+
+	}
+}
diff --git a/...notations/src/test/java/com/github/machinarius/preferencefragment/PreferenceFragment.java b/...notations/src/test/java/com/github/machinarius/preferencefragment/PreferenceFragment.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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.github.machinarius.preferencefragment;
+
+import android.app.Fragment; // for the test it is OK to extend normal Fragment
+
+public abstract class PreferenceFragment extends Fragment {
+
+	public void addPreferencesFromResource(int preferencesResId) {
+
+	}
+}
diff --git a/...otations/src/test/java/org/androidannotations/preference/MachinariusSettingsFragment.java b/...otations/src/test/java/org/androidannotations/preference/MachinariusSettingsFragment.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.preference;
+
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.PreferenceScreen;
+
+import com.github.machinarius.preferencefragment.PreferenceFragment;
+
+@PreferenceScreen(R.xml.preferences)
+@EFragment
+public class MachinariusSettingsFragment extends PreferenceFragment {
+
+}
diff --git a/...idannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java b/...idannotations/src/test/java/org/androidannotations/preference/PreferenceFragmentTest.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.preference;
+
+import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.utils.AAProcessorTestHelper;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PreferenceFragmentTest extends AAProcessorTestHelper {
+
+	@Before
+	public void setUp() {
+		addManifestProcessorParameter(PreferenceFragmentTest.class);
+		addProcessor(AndroidAnnotationProcessor.class);
+	}
+
+	@Test
+	public void preferenceFragmentCompiles() {
+		assertCompilationSuccessful(compileFiles(SettingsFragment.class));
+	}
+
+	@Test
+	public void supportPreferenceFragmentCompiles() {
+		assertCompilationSuccessful(compileFiles(SupportSettingsFragment.class));
+	}
+
+	@Test
+	public void machinariusPreferenceFragmentCompiles() {
+		assertCompilationSuccessful(compileFiles(MachinariusSettingsFragment.class));
+	}
+
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/R.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/preference/R.java
@@ -0,0 +1,7 @@
+package org.androidannotations.preference;
+
+public class R {
+	public static final class xml {
+		public static final int preferences = 0x7f06000a;
+	}
+}
diff --git a/.../androidannotations/src/test/java/org/androidannotations/preference/SettingsFragment.java b/.../androidannotations/src/test/java/org/androidannotations/preference/SettingsFragment.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.preference;
+
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.PreferenceScreen;
+
+import android.preference.PreferenceFragment;
+
+@PreferenceScreen(R.xml.preferences)
+@EFragment
+public class SettingsFragment extends PreferenceFragment {
+
+}
diff --git a/...dannotations/src/test/java/org/androidannotations/preference/SupportSettingsFragment.java b/...dannotations/src/test/java/org/androidannotations/preference/SupportSettingsFragment.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * 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 org.androidannotations.preference;
+
+import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.PreferenceScreen;
+
+import android.support.v4.preference.PreferenceFragment;
+
+@PreferenceScreen(R.xml.preferences)
+@EFragment
+public class SupportSettingsFragment extends PreferenceFragment {
+
+}
diff --git a/...droidannotations/src/test/resources/org/androidannotations/preference/AndroidManifest.xml b/...droidannotations/src/test/resources/org/androidannotations/preference/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    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.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.androidannotations.preference"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+</manifest>
diff --git a/AndroidAnnotations/checkstyle-suppressions.xml b/AndroidAnnotations/checkstyle-suppressions.xml
@@ -22,6 +22,6 @@
 <suppressions>
     <suppress files="org[\\/]androidannotations[\\/](?:[^\\/]+$|(?!annotations)[^\\/]+[\\/])" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle" />
 	<suppress files="org[\\/]robolectric[\\/]" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle" />
-    <suppress files="com[\\/]" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle" />
+    <suppress files="(com|android)[\\/]" checks="JavadocType|JavadocMethod|JavadocVariable|JavadocStyle" />
     <suppress files="R.java" checks=".*" />
 </suppressions>