commit ea7e18b44a5a5de5d1ca8a7ac9a78ec742b10bd9
author Baligh Uddin <baligh@google.com> Tue Sep 17 04:20:45 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 17 04:20:45 2013 +0000
tree cd29733e0f86bf9d39651174a571c9f382016f97
parent 111e0646e210f06c7394a2761cb4cef6dd095dec
parent 967a7755902cd887000909a74930d966772a2e7f

Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11

proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 7bab921..dd94b99 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -24,6 +24,10 @@
   public <methods>;
 }
 
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keep class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
 
 -keepclasseswithmembers class com.google.common.collect.ImmutableMap {
   *** of(...);

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));