commit 75b52a50a7b8382d9046d48ea8cda97b5471cbc8
author Andy Huang <ath@google.com> Fri Mar 15 15:40:24 2013 -0700
committer Andy Huang <ath@google.com> Fri Mar 15 17:09:50 2013 -0700
tree bfa9cf09494600741315d019c60ba735d888c8b4
parent f6d04ed7b875e56ae57f24366daf981f99c6f06c

hide rendering reporting in Email2

Change-Id: I6fc750a0369a9396fc00f4e5fe4ffac61831d5b4

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

diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 126c002..8bd6981 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -32,6 +32,7 @@
 import android.text.style.StyleSpan;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -229,6 +230,7 @@
 
         void showExternalResources(String senderRawAddress);
 
+        boolean supportsMessageTransforms();
         String getMessageTransforms(Message msg);
     }
 
@@ -961,8 +963,14 @@
                 }
                 final boolean defaultReplyAll = getAccount().settings.replyBehavior
                         == UIProvider.DefaultReplyBehavior.REPLY_ALL;
-                mPopup.getMenu().findItem(R.id.reply).setVisible(defaultReplyAll);
-                mPopup.getMenu().findItem(R.id.reply_all).setVisible(!defaultReplyAll);
+                final Menu m = mPopup.getMenu();
+                m.findItem(R.id.reply).setVisible(defaultReplyAll);
+                m.findItem(R.id.reply_all).setVisible(!defaultReplyAll);
+
+                final boolean reportRendering = ENABLE_REPORT_RENDERING_PROBLEM
+                    && mCallbacks.supportsMessageTransforms();
+                m.findItem(R.id.report_rendering_improvement).setVisible(reportRendering);
+                m.findItem(R.id.report_rendering_problem).setVisible(reportRendering);
 
                 mPopup.show();
                 break;

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 7bed51b..8aae3f3 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -967,6 +967,11 @@
     }
 
     @Override
+    public boolean supportsMessageTransforms() {
+        return true;
+    }
+
+    @Override
     public String getMessageTransforms(final Message msg) {
         final String domId = mTemplates.getMessageDomId(msg);
         return (domId == null) ? null : mMessageTransforms.get(domId);

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

diff --git a/src/com/android/mail/ui/SecureConversationViewFragment.java b/src/com/android/mail/ui/SecureConversationViewFragment.java
index e19b5f6..bd88816 100644
--- a/src/com/android/mail/ui/SecureConversationViewFragment.java
+++ b/src/com/android/mail/ui/SecureConversationViewFragment.java
@@ -201,6 +201,11 @@
     }
 
     @Override
+    public boolean supportsMessageTransforms() {
+        return false;
+    }
+
+    @Override
     public String getMessageTransforms(final Message msg) {
         return null;
     }