summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlice Yang <alice@google.com>2013-05-07 23:59:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-07 23:59:15 -0700
commit1ea9b2b0dbd6e606b04cf43d7ec1cf2cd5597792 (patch)
treecf9249cc5b58613ada35b06645e19cd4bab3b28b
parentffbe24533fdb8f0552c8227adf03c66b8573b629 (diff)
parentda5af45d1349aa25dcf199a370c64bfa69be317d (diff)
downloadandroid_packages_apps_UnifiedEmail-1ea9b2b0dbd6e606b04cf43d7ec1cf2cd5597792.tar.gz
android_packages_apps_UnifiedEmail-1ea9b2b0dbd6e606b04cf43d7ec1cf2cd5597792.tar.bz2
android_packages_apps_UnifiedEmail-1ea9b2b0dbd6e606b04cf43d7ec1cf2cd5597792.zip
am da5af45d: Merge "Revert "Disable transforms temporarily"" into jb-ub-mail-ur9
* commit 'da5af45d1349aa25dcf199a370c64bfa69be317d': Revert "Disable transforms temporarily"
-rw-r--r--src/com/android/mail/ui/AbstractConversationViewFragment.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java
index 6abdb9bb6..82b00b558 100644
--- a/src/com/android/mail/ui/AbstractConversationViewFragment.java
+++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java
@@ -870,8 +870,6 @@ public abstract class AbstractConversationViewFragment extends Fragment implemen
* @return {@code true} if the conversation should be transformed. {@code false}, otherwise.
*/
public boolean shouldApplyTransforms() {
- // Temporarily disable transforms to debug 8835996
- return false;
-// return !mHasConversationTransformBeenReverted;
+ return !mHasConversationTransformBeenReverted;
}
}