Merge pull request #334 from mpcjanssen/holo-cab

Implements Context Action Bar using Action Bar Sherlock (also on GB)

.classpath

@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="libs/apache-mime4j-0.6.jar"/>
-	<classpathentry kind="lib" path="libs/dropbox-android-sdk-1.2.3.jar"/>
-	<classpathentry kind="lib" path="libs/httpmime-4.0.3.jar"/>
-	<classpathentry kind="lib" path="libs/json_simple-1.1.jar"/>
-	<classpathentry kind="lib" path="libs/libphonenumber-4.1.jar"/>
-	<classpathentry kind="lib" path="libs/signpost-commonshttp4-1.2.1.1.jar"/>
-	<classpathentry kind="lib" path="libs/signpost-core-1.2.1.1.jar"/>
-	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="lib" path="libs/apache-mime4j-0.6.jar"/>
+	<classpathentry kind="lib" path="libs/dropbox-android-sdk-1.2.3.jar"/>
+	<classpathentry kind="lib" path="libs/httpmime-4.0.3.jar"/>
+	<classpathentry kind="lib" path="libs/json_simple-1.1.jar"/>
+	<classpathentry kind="lib" path="libs/libphonenumber-4.1.jar"/>
+	<classpathentry kind="lib" path="libs/signpost-commonshttp4-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/signpost-core-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="/actionbarsherlock/libs/android-support-v4.jar"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

.gitignore

@@ -1,13 +1,13 @@
-#/.gitignore
-#.project
-#.classpath
-.settings/
-build.properties
-build.xml
-default.properties
-local.properties
-bin/
-gen/
-res/values/dropbox.xml
-proguard.cfg
-AndroidManifest.xml
+#/.gitignore
+#.project
+#.classpath
+.settings/
+build.properties
+build.xml
+default.properties
+local.properties
+bin/
+gen/
+res/values/dropbox.xml
+proguard.cfg
+/AndroidManifest.xml

AndroidManifest.sample.xml

@@ -26,8 +26,8 @@ You should have received a copy of the GNU General Public License along with Tod
     android:versionName="1.1.1" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk
-        android:minSdkVersion="4"
-        android:targetSdkVersion="14" />
+        android:minSdkVersion="7"
+        android:targetSdkVersion="17" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -78,7 +78,7 @@ You should have received a copy of the GNU General Public License along with Tod
             </intent-filter>
         </activity>
         <activity
-            android:name=".Filter"
+            android:name=".FilterActivity"
             android:label="Filter"
             android:theme="@android:style/Theme.NoTitleBar" />
         <activity
@@ -88,7 +88,7 @@ You should have received a copy of the GNU General Public License along with Tod
             android:name=".AddTask"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/addtask"
-            android:theme="@android:style/Theme.NoTitleBar"
+            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustResize" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -123,6 +123,7 @@ You should have received a copy of the GNU General Public License along with Tod
             android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
         <activity
             android:name=".TodoTxtTouch"
+            android:uiOptions="splitActionBarWhenNarrow"
             android:configChanges="keyboardHidden|orientation" >
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -150,4 +151,4 @@ You should have received a copy of the GNU General Public License along with Tod
         </receiver>
     </application>
 
-</manifest>
+</manifest>

dependencies/JakeWharton-ActionBarSherlock-c47975f/.gitignore

@@ -0,0 +1,34 @@
+#Android generated
+bin
+gen
+lint.xml
+
+#Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+#IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+#Maven
+target
+release.properties
+pom.xml.*
+
+#Ant
+build.xml
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+#Other
+.DS_Store
+tmp

dependencies/JakeWharton-ActionBarSherlock-c47975f/.travis.yml

@@ -0,0 +1,18 @@
+language: java
+
+branches:
+  excludes:
+    - gh-pages
+
+notifications:
+  email: false
+
+before_install:
+  - wget http://dl.google.com/android/android-sdk_r20.0.3-linux.tgz
+  - tar -zxf android-sdk_r20.0.3-linux.tgz
+  - export ANDROID_HOME=~/builds/JakeWharton/ActionBarSherlock/android-sdk-linux
+  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+  - TOOLS=$(android list sdk --no-ui | grep "Android SDK Platform-tools" | cut -d"-" -f1)
+  - android update sdk --filter "$TOOLS" --no-ui --force
+  - SDK=$(android list sdk --no-ui | grep ", API 14," | cut -d"-" -f1)
+  - android update sdk --filter "$SDK" --no-ui --force