commit 0b8c080491f6884c2cfb7fcc473d970a9f4b97b9
author Alice Yang <alice@google.com> Mon Sep 16 14:35:18 2013 -0700
committer Alice Yang <alice@google.com> Mon Sep 16 14:35:18 2013 -0700
tree b9d5d9e60aa2e69ff5a1c7560af65c86cff6b8e1
parent 7cec99f10b8858a40afb42a0a603bc1b2402407b

More svelte changes

- Re-enable sender images, but change the cache size of loaded images
to 0 (instead of default of 300K)
- Disable preloading of conversations in CV (for navigation to previous
and next conversation)

Bug 9325758, 9325806

Change-Id: Ifd70e47e1e0f5d378e4cb8c91208516a26da1db0

src/com/android/mail/preferences/MailPrefs.java

diff --git a/src/com/android/mail/preferences/MailPrefs.java b/src/com/android/mail/preferences/MailPrefs.java
index 1b6000b..0c1b374 100644
--- a/src/com/android/mail/preferences/MailPrefs.java
+++ b/src/com/android/mail/preferences/MailPrefs.java
@@ -386,18 +386,12 @@
         editor.apply();
     }
 
-
     public void setShowSenderImages(boolean enable) {
         getEditor().putBoolean(PreferenceKeys.SHOW_SENDER_IMAGES, enable).apply();
         notifyBackupPreferenceChanged();
     }
 
     public boolean getShowSenderImages() {
-        if (Utils.isLowRamDevice(getContext())) {
-            // Do not show sender images in conversation list on low memory devices since they are
-            // expensive to render.
-            return false;
-        }
         final SharedPreferences sharedPreferences = getSharedPreferences();
         return sharedPreferences.getBoolean(PreferenceKeys.SHOW_SENDER_IMAGES, true);
     }

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

diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index d47ea9c..4d30187 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -272,7 +272,8 @@
         mAttachmentPreviewsCache = new AltBitmapCache(ATTACHMENT_PREVIEWS_CACHE_TARGET_SIZE_BYTES,
                 ATTACHMENT_PREVIEWS_CACHE_NON_POOLED_FRACTION, 0);
         mAttachmentPreviewsDecodeAggregator = new DecodeAggregator();
-        mSendersImagesCache = new AltBitmapCache(SENDERS_IMAGES_CACHE_TARGET_SIZE_BYTES,
+        mSendersImagesCache = new AltBitmapCache(Utils.isLowRamDevice(mContext) ?
+                0 : SENDERS_IMAGES_CACHE_TARGET_SIZE_BYTES,
                 SENDERS_IMAGES_PREVIEWS_CACHE_NON_POOLED_FRACTION,
                 SENDERS_IMAGES_PREVIEWS_CACHE_NULL_CAPACITY);
         mContactResolver = new ContactResolver(mContext.getContentResolver(), mSendersImagesCache);

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 98cbaae..67d2e13 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -512,6 +512,7 @@
             timerMark("CVF.showConversation");
         } else {
             final boolean disableOffscreenLoading = DISABLE_OFFSCREEN_LOADING
+                    || Utils.isLowRamDevice(getContext())
                     || (mConversation != null && (mConversation.isRemote
                             || mConversation.getNumMessages() > mMaxAutoLoadMessages));