commit 22c267c6907b9c24205758c4a564c75710c4fd70
author Mindy Pereira <mindyp@google.com> Tue Apr 03 12:25:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 03 12:25:05 2012 -0700
tree ed04ecbf6731befe07733f69fb54ffb653bd2943
parent 3580f1c5d39bd2131511bdd7ab6d1e2c6246e53e
parent 4c232e18b5d667931d8aaeb29f19394016c17d02

Merge "Respect default replyall setting."

src/com/android/mail/browse/ConversationViewAdapter.java

diff --git a/src/com/android/mail/browse/ConversationViewAdapter.java b/src/com/android/mail/browse/ConversationViewAdapter.java
index f27ca27..eb0e215 100644
--- a/src/com/android/mail/browse/ConversationViewAdapter.java
+++ b/src/com/android/mail/browse/ConversationViewAdapter.java
@@ -149,10 +149,12 @@
     public class MessageHeaderItem extends ConversationItem {
         public final Message message;
         public boolean expanded;
+        public boolean defaultReplyAll;
 
-        private MessageHeaderItem(Message message, boolean expanded) {
+        private MessageHeaderItem(Message message, boolean defaultReplyAll, boolean expanded) {
             this.message = message;
             this.expanded = expanded;
+            this.defaultReplyAll = defaultReplyAll;
         }
 
         @Override
@@ -164,7 +166,7 @@
         public View createView(Context context, LayoutInflater inflater, ViewGroup parent) {
             final MessageHeaderView v = (MessageHeaderView) inflater.inflate(
                     R.layout.conversation_message_header, parent, false);
-            v.initialize(mDateBuilder, mAccount, false /* defaultReplyAll */);
+            v.initialize(mDateBuilder, mAccount, defaultReplyAll /* defaultReplyAll */);
             v.setCallbacks(mMessageCallbacks);
             return v;
         }
@@ -298,8 +300,8 @@
         return addItem(new ConversationHeaderItem(conv));
     }
 
-    public int addMessageHeader(Message msg, boolean expanded) {
-        return addItem(new MessageHeaderItem(msg, expanded));
+    public int addMessageHeader(Message msg, boolean defaultReplyAll, boolean expanded) {
+        return addItem(new MessageHeaderItem(msg, defaultReplyAll, expanded));
     }
 
     public int addMessageFooter(MessageHeaderItem headerItem) {

src/com/android/mail/ui/ConversationViewFragment.java

diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 8448023..8898c00 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -353,7 +353,12 @@
             final boolean safeForImages = msg.alwaysShowImages /* || savedStateSaysSafe */;
             allowNetworkImages |= safeForImages;
 
-            final int headerPos = mAdapter.addMessageHeader(msg, true /* expanded */);
+            final int headerPos = mAdapter
+                    .addMessageHeader(
+                            msg,
+                            (mActivity.getSettings().replyBehavior
+                                    == UIProvider.DefaultReplyBehavior.REPLY_ALL),
+                            true /* expanded */);
             final MessageHeaderItem headerItem = (MessageHeaderItem) mAdapter.getItem(headerPos);
 
             final int footerPos = mAdapter.addMessageFooter(headerItem);