remove ABS dependency, fixes #5

saik0 · Dec 1, 2012 · 99f8b7c · 99f8b7c
1 parent dcfdb0c
commit 99f8b7c
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 245 deletions.
diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml
@@ -27,8 +27,7 @@
 
     <application
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:label="@string/app_name" >
         <activity
             android:name=".DemoUnifiedPreferenceActivity"
             android:label="@string/app_name" >

diff --git a/demo/res/values-v11/styles.xml b/demo/res/values-v11/styles.xml
diff --git a/demo/res/values-v14/styles.xml b/demo/res/values-v14/styles.xml
diff --git a/demo/res/values/styles.xml b/demo/res/values/styles.xml
diff --git a/demo/src/net/saik0/android/unifiedpreference/demo/DemoUnifiedPreferenceActivity.java b/demo/src/net/saik0/android/unifiedpreference/demo/DemoUnifiedPreferenceActivity.java
@@ -21,9 +21,9 @@
 
 import net.saik0.android.unifiedpreference.demo.R;
 import net.saik0.android.unifiedpreference.UnifiedPreferenceFragment;
-import net.saik0.android.unifiedpreference.UnifiedSherlockPreferenceActivity;
+import net.saik0.android.unifiedpreference.UnifiedPreferenceActivity;
 
-public class DemoUnifiedPreferenceActivity extends UnifiedSherlockPreferenceActivity {
+public class DemoUnifiedPreferenceActivity extends UnifiedPreferenceActivity {
 
 	@Override public void onCreate(Bundle savedInstanceState) {
 		// Set header resource MUST BE CALLED BEFORE super.onCreate 

diff --git a/library/pom.xml b/library/pom.xml
@@ -20,13 +20,6 @@
 			<artifactId>android</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>com.actionbarsherlock</groupId>
-			<artifactId>actionbarsherlock</artifactId>
-			<version>4.2.0</version>
-			<type>apklib</type>
-		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/library/res/values/atrs.xml b/library/res/values/atrs.xml
@@ -4,17 +4,17 @@
          from which the selects the set of preference to dig in to. -->
     <declare-styleable name="PreferenceHeader">
         <!-- Identifier value for the header. -->
-        <attr name="id" format="integer"/>
+        <attr name="id" format="integer" />
         <!-- The title of the item that is shown to the user. -->
-        <attr name="title" />
+        <attr name="title" format="string" />
         <!-- The summary for the item. -->
         <attr name="summary" format="string" />
         <!-- The title for the bread crumb of this item. -->
         <attr name="breadCrumbTitle" format="string" />
         <!-- The short title for the bread crumb of this item. -->
         <attr name="breadCrumbShortTitle" format="string" />
         <!-- An icon for the item. -->
-        <attr name="icon" />
+        <attr name="icon" format="reference"/>
         <!-- The fragment that is displayed when the user selects this item. -->
         <attr name="fragment" format="string" />
         <!-- The resource with the PreferenceScreen to inflate. -->

diff --git a/library/src/net/saik0/android/unifiedpreference/UnifiedPreferenceHelper.java b/library/src/net/saik0/android/unifiedpreference/UnifiedPreferenceHelper.java
@@ -169,7 +169,7 @@ public void setSharedPreferencesMode(int sharedPreferencesMode) {
 	 * shown.
 	 */
 	@SuppressWarnings("deprecation")
-	protected void onPostCreate(Bundle savedInstanceState) {
+	public void onPostCreate(Bundle savedInstanceState) {
 		if (isSinglePane()) {
 			// In the simplified UI, fragments are not used at all and we
 			// instead use the older PreferenceActivity APIs.

diff --git a/library/src/net/saik0/android/unifiedpreference/UnifiedSherlockPreferenceActivity.java b/library/src/net/saik0/android/unifiedpreference/UnifiedSherlockPreferenceActivity.java