Skip to content

Commit 3c1738c

Browse files
committed
Merge merged PR 786 : HoloEverywhere uses ABS
2 parents fb9d0f5 + 2073ef0 commit 3c1738c

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/ActionBarSherlockHelper.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ public boolean usesActionBarSherlock(TypeElement typeElement) {
5252
return true;
5353
}
5454
if (qName.startsWith("org.holoeverywhere")) {
55-
/*
56-
* HoloEverywhere depends on ABS and uses its own provided
57-
* activity classes
58-
*/
59-
return true;
55+
// Since 2.0.0, HoloEverywhere no longer depends on ABS so we
56+
// had to find a way to to detect the version in classpath.
57+
// Since org.holoeverywhere.addon.AddonSherlock has been removed
58+
// during ABS to ABC migration, we're checking if this class is
59+
// in the classpath. If so, we're using HEW < 2.0
60+
// See issue #776
61+
return annotationHelper.typeElementFromQualifiedName("org.holoeverywhere.addon.AddonSherlock") != null;
6062
}
6163
}
6264
return false;

0 commit comments

Comments
 (0)