diff options
| author | Alice Yang <alice@google.com> | 2013-05-10 20:51:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-10 20:51:26 +0000 |
| commit | 33acbcca5fe84649ed8522481900097016c3f5a6 (patch) | |
| tree | eb9d44d45a516178a7d805bd3a19270bad4b36e4 /src/com/android/mail/ui/AbstractConversationViewFragment.java | |
| parent | c42ad5ea3a49e6045a79d1fde3d858033176e67b (diff) | |
| parent | 3617b41394337774fb2e6fcf9fef1ac9eca00482 (diff) | |
| download | android_packages_apps_UnifiedEmail-33acbcca5fe84649ed8522481900097016c3f5a6.tar.gz android_packages_apps_UnifiedEmail-33acbcca5fe84649ed8522481900097016c3f5a6.tar.bz2 android_packages_apps_UnifiedEmail-33acbcca5fe84649ed8522481900097016c3f5a6.zip | |
Merge "Add gservices flag for disabling transforms" into jb-ub-mail-ur9
Diffstat (limited to 'src/com/android/mail/ui/AbstractConversationViewFragment.java')
| -rw-r--r-- | src/com/android/mail/ui/AbstractConversationViewFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java index f24434d56..642a9f3f5 100644 --- a/src/com/android/mail/ui/AbstractConversationViewFragment.java +++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java @@ -876,6 +876,7 @@ public abstract class AbstractConversationViewFragment extends Fragment implemen * @return {@code true} if the conversation should be transformed. {@code false}, otherwise. */ public boolean shouldApplyTransforms() { - return !mHasConversationTransformBeenReverted; + return (mAccount.enableMessageTransforms > 0) && + !mHasConversationTransformBeenReverted; } } |