WIP

api/build.gradle

@@ -18,7 +18,7 @@ android {
 
     defaultConfig {
         minSdkVersion 7
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
 }
 
@@ -26,7 +26,7 @@ dependencies {
     provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2'
     compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.2'
 
-    compile group: 'com.android.support', name: 'support-v4', version: '19.1.+'
+    compile group: 'com.android.support', name: 'support-v4', version: '21.0.0'
 
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7'
     compile group: 'joda-time', name: 'joda-time', version: '2.3', transitive: false

astrid/build.gradle

@@ -14,7 +14,7 @@ android {
 
     defaultConfig {
         minSdkVersion 7
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
 
     signingConfigs {
@@ -59,7 +59,7 @@ android.applicationVariants.all { variant ->
 dependencies {
     provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2'
 
-    compile group: 'com.android.support', name: 'appcompat-v7', version: '19.1.+'
+    compile group: 'com.android.support', name: 'appcompat-v7', version: '21.0.0'
 
     compile project(":api")
 

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java

@@ -34,13 +34,7 @@ public class TaskEditActivity extends AstridActivity {
 
 		actionBar.setDisplayHomeAsUpEnabled(true);
 		actionBar.setDisplayShowTitleEnabled(true);
-	}
-
-	public void updateTitle(boolean isNewTask) {
-	    ActionBar actionBar = getSupportActionBar();
-	    if (actionBar != null) {
-            actionBar.setTitle(isNewTask ? R.string.TEA_new_task : R.string.TAd_contextEditTask);
-        }
+        actionBar.setTitle("");
 	}
 
     /* (non-Javadoc)

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -607,10 +607,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     private void setIsNewTask(boolean isNewTask) {
         this.isNewTask = isNewTask;
-        Activity activity = getActivity();
-        if (activity instanceof TaskEditActivity) {
-            ((TaskEditActivity) activity).updateTitle(isNewTask);
-        }
     }
 
     /** Convenience method to populate fields after setting model to null */

astrid/src/main/java/org/tasks/ui/NavigationDrawerFragment.java

@@ -11,11 +11,11 @@ import android.graphics.drawable.BitmapDrawable;
 import android.support.v7.app.ActionBarActivity;
 import android.app.Activity;
 import android.support.v7.app.ActionBar;
-import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -159,7 +159,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
         mDrawerToggle = new ActionBarDrawerToggle(
                 getActivity(),                    /* host Activity */
                 mDrawerLayout,                    /* DrawerLayout object */
-                R.drawable.ic_drawer,             /* nav drawer image to replace 'Up' caret */
+//                R.drawable.ic_drawer,             /* nav drawer image to replace 'Up' caret */
                 R.string.navigation_drawer_open,  /* "open drawer" description for accessibility */
                 R.string.navigation_drawer_close  /* "close drawer" description for accessibility */
         ) {

astrid/src/main/res/layout/filter_adapter_row.xml

@@ -8,7 +8,7 @@
      are defined in FilterAdapter.java -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="55dip"
+    android:layout_height="40dip"
     android:paddingLeft="7dip"
     android:orientation="horizontal">
         
@@ -18,7 +18,6 @@
         android:layout_height="fill_parent"
         android:paddingRight="30dp"
         android:checked="false"
-        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:lines="1"
         android:singleLine="true"
         android:ellipsize="end"

astrid/src/main/res/layout/fragment_navigation_drawer.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:choiceMode="singleChoice"
-    android:dividerHeight="1px"
+    android:divider="@android:color/transparent"
     android:background="?attr/drawer_background"
     android:scrollbars="vertical"
     android:layout_alignParentTop="true"

astrid/src/main/res/values/strings-core.xml

@@ -299,8 +299,6 @@
   <!-- When controls dialog -->
   <string name="TEA_when_dialog_title">When is this due?</string>
 
-  <string name="TEA_new_task">New Task</string>
-
   <!-- ===================================================== MissedCallActivity == -->
   
   <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->

astrid/src/main/res/values/styles.xml

@@ -345,7 +345,7 @@
     <!-- ============================================== FilterListAdapter == -->
 
     <style name="TextAppearance.FLA_Filter">
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">14sp</item>
     </style>
     
     <style name="TextAppearance.FLA_Filter_Widget" parent="TextAppearance.FLA_Filter">