From fb83cef9ade8b4295bffff44be5b2e4af5a30eff Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Wed, 28 Sep 2011 15:33:20 -0700
Subject: [PATCH] Hide attachment progress bar on complete.

Also fix up styles to (mostly) match mocks and be consistent
with Gmail

Bug: 5205957
Change-Id: Iea7e9706464a8050255a7be78fca471cb7f9f6cf
---
 res/color/buttontext.xml                      |   4 +-
 res/drawable-hdpi/attachment_bg_holo.9.png    | Bin 0 -> 288 bytes
 res/drawable-mdpi/attachment_bg_holo.9.png    | Bin 0 -> 266 bytes
 res/drawable-xhdpi/attachment_bg_holo.9.png   | Bin 0 -> 391 bytes
 .../message_view_attachment.xml               |  75 +++++----
 res/layout-sw600dp/message_view_fragment.xml  |   1 -
 res/layout/message_view_attachment.xml        | 145 ++++++++++--------
 res/values-sw600dp/styles.xml                 |   1 +
 res/values/colors.xml                         |   3 +
 res/values/styles.xml                         |   8 +-
 .../email/activity/MessageViewFragment.java   |   1 -
 .../activity/MessageViewFragmentBase.java     |   5 +
 12 files changed, 129 insertions(+), 114 deletions(-)
 create mode 100644 res/drawable-hdpi/attachment_bg_holo.9.png
 create mode 100644 res/drawable-mdpi/attachment_bg_holo.9.png
 create mode 100644 res/drawable-xhdpi/attachment_bg_holo.9.png

diff --git a/res/color/buttontext.xml b/res/color/buttontext.xml
index 8b88da8af..25aca0d14 100644
--- a/res/color/buttontext.xml
+++ b/res/color/buttontext.xml
@@ -15,6 +15,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/text_disabled_color" />
-  <item android:color="@color/text_primary_color" />
+  <item android:state_enabled="false" android:color="@color/button_text_disabled_color" />
+  <item android:color="@color/button_text_color" />
 </selector>
diff --git a/res/drawable-hdpi/attachment_bg_holo.9.png b/res/drawable-hdpi/attachment_bg_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..43983c5fe7a9178e653961341a98b5f7e26c3ee3
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`7?JY5_^JUZV_bL2W?AmDo6MAY@*x;;_rZ|vSFys{(Uxa%Y<kt5fZ
ztox+c(sHui$E-deRLtY-tp6UOhR>NFOp`csf#D0o)<%<=iea@ZxpRs`ua{1r^Dg(c
z*^jg>T;)#x@|7#N8d$H&pRNzLWp$0n>z$X~>=t_8n`=b_5M5)@?RqM5AwI=%b(z@W
zha7VnY&WRxz06p_VE%w7M%m*7^C>?0{VNxwH{AUgJmJ;`;d`>n+7`@;WpoJ@oS5mT
e$N7Wt6KmH;^&pYjdl!JdVeoYIb6Mw<&;$TvyKH9w

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/attachment_bg_holo.9.png b/res/drawable-mdpi/attachment_bg_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..040bbd04d3cfb56be41271a37550cf12c748f712
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLrl&o-U3d7QJsLIdUB`5O9rO#>)EoQmXl0NB_&Ozxv$##`VtSNXB2i
zoCO?;Y%!huOeYOKtMN3e7-d+#WZ~R?$NYd^x=#Vyy04!ye(l@7?)5XF!zR8{zwe9e
zUbQV({;<IvFPFy_v%cSBaGlsHu<3A>dP~9wss5u2RHm=_!Ek!{AJ_f5T5(6FywE<9
zdykntVRzS4fda<91Dax%3)og2>OXTpcEaSAV!bkrr=c1jS>|0e-tCyLdlTqx22WQ%
Jmvv4FO#t`wW|sf}

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/attachment_bg_holo.9.png b/res/drawable-xhdpi/attachment_bg_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b59af1df1d1b6a0fd963fed8a1125cbaecd39b03
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_00004b3#c}2nYxW
zd<bNS00009a7bBm000Y#000Y#0XNCZtpET4DM>^@R9J=Wn88kjFcd}4tD=q@qr2G<
zzKZ|gGx-gd?oC97zFE-6befEbV_Ij?lQazkxF@AFeW0pbi6-r8R27MicR=%(2mUr6
z_yT5N6WIZ;1tp9F@BwfiPBZ}f{eEfNb}3;nj^ks<7r>i{16<d2^Dqok36Z|<pMfQ0
zZzCdrTb4yG-IxK#I#0w7Hj#Or-KD!S&~Tcg#KGddFF7I-=f@&WRZEMU!V3ofNEJz`
zA}LiQrHZ6fk(4TuQbkg1yY}zg)QH>!v51P4+$o-8$uGbg@Dy4@p3zd)TIQRz+?;@S
zK&`H^8ng))`Ai}NkwfS|?W9EgT@ZN)61m=!4-!-8J#bb&n2ba%2lgAon}mhOl%B2I
l8YZer^0ky)-~`qmHAl*rOU=oTBi#T1002ovPDHLkV1m?Spkx35

literal 0
HcmV?d00001

diff --git a/res/layout-sw600dp/message_view_attachment.xml b/res/layout-sw600dp/message_view_attachment.xml
index b342d200d..77062169e 100644
--- a/res/layout-sw600dp/message_view_attachment.xml
+++ b/res/layout-sw600dp/message_view_attachment.xml
@@ -21,15 +21,31 @@
     android:layout_width="match_parent"
     android:layout_height="64dip"
     android:orientation="horizontal"
+    android:background="@drawable/attachment_bg_holo"
     >
-    <ImageView
-        android:id="@+id/attachment_icon"
+    <FrameLayout
         android:layout_width="64dip"
-        android:layout_height="match_parent"
-        android:layout_weight="0"
-        android:src="@drawable/ic_attachment_holo_light"
-        android:scaleType="fitCenter"
-        />
+        android:layout_height="64dip"
+        android:orientation="vertical"
+        android:background="#e5e5e5"
+        >
+        <ImageView
+            android:id="@+id/attachment_icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/ic_attachment_holo_light"
+            android:scaleType="center"
+            />
+        <ProgressBar
+            android:id="@+id/progress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="0dip"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:max="100"
+            android:visibility="invisible"
+            />
+    </FrameLayout>
     <LinearLayout
         android:layout_width="0dip"
         android:layout_height="match_parent"
@@ -41,49 +57,31 @@
         >
         <RelativeLayout
             android:layout_width="0dip"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:layout_marginLeft="32dip"
             android:layout_marginRight="16dip"
             >
-            <ProgressBar
-                android:id="@+id/progress"
-                android:layout_width="match_parent"
-                android:layout_height="16dip"
-                android:layout_alignParentBottom="true"
+            <TextView
+                android:id="@+id/attachment_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="2dip"
-                android:layout_marginBottom="6dip"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:max="100"
-                android:visibility="invisible"
-                android:gravity="center"
+                android:textSize="18dip"
+                android:textColor="#333333"
+                android:singleLine="true"
+                android:ellipsize="middle"
                 />
             <TextView
                 android:id="@+id/attachment_info"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_above="@id/progress"
-                android:layout_marginLeft="16dip"
-                android:textSize="14dip"
+                android:layout_alignParentLeft="true"
+                android:layout_below="@+id/attachment_name"
+                android:textSize="14sp"
                 android:textColor="@color/text_secondary_color"
                 android:singleLine="true"
-                android:gravity="right|bottom"
-                />
-            <TextView
-                android:id="@+id/attachment_name"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@id/attachment_info"
-                android:layout_above="@id/progress"
-                android:textSize="18dip"
-                android:textColor="@color/text_primary_color"
-                android:singleLine="true"
-                android:ellipsize="middle"
-                android:gravity="left|bottom"
                 />
         </RelativeLayout>
 
@@ -95,7 +93,6 @@
             android:orientation="horizontal"
             android:divider="?android:attr/dividerVertical"
             android:showDividers="middle"
-            android:dividerPadding="16dip"
             >
             <Button
                 android:id="@+id/load"
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index dd93dab5c..e0bc2c9d4 100644
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
@@ -219,7 +219,6 @@
                     android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/message_view_info_back_color"
                     android:divider="?android:attr/dividerHorizontal"
                     android:showDividers="beginning|middle|end"
                     />
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index 3266bf627..eeb159252 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -23,91 +23,100 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
+    android:orientation="vertical"
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="middle"
+    android:background="@drawable/attachment_bg_holo"
     >
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        >
-        <ProgressBar
-            android:id="@+id/progress"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="0dip"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:max="100"
-            android:visibility="invisible"
-            />
-        <ImageView
-            android:id="@+id/attachment_icon"
-            android:layout_width="48dip"
-            android:layout_height="48dip"
-            android:src="@drawable/ic_attachment_holo_light"
-            />
-    </LinearLayout>
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        android:orientation="vertical"
+        android:gravity="center_vertical"
         >
+        <FrameLayout
+            android:id="@+id/attachment_container"
+            android:layout_width="48dip"
+            android:layout_height="48dip"
+            android:background="#e5e5e5"
+            >
+            <ImageView
+                android:id="@+id/attachment_icon"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/ic_attachment_holo_light"
+                android:scaleType="center"
+                />
+            <ProgressBar
+                android:id="@+id/progress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="0dip"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:max="100"
+                android:visibility="invisible"
+                />
+        </FrameLayout>
         <TextView
             android:id="@+id/attachment_name"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/attachment_container"
+            android:layout_marginLeft="16dip"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondaryInverse"
+            android:textColor="#333333"
             android:singleLine="true"
             android:ellipsize="middle"
             />
         <TextView
             android:id="@+id/attachment_info"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@+id/attachment_container"
+            android:layout_below="@+id/attachment_name"
+            android:layout_marginLeft="16dip"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorTertiaryInverse"
+            android:textColor="@color/text_secondary_color"
             android:singleLine="true"
             android:ellipsize="middle"
             />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-            <Button
-                android:id="@+id/load"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_load_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/cancel"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_cancel_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/info"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_info_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/save"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_save_action"
-                android:visibility="gone"
-                />
-            <Button
-                android:id="@+id/open"
-                style="@style/Attachment.Button"
-                android:text="@string/message_view_attachment_view_action"
-                android:visibility="gone"
-                />
-        </LinearLayout>
+    </RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:dividerPadding="8dip"
+        >
+        <Button
+            android:id="@+id/load"
+            style="@style/Attachment.Button"
+            android:text="@string/message_view_attachment_load_action"
+            android:visibility="gone"
+            />
+        <Button
+            android:id="@+id/cancel"
+            style="@style/Attachment.Button"
+            android:text="@string/message_view_attachment_cancel_action"
+            android:visibility="gone"
+            />
+        <Button
+            android:id="@+id/info"
+            style="@style/Attachment.Button"
+            android:text="@string/message_view_attachment_info_action"
+            android:visibility="gone"
+            />
+        <Button
+            android:id="@+id/save"
+            style="@style/Attachment.Button"
+            android:text="@string/message_view_attachment_save_action"
+            android:visibility="gone"
+            />
+        <Button
+            android:id="@+id/open"
+            style="@style/Attachment.Button"
+            android:text="@string/message_view_attachment_view_action"
+            android:visibility="gone"
+            />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 598fe4c5e..bc51240d4 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -162,6 +162,7 @@
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
         <item name="android:gravity">center</item>
+        <item name="android:textAllCaps">true</item>
     </style>
 
     <style name="message_list_item_normal">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cccb853ac..f00f37eaf 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,6 +34,9 @@
     <color name="text_ternary_color">#aaaaaa</color>
     <color name="text_disabled_color">#888888</color>
 
+    <color name="button_text_color">#777777</color>
+    <color name="button_text_disabled_color">#cccccc</color>
+
     <!-- TODO: properly put these text colors in the theme and use selectors -->
     <color name="text_primary_color_inverse">#ffffff</color>
     <color name="text_secondary_color_inverse">#eeeeee</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 47d0b25bc..313f20a25 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -120,17 +120,19 @@
 
     <style name="Attachment" />
 
-    <style name="Attachment.Button" parent="@android:style/Widget.Holo.Button">
+    <style name="Attachment.Button" parent="@android:style/Widget.Holo.Button.Borderless">
         <item name="android:minHeight">0dip</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_weight">1</item>
         <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:paddingTop">2dip</item>
-        <item name="android:paddingBottom">2dip</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingBottom">8dip</item>
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+        <item name="android:textStyle">bold</item>
         <item name="android:textColor">@color/buttontext</item>
         <item name="android:singleLine">true</item>
+        <item name="android:textAllCaps">true</item>
     </style>
 
     <style name="attachment_container">
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 260ff07b0..1c3143cd6 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -20,7 +20,6 @@ import android.app.Activity;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index a51e6f3d6..e46cffba5 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -1309,6 +1309,11 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
                 mProgressView.setIndeterminate(false);
             }
             mProgressView.setProgress(progress);
+
+            // Hide on completion.
+            if (progress == 100) {
+                hideProgress();
+            }
         }
 
         public void showProgressIndeterminate() {