Merge actionbar styling updates from arne

astrid/.classpath

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="javax/xml/validation/|javax/xml/transform/dom/|javax/xml/parsers/|org/jaxp/transform/dom/|org/jaxp/transform/sax/|org/jaxp/transform/stax/|org/jaxp/transform/stream/|org/jaxp/stream/events/|org/jaxp/stream/util/|org/jaxp/parsers/|org/jaxp/stream/|org/jaxp/validation/" kind="src" path="src"/>
+	<classpathentry kind="src" path="abs_src"/>
 	<classpathentry kind="src" path="src-legacy"/>
 	<classpathentry kind="src" path="common-src"/>
 	<classpathentry excluding="com/todoroo/astrid/rmilk/EditOperationExposer.java|com/todoroo/astrid/rmilk/MilkEditActivity.java|com/todoroo/astrid/actfm/TaskFields.java|com/todoroo/astrid/actfm/ShowProjectExposer.java|com/todoroo/astrid/actfm/ProjectDetailExposer.java|com/todoroo/astrid/actfm/ProjectListActivity.java" kind="src" path="plugin-src"/>

astrid/.project

@@ -36,4 +36,11 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>abs_src</name>
+			<type>2</type>
+			<locationURI>PARENT_LOC/astrid/actionbarsherlock/library/src</locationURI>
+		</link>
+	</linkedResources>
 </projectDescription>

astrid/res/values/styles.xml

@@ -19,22 +19,34 @@
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
         <item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
         <item name="asSeparatorBackground">#888888</item>
+        <!-- actionbar-styling -->
+        <item name="abBackground">@drawable/header_background</item>
+        <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
+        <item name="abLogo">@drawable/icon_48</item>
     </style>
     
-    <style name="Theme.Transparent" parent="@style/Theme.Sherlock">
-        <item name="asContentBackground">@drawable/background_transparent</item>
+    <style name="Theme.Transparent" parent="@style/Theme">
+		<item name="asContentBackground">@drawable/background_transparent</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
         <item name="asMembersHeaderBackground">@android:color/transparent</item>
+        <!-- actionbar-styling -->
+        <item name="abBackground">@drawable/header_background</item>
+        <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
+        <item name="abLogo">@drawable/icon_48</item>
     </style>
     
     <style name="Theme.FullTransparent" parent="@style/Theme.Sherlock">
-	    <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowIsTranslucent">true</item>
 	    <item name="android:windowBackground">@android:color/transparent</item>
 	    <item name="android:windowContentOverlay">@null</item>
 	    <item name="android:windowIsFloating">true</item>
 	    <item name="android:backgroundDimEnabled">false</item>
-  	</style>
+        <!-- actionbar-styling -->
+        <item name="abBackground">@drawable/header_background</item>
+        <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
+        <item name="abLogo">@drawable/icon_48</item>
+	</style>
         
     <style name="Theme.White" parent="@style/Theme.Sherlock.Light">
         <item name="asContentBackground">@drawable/background_white</item>
@@ -46,6 +58,10 @@
         <item name="asFilterHeaderColor">#ffffff</item>
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
         <item name="asMembersHeaderBackground">@drawable/ios_fabric_480</item>
+        <!-- actionbar-styling -->
+        <item name="abBackground">@drawable/header_background_white</item>
+        <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
+        <item name="abLogo">@drawable/icon_48</item>
     </style>
     
     <style name="Theme.TransparentWhite" parent="@style/Theme.White">
@@ -53,6 +69,10 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
         <item name="asMembersHeaderBackground">@android:color/transparent</item>
+        <!-- actionbar-styling -->
+        <item name="abBackground">@drawable/header_background_white</item>
+        <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
+        <item name="abLogo">@drawable/icon_48</item>
     </style>
     
     <style name="Theme.Dialog">
@@ -230,11 +250,4 @@
         <item name="android:textSize">14sp</item>                                                                                                                                                                    
         <item name="android:textColor">@android:color/black</item>                                                                                                                                                   
     </style> 
-
-	<!-- ====================================================== Actionbar == -->
-
-    <style name="customActionBarStyle"  parent="@style/Theme.Sherlock">
-        <item name="android:background">@drawable/header_background</item>
-    </style>
-
 </resources>

astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java

@@ -17,6 +17,8 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
         ThemeService.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_edit_wrapper_activity);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 	}
 
     /* (non-Javadoc)

astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java

@@ -26,7 +26,9 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_list_wrapper_activity);
 
-		Filter savedFilter = getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        Filter savedFilter = getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER);
 		setupTasklistFragmentWithFilter(savedFilter);
 		setupFilterlistFragment();
 
@@ -50,8 +52,10 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
         Fragment frag = getFilterListFragment();
         if (frag != null) {
             mMultipleFragments = true;
+            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
         } else {
             mMultipleFragments = false;
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
     }