From b9dcb3fcda2e75850281c8b974f6aa891b4c361d Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 2 May 2012 17:38:35 -0700
Subject: [PATCH] Polish with Henry

---
 astrid/res/layout/filter_adapter_row.xml |   2 +-
 astrid/res/layout/header_nav_views.xml   |   1 +
 astrid/res/layout/quick_add_bar.xml      | 157 ++++++++++++-----------
 3 files changed, 86 insertions(+), 74 deletions(-)

diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/res/layout/filter_adapter_row.xml
index a12416e06..d2bc2fa19 100644
--- a/astrid/res/layout/filter_adapter_row.xml
+++ b/astrid/res/layout/filter_adapter_row.xml
@@ -13,7 +13,7 @@
         android:layout_height="48dip"
         android:layout_alignParentLeft="true"
         android:layout_marginTop="4dp" 
-        android:layout_marginLeft="12dip"
+        android:layout_marginLeft="8dip"
         android:scaleType="fitCenter"
         android:visibility="gone"/>
         
diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index 704e7b5b8..01ba5b846 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -14,6 +14,7 @@
     <View
         android:layout_width="1px"
         android:layout_height="fill_parent"
+        android:layout_marginLeft="-1px"
         android:background="?attr/asSeparatorBackground"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"/>
diff --git a/astrid/res/layout/quick_add_bar.xml b/astrid/res/layout/quick_add_bar.xml
index 782c6f033..9a90970e6 100644
--- a/astrid/res/layout/quick_add_bar.xml
+++ b/astrid/res/layout/quick_add_bar.xml
@@ -1,83 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- See the file "LICENSE" for the full license governing this code. -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    
     <LinearLayout
-        android:layout_width="fill_parent" 
-        android:layout_height="wrap_content"
-        android:minHeight="50dip"
-        android:padding="3dip"
-        android:paddingBottom="0dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-        
-        <!-- Voice Add Button -->
-        <ImageButton android:id="@+id/voiceAddButton"
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_gravity="top"
-            android:layout_marginLeft="5dip"
-            android:layout_marginRight="3dip"
-            android:paddingLeft="10dip"
-            android:paddingRight="10dip"
-            android:layout_weight="1"
-            android:visibility="gone"
-            android:background="@android:color/transparent"
-            android:src="?attr/asMicButtonImg"
-            android:scaleType="center"/> 
-    
-        <!-- Quick Add Task -->
-        <EditText android:id="@+id/quickAddText"
-            android:layout_width="wrap_content"
-            android:layout_height="39dip"
-            android:layout_marginRight="8dip"
-            android:layout_marginLeft="5dip"
-            android:layout_marginBottom="2dip"
-            android:layout_weight="100"
-            android:paddingLeft="5dip"
-            android:background="@drawable/edit_title_background"
-            android:hint="@string/TLA_quick_add_hint"
-            android:textSize="16sp"
-            android:autoText="true"
-            android:textColor="@android:color/black"
-            android:capitalize="sentences"/>
-        
-        <!-- Extended Add Button -->
-        <ImageButton android:id="@+id/quickAddButton"
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_gravity="top"
-            android:layout_marginRight="5dip"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:src="?attr/asAddButtonImg"
-            android:scaleType="center"/> 
-
-    </LinearLayout>
-  
-    
-    
-    <LinearLayout
-        android:id="@+id/taskListQuickaddControlsContainer"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginBottom="5dip"
-        android:visibility="gone">
-        
-        <LinearLayout 
-            android:id="@+id/taskListQuickaddControls"
+        android:background="?attr/asAbBackgroundColor"
+        android:orientation="vertical">
+        <View
             android:layout_width="fill_parent"
-            android:layout_height="50dip"
-            android:orientation="horizontal">
-            
-            <View 
-                android:layout_height="fill_parent"
-                android:layout_width="1px"
-                android:background="?attr/asSeparatorBackground"/>            
-            
-        </LinearLayout>
-    
+            android:layout_height="1px"
+            android:background="?attr/asThemeTextColor"
+            android:layout_marginBottom="3dip"/>
+	    <LinearLayout
+	        android:layout_width="fill_parent" 
+	        android:layout_height="wrap_content"
+	        android:minHeight="50dip"
+	        android:padding="3dip"
+	        android:paddingBottom="0dip"
+	        android:gravity="center_vertical"
+	        android:orientation="horizontal">
+	        
+	        <!-- Voice Add Button -->
+	        <ImageButton android:id="@+id/voiceAddButton"
+	            android:layout_width="39dip"
+	            android:layout_height="39dip"
+	            android:layout_gravity="top"
+	            android:layout_marginTop="-2dip"
+	            android:layout_marginLeft="4dip"
+	            android:layout_marginRight="2dip"
+	            android:paddingLeft="10dip"
+	            android:paddingRight="10dip"
+	            android:layout_weight="1"
+	            android:visibility="gone"
+	            android:background="@android:color/transparent"
+	            android:src="?attr/asMicButtonImg"
+	            android:scaleType="center"/> 
+	    
+	        <!-- Quick Add Task -->
+	        <EditText android:id="@+id/quickAddText"
+	            android:layout_width="wrap_content"
+	            android:layout_height="39dip"
+	            android:layout_marginRight="8dip"
+	            android:layout_marginLeft="5dip"
+	            android:layout_marginBottom="2dip"
+	            android:layout_weight="100"
+	            android:paddingLeft="5dip"
+	            android:background="@drawable/edit_title_background"
+	            android:hint="@string/TLA_quick_add_hint"
+	            android:textSize="16sp"
+	            android:autoText="true"
+	            android:textColor="@android:color/black"
+	            android:capitalize="sentences"/>
+	        
+	        <!-- Extended Add Button -->
+	        <ImageButton android:id="@+id/quickAddButton"
+	            android:layout_width="39dip"
+	            android:layout_height="39dip"
+	            android:layout_gravity="top"
+	            android:layout_marginRight="5dip"
+	            android:layout_weight="1"
+	            android:background="@android:color/transparent"
+	            android:src="?attr/asAddButtonImg"
+	            android:scaleType="center"/> 
+	
+	    </LinearLayout>
+	  
+	    
+	    
+	    <LinearLayout
+	        android:id="@+id/taskListQuickaddControlsContainer"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:orientation="vertical"
+	        android:layout_marginBottom="5dip"
+	        android:visibility="gone">
+	        
+	        <LinearLayout 
+	            android:id="@+id/taskListQuickaddControls"
+	            android:layout_width="fill_parent"
+	            android:layout_height="50dip"
+	            android:orientation="horizontal">
+	            
+	            <View 
+	                android:layout_height="fill_parent"
+	                android:layout_width="1px"
+	                android:background="?attr/asSeparatorBackground"/>            
+	            
+	        </LinearLayout>
+	    
+	    </LinearLayout>
     </LinearLayout>
   
 </merge>
\ No newline at end of file