From b6f1d718db71bb4548d659e43efbd636805494e4 Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Wed, 14 Mar 2012 15:56:36 -0700
Subject: [PATCH] Define reply state in this overlay.

By default, it is not included in the conversation item layout.
The drawables have been moved to unifiedemail.
Change-Id: I2c9cecb8cda32db104ced2d3273327c1096155e9
---
 .../ic_badge_forward_holo_light.png           | Bin 309 -> 0 bytes
 .../ic_badge_reply_forward_holo_light.png     | Bin 312 -> 0 bytes
 .../ic_badge_reply_holo_light.png             | Bin 287 -> 0 bytes
 .../ic_badge_forward_holo_light.png           | Bin 218 -> 0 bytes
 .../ic_badge_reply_forward_holo_light.png     | Bin 216 -> 0 bytes
 .../ic_badge_reply_holo_light.png             | Bin 215 -> 0 bytes
 .../ic_badge_forward_holo_light.png           | Bin 407 -> 0 bytes
 .../ic_badge_reply_forward_holo_light.png     | Bin 394 -> 0 bytes
 .../ic_badge_reply_holo_light.png             | Bin 330 -> 0 bytes
 .../layout/conversation_item_view_normal.xml  | 100 ++++++++++++++++
 .../layout/conversation_item_view_wide.xml    | 109 ++++++++++++++++++
 11 files changed, 209 insertions(+)
 delete mode 100644 email2/res/drawable-hdpi/ic_badge_forward_holo_light.png
 delete mode 100644 email2/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png
 delete mode 100644 email2/res/drawable-hdpi/ic_badge_reply_holo_light.png
 delete mode 100644 email2/res/drawable-mdpi/ic_badge_forward_holo_light.png
 delete mode 100644 email2/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png
 delete mode 100644 email2/res/drawable-mdpi/ic_badge_reply_holo_light.png
 delete mode 100644 email2/res/drawable-xhdpi/ic_badge_forward_holo_light.png
 delete mode 100644 email2/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png
 delete mode 100644 email2/res/drawable-xhdpi/ic_badge_reply_holo_light.png
 create mode 100644 email2/res/layout/conversation_item_view_normal.xml
 create mode 100644 email2/res/layout/conversation_item_view_wide.xml

diff --git a/email2/res/drawable-hdpi/ic_badge_forward_holo_light.png b/email2/res/drawable-hdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 1b2d54fa571aad41102a97e92cc2461d304137e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002|Nkl<ZNXKLN
z|NlP&EinUKELgQ_6|tBfh)ao8Pp$?3fw-O47J%?HT3Z0Zi-4G!mKK2UIv{4Fr3E0o
z3y3*sX#ofyhRWl$z!*tG9T0ax*?)l814{qLgU<l5C_W3eLlwRPVs#+?2IbF3vWyVE
z3dGXbEU-sXR0K_iAofon)&k-WL|OpC_kdUt-GakV$tO_P|Ag`<Lv!zc67VG;mO!?^
z8%Z(^n!Z8o&rt6^B*E}wKrDnFMCYNBw}IFIDKcAtIEn<rQIadQlj#cd3`b21W@0Nc
zsAWMrEz6=JT9u}tM379Y;u@5@{b*I;@IZ4sX;tQsZdCvP3&oforl~Vs00000NkvXX
Hu0mjfI5~Xk

diff --git a/email2/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png b/email2/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index e89b301145b183cad30b04527371069b4589ee22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00030Nkl<ZNXKLN
z|NlP&Eisr_wQ3bE%!5mg8W!*a@iAIiAOyr`fcQTxED#0a^H9U7Zh-_4Uqv#Ususur
z@jW!dabc1zPz2(KL>f*X3kYFsK_m^tH%PQVf)op|r65AC1;v>PDHg!;z%e2%0LecG
zVgphvfE5vYiL?NOKLD`}DHeb*ClGHW(gG0v2E^W^SOCIoNbK!E{27{GUg3!RpFkW-
ziUlxi2{oV#h;xWYW%(!;;KE22?1ct_G?BTzjuZ==pqeHCaX1l%XJP~q5k4R$l0o4g
zg*B3?U;!xj{BR~y3M~MoEPK2ejRFfm$<>%(Q9*$P>O>WGw8Q|5cgk?fPLRw10000<
KMNUMnLSTaNpm0+F

diff --git a/email2/res/drawable-hdpi/ic_badge_reply_holo_light.png b/email2/res/drawable-hdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 1c0e8228818275def8e53abf1403ec0895d3e372..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|LP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002yNkl<ZNXKLN
z|NlP&EinUKELgQ_6*1VJNOf>biUpQH{Eb!?m;vzzApTDa3yhHrr@95YK>QZTaH?9M
z1;nq=45yj}>OlM)i{VtUKm~}O;4mB;eh9>Sfw&s#FuWGXK{fm*6aN9?`9REr%>rp4
zzDI%K$oLWvi_+2p5Z;9=h^T2vAht**6c5O1If2+4h!5jXy9HM=Rm5Wnw&chRG7O8_
z?f5d9B97#WE6vM6Q_+8D?oS}5sK90kzKnGhnoNaADeTZQ9s>bikX2l(BUwVT3I|p`
l(aZt{Y-J7677XcD1pw)Eo*}B3{*V9w002ovPDHLkV1nl$a%%tp

diff --git a/email2/res/drawable-mdpi/ic_badge_forward_holo_light.png b/email2/res/drawable-mdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 7e801b8cdcaa03b95428e253a55421ead1eafef6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3q4&NLo7}w|M>sko>_H9;?-55
zEgMwzER%SDupRN6BJn}Kqn>G_yeeD62YH3QMMoHBC}!^9xxrDIWfW4#Euime%+S_-
zfp<fTmk+}uV~0OtTHn~)85Qny<Q#}o_{UQ!=dnqu<N4!@JcoW7Fvl!pdh1Zb*)gAa
zqn_Mt$448Vust$=@<Qb*!vyiSCwq^DJLLG}IaP5Sc{N2P)pF0w&P#827^JS`Rx&up
Rx&a-_;OXk;vd$@?2>`ZLQE~tP

diff --git a/email2/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png b/email2/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index c46ba10f43d5e37ccfa643329b871afb632a99ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0Lo7}w|M>sko>^7GXHC>r
zF4^k~y9Kiw1O)QgAN_wKk-&L`f8i`ovjrR-^-7s;$60tilv5bYdd_m6=gd5m&cNZ#
z@X=6)Z4E<`pA%byfwaK+BS{P=E_gev@i@T{Bk^qOc851zNeo7AmmaVj+1?nz*I~ba
z^_9HBx&!G9{3gB)IkS3H!yMQ`go_xD#vMpIP`RejV+mt-ft#|b1Vbo$|8tusYFB|y
OW$<+Mb6Mw<&;$S)Qc3mz

diff --git a/email2/res/drawable-mdpi/ic_badge_reply_holo_light.png b/email2/res/drawable-mdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 7a7b07b8e3324259a74bcdd32a7616bcd1849161..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^E_P~Lo7}w|M>sko>^7GXHC>r
zF7au{l-ZB{;JLu`NcxFX0^5=N#vja<Y!-|k(-r>t_c7Kv{1IL?Gle;+@dy8;Xa6(U
zWEmcD2E0#{n9%R6tarz0C8NTep0nKco(2yr1&kN7FESUXKP=d>&Y_0?tUz+k#SCU&
z<{L?ltXluLI+#DIs>H4k-sqaFFVHPCd5UP`4<6M@#+KF&qXr=!hL^mhN5%PnEe5)j
N!PC{xWt~$(69C;aN__wT

diff --git a/email2/res/drawable-xhdpi/ic_badge_forward_holo_light.png b/email2/res/drawable-xhdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 0f5a80a3d16c80641bff035d62e5858d7d20f852..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 407
zcmV;I0cie-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004ANkl<ZSi|kt
zu}6hr6vy#PL_|cyB_g8f(iBZi5v|eG)YKXg5fM#I5z(5@5D`rg{Q*tU6wwqBak<3P
z@?2i8+pXSPPD8_4exCE3FYkGO=RCEPQY|uSe*yr##6Xq2p9HwTa3sJBZZH}NkZ^~3
zBtXIg#v=g|9x)XOknn^?BtXjgOe8=;6LXOOZHUG10QBLuaKR-8@m$c3F#k#6VzjXI
zRe+UJ@(i|0myO}-8vqG!`R=X&{kShAon@PSEol20DpicNZUAc~;s*8#+ABtI+5<qs
zW+#BbY$EMLC)rw?1#JhD8Ln#aH>`F7ST7x#z(GNK#t;sBDBi+yr%%wS%g1v<TU*Z)
zuT`;l6AK?T;dY6#j^mQQ4`8=q@fXZS8POA_qnz*|H*JU&-(|xJ8AdnRFG9xgb^cvL
z7LxO?uIax4aFS<9$WnTk$9TwEzR~l`=>KsV8Sgch?%w#V19<=d002ovPDHLkV1it<
Bu{r<%

diff --git a/email2/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png b/email2/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index 79b07e0a415c6e872f6504ba3d9c33d52e8cf298..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003|Nkl<ZSi@uZ
z|NlS3Kw^eL<A7DGRuRJ9gw)W|0kJ^*XP_KV1jPTLnC=efLb9B$4qyi2IcS#C%>kT1
zybg=yba4O=5Ffx{IX?V>8V-;E;`3x!PBjOdB-3)LIY0}DA5!7~QZcqPAP2-Z2GRi_
zEQ%*Oh&6mNB@Te)hP@Ox0Hk&)5VMi%00yY$brd)NgttJ;6|x)vD-mZ>-~bRl2E;<-
zIsk^-DR2M?UxJo1WIF(a^C@t^e`pq0p~L~`*Z|r__zA>{K-@?~c6|=jhv@)fFq#9l
zKn(?@5q@Y{Kx~;|PpJc3p@#j07G8BE7F^#zp+>F)n2{>2Y0xs`EeV!`qAiV*5QswZ
zy);^rjSvRu38z*XAT<|!gGL?0KsW#tMV5HW0UA2s3ACzb7zhX4hUOB6fpEZiY{f6V
o9B>#~I57;A12{=;kPH+C05ca@n^K3jb^rhX07*qoM6N<$g1wfL<^TWy

diff --git a/email2/res/drawable-xhdpi/ic_badge_reply_holo_light.png b/email2/res/drawable-xhdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 3f69cc412409742908c1197bb469c345fb818011..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmV-Q0k!^#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003INkl<ZSi@uZ
z|NlS3Kw^eb2f!GsR;?lx=aZoa1ykYxkmdge$^kIT2gCu$mebt<=$6yf0oW|3n*(rJ
zP8SE@vz+D*AY?gB9YBobxbS%(J_f|?K<o;{Y@|AX63emS=Rll^%^}zvKyAyB@l_yJ
z!RG*4S`NdnkR5^UfE+qF02UHFxT1hwj%dM`2-E1`fX|>%z?TgZh%^XYA1G-3fOs7d
zdSeL{L?B1}p`aj&C7{2Wn4&m}fFXoRyE-g-K0wVSx-tsK;|M|y5CY<#Nb0u(u{1f=
zaR{10q|^l`p@}Yy(gsN&7Do`H4`i_%wVGspXpR_=MyUr7e;Y^#AUk5f900;jRCT~;
c-*BKX0D5;GA=n0ASO5S307*qoM6N<$f|tpGMF0Q*

diff --git a/email2/res/layout/conversation_item_view_normal.xml b/email2/res/layout/conversation_item_view_normal.xml
new file mode 100644
index 000000000..3debfc428
--- /dev/null
+++ b/email2/res/layout/conversation_item_view_normal.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- This layout is used as a template to create custom view CanvasConversationHeaderView
+    in normal mode. To be able to get the correct measurements, every source field should
+    be populated with data here. E.g:
+    - Text View should set text to a random long string (android:text="@string/long_string")
+    - Image View should set source to a specific asset -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="70sp"
+    android:orientation="vertical">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
+        <ImageView
+            android:id="@+id/reply_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/replystate_margin_top"
+            android:layout_marginLeft="@dimen/replystate_margin_left"
+            android:layout_alignParentTop="true"
+            android:src="@drawable/ic_badge_reply_holo_light"
+            />
+        <TextView
+            android:id="@+id/senders"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/SendersStyle"
+            android:text="@string/long_string"
+            android:textSize="@dimen/senders_font_size"
+            android:lines="1"
+            android:layout_toRightOf="@id/reply_state" />
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="@dimen/total_conversationbar_width"
+            android:layout_alignParentRight="true">
+            <TextView
+                android:id="@+id/folders"
+                android:layout_width="@dimen/max_total_folder_width"
+                android:layout_height="wrap_content"
+                android:text="@string/long_string"
+                android:textSize="@dimen/folders_font_size"
+                android:lines="1"
+                android:paddingTop="1dip"
+                android:layout_marginTop="10sp" />
+            <ImageView
+                android:id="@+id/paperclip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_attachment_holo_light"
+                android:layout_marginTop="6sp" />
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:text="@string/long_string"
+                android:textSize="@dimen/date_font_size"
+                android:lines="1"
+                android:layout_marginRight="16dip"
+                android:layout_marginTop="10sp" />
+        </LinearLayout>
+    </RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            style="@style/CheckmarkStyle"
+            android:id="@+id/checkmark"
+            android:src="@drawable/btn_check_on_normal_holo_light"/>
+        <TextView
+            android:id="@+id/subject"
+            android:layout_width="@dimen/subject_width"
+            style="@style/SubjectStyle"
+            android:text="@string/long_string"
+            android:lines="2"/>
+        <ImageView
+            android:id="@+id/star"
+            style="@style/StarStyle"
+            android:src="@drawable/btn_star_off_normal_email_holo_light" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/email2/res/layout/conversation_item_view_wide.xml b/email2/res/layout/conversation_item_view_wide.xml
new file mode 100644
index 000000000..1c72ef682
--- /dev/null
+++ b/email2/res/layout/conversation_item_view_wide.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- This layout is used as a template to create custom view CanvasConversationHeaderView
+    in wide mode. To be able to get the correct measurements, every source field should
+    be populated with data here. E.g:
+    - Text View should set text to a random long string (android:text="@string/long_string")
+    - Image View should set source to a specific asset -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="64sp"
+    android:orientation="horizontal">
+    <ImageView
+        android:id="@+id/checkmark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/btn_check_on_normal_holo_light" />
+    <TextView
+        android:id="@+id/senders"
+        android:layout_width="224dip"
+        android:layout_height="wrap_content"
+        android:text="@string/long_string"
+        android:textSize="@dimen/wide_senders_font_size"
+        android:layout_gravity="center_vertical"
+        android:maxLines="2"
+        android:layout_marginTop="@dimen/wide_senders_margin_top"  />
+    <ImageView
+        android:id="@+id/reply_state"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/ic_badge_reply_holo_light" />
+    <TextView
+        android:id="@+id/subject"
+        android:layout_width="0dip"
+        android:layout_weight="0.7"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:text="@string/long_string"
+        android:lines="2"
+        android:textColor="@color/subject_text_color_unread"
+        android:textSize="@dimen/wide_subject_font_size"
+        android:layout_marginTop="2sp"
+        android:layout_marginRight="@dimen/wide_subject_margin_right"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/folders"
+            android:layout_width="@dimen/max_total_folder_width_wide"
+            android:layout_height="wrap_content"
+            android:paddingTop="2sp"
+            android:text="@string/long_string"
+            android:textSize="@dimen/folders_font_size"
+            android:lines="1"
+            android:layout_gravity="top" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center_vertical">
+            <ImageView
+                android:id="@+id/paperclip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_attachment_holo_light"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="@dimen/wide_attachment_margin_top"/>
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/date"
+                android:layout_marginTop="@dimen/wide_date_margin_top" />
+        </LinearLayout>
+    </LinearLayout>
+    <ImageView
+        android:id="@+id/star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/btn_star_off_normal_email_holo_light" />
+</LinearLayout>