am 51e7fa5d: am affa5660: MessageView: UI change prev/next arrows.

Merge commit '51e7fa5dc46463ee4d96ac9db633cd150940a22b'

* commit '51e7fa5dc46463ee4d96ac9db633cd150940a22b':
  MessageView: UI change prev/next arrows.

res/drawable/btn_arrow_background.xml

@@ -19,7 +19,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_icon_bg_pressed" />
-    <item android:state_focused="true" android:drawable="@drawable/btn_icon_bg_focused" />
-    <!-- <item android:drawable="@drawable/bg_arrow_unselected" /> -->
+    <item android:state_pressed="true" android:drawable="@drawable/bg_arrow_press" />
+    <item android:state_focused="true" android:drawable="@drawable/bg_arrow_focus" />
+    <item android:state_focused="false" android:state_pressed="false"
+          android:drawable="@drawable/bg_arrow_unselected" />
 </selector>

res/drawable/btn_arrow_left.xml

@@ -19,6 +19,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/ic_btn_arrow_left_focus" />
-    <item android:drawable="@drawable/ic_btn_arrow_left_unselected" />
+    <item android:state_focused="false" android:state_pressed="false"
+          android:drawable="@drawable/ic_btn_arrow_left_unselected" />
+    <item android:drawable="@drawable/ic_btn_arrow_left_focus" />
 </selector>

res/drawable/btn_arrow_right.xml

@@ -19,6 +19,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/ic_btn_arrow_right_focus" />
-    <item android:drawable="@drawable/ic_btn_arrow_right_unselected" />
+    <item android:state_focused="false" android:state_pressed="false"
+          android:drawable="@drawable/ic_btn_arrow_right_unselected" />
+    <item android:drawable="@drawable/ic_btn_arrow_right_focus" />
 </selector>

res/layout/message_view.xml

@@ -33,29 +33,40 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
             <!-- Note, height is 2+35+0.  There is a 4pixel fade on top of header image -->
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="37dip"
                 android:paddingTop="2dip"
-                android:paddingLeft="6dip"
-                android:paddingRight="9dip">
+                android:background="#101010">
                 <ImageButton
                     android:id="@+id/previous"
                     android:layout_height="35dip"
-                    android:layout_width="40dip"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentTop="true"
                     android:src="@drawable/btn_arrow_left"
-                    android:background="@drawable/btn_arrow_background" />
+                    android:scaleType="fitStart" 
+                    android:paddingLeft="6dip"
+                    android:background="@drawable/btn_arrow_background"
+                    android:paddingTop="0dip"
+                    android:paddingBottom="0dip"
+                     />
                 <ImageButton
                     android:id="@+id/next"
                     android:layout_height="35dip"
-                    android:layout_width="40dip"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentTop="true" 
                     android:src="@drawable/btn_arrow_right"
-                    android:background="@drawable/btn_arrow_background" />
-            </RelativeLayout>
+                    android:scaleType="fitEnd"
+                    android:paddingRight="9dip"
+                    android:background="@drawable/btn_arrow_background"
+                    android:paddingTop="0dip"
+                    android:paddingBottom="0dip" 
+                     />
+            </LinearLayout>
 
             <include layout="@layout/message_view_header" />
 

res/layout/message_view_header.xml

@@ -20,7 +20,11 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/ic_email_thread_open_top_default">
+        android:background="@drawable/header_card"
+        android:paddingTop="3dip"
+        android:paddingBottom="3dip"
+        android:paddingLeft="3dip"
+        android:paddingRight="6dip">
         <LinearLayout
             android:id="@+id/from_container"
             android:layout_width="fill_parent"

src/com/android/email/activity/MessageView.java

@@ -816,8 +816,8 @@ public class MessageView extends Activity implements OnClickListener {
                 hasPrev = !cursor.isFirst();
                 hasNext = !cursor.isLast();
             }
-            mPrevious.setVisibility(hasPrev ? View.VISIBLE : View.GONE);
-            mNext.setVisibility(hasNext ? View.VISIBLE : View.GONE);
+            mPrevious.setVisibility(hasPrev ? View.VISIBLE : View.INVISIBLE);
+            mNext.setVisibility(hasNext ? View.VISIBLE : View.INVISIBLE);
         }
     }