Killed branding in header, only show informative titles

astrid/res/layout/control_set_notes.xml

@@ -16,7 +16,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="1"
-      android:src="@drawable/tango_microphone"
+      android:src="@android:drawable/ic_btn_speak_now"
       android:scaleType="fitCenter"
       android:visibility="gone" />
     <EditText

astrid/res/layout/filter_list_activity.xml

@@ -16,14 +16,28 @@
         
 
         <!-- Header Logo -->
-        <ImageView android:id="@+id/headerLogo"
+        <!-- <ImageView android:id="@+id/headerLogo"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_weight="100"
             android:gravity="center"
             android:paddingLeft="43dip"
             android:src="@drawable/header_logo_new"
-            android:scaleType="center"/>
+            android:scaleType="center"/>  -->
+        
+        <!-- List Label -->
+        <TextView android:id="@+id/listLabel"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:paddingLeft="43dip"
+            android:layout_weight="100"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:text="@string/FLA_title"
+            style="@style/TextAppearance.TLA_Header"/>    
 
        	<View 
            android:layout_width="0.5dip"

astrid/res/layout/task_list_activity.xml

@@ -37,7 +37,7 @@
 	    
 	        
 	        <!-- Header Logo -->
-	        <ImageView android:id="@+id/headerLogo"
+	        <!-- <ImageView android:id="@+id/headerLogo"
 	            android:layout_width="fill_parent"
 	            android:layout_height="fill_parent"
 	            android:layout_weight="100"
@@ -45,7 +45,7 @@
 	            android:paddingRight="43dip"
 	            android:src="@drawable/header_logo_new"
 	            android:scaleType="center"
-	            android:visibility="gone"/>
+	            android:visibility="gone"/>  -->
 	           
 	        <!-- List Label -->
 	        <TextView android:id="@+id/listLabel"

astrid/res/values/strings-core.xml

@@ -216,7 +216,7 @@
   <!-- =============================================== FilterListActivity == -->
 
   <!-- Filter List Activity Title -->    
-  <string name="FLA_title">Astrid: Filters</string>
+  <string name="FLA_title">Lists</string>
   
   <!-- Displayed when loading filters -->    
   <string name="FLA_loading">Loading Filters...</string>

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

@@ -94,7 +94,7 @@ import com.todoroo.astrid.utility.Constants;
 public class FilterListActivity extends ExpandableListActivity {
 
     // -- extra codes
-    public static final String SHOW_BACK_BUTTON = "show_back"; //$NON-NLS-1$
+    //public static final String SHOW_BACK_BUTTON = "show_back"; //$NON-NLS-1$
 
     // --- menu codes
 
@@ -140,10 +140,6 @@ public class FilterListActivity extends ExpandableListActivity {
 
         setContentView(R.layout.filter_list_activity);
         ImageView backButton = (ImageView) findViewById(R.id.back);
-        if (!getIntent().getBooleanExtra(SHOW_BACK_BUTTON, true)) {
-            backButton.setVisibility(View.GONE);
-            findViewById(R.id.headerLogo).setPadding(0, 0, 0, 0);
-        }
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         backButton.setOnClickListener(new OnClickListener() {

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

@@ -299,8 +299,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             isFilter = true;
         } else {
             filter = CoreFilterExposer.buildInboxFilter(getResources());
-            findViewById(R.id.headerLogo).setVisibility(View.VISIBLE);
-            findViewById(R.id.listLabel).setVisibility(View.GONE);
+            //findViewById(R.id.headerLogo).setVisibility(View.VISIBLE);
+            //findViewById(R.id.listLabel).setVisibility(View.GONE);
             isFilter = false;
         }