commit 65b3850706c0fb5c7d575584186a1f3051ba82f1
author Tony Mantler <nicoya@google.com> Thu Dec 19 09:50:01 2013 -0800
committer Tony Mantler <nicoya@google.com> Thu Dec 19 09:50:01 2013 -0800
tree 0818c8d5e3d5699a584fec32e69e53d4f8452a28
parent abeef5595974da9a6324e3e49cc896923f69be51

Set image loading to "ASK_FIRST" for all accounts

b/12217358

Change-Id: If3664c29e5920f29a2bba0136d61ac5c0a2fe0dc

src/com/android/email/provider/EmailProvider.java

diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 1fb23c2..803cedf 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -3222,6 +3222,10 @@
                             ? UIProvider.DefaultReplyBehavior.REPLY_ALL
                             : UIProvider.DefaultReplyBehavior.REPLY);
         }
+        if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.SHOW_IMAGES)) {
+            values.put(UIProvider.AccountColumns.SettingsColumns.SHOW_IMAGES,
+                    Settings.ShowImages.ASK_FIRST);
+        }
 
         final StringBuilder sb = genSelect(getAccountListMap(getContext()), uiProjection, values);
         sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?");