commit 24a489c3de70a02bccbf2cfc54b36a385d72c337
author Alice Yang <alice@google.com> Wed Oct 30 10:07:59 2013 -0700
committer Alice Yang <alice@google.com> Wed Oct 30 10:07:59 2013 -0700
tree 21653e0e18b9be2c6b951b5e2a4536403c2a827b
parent 5a93fb16cbe2ece9074a38883a92adb22952be11

Always ask before displaying images for Email

In Gmail, we are adding a setting that automatically shows external
images instead of asking user first.  Email app should preserve old
behavior.

Bug 11158252

Change-Id: I8b04a1ec31638d756dfee2da8ab2e8178a709416

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 1ffefda..3e52848 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -103,6 +103,7 @@
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.FolderList;
 import com.android.mail.providers.MessageInfo;
+import com.android.mail.providers.Settings;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.providers.UIProvider.AccountCapabilities;
 import com.android.mail.providers.UIProvider.AccountCursorExtraKeys;
@@ -3342,6 +3343,10 @@
             values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.MOVE_TO_INBOX)] =
                     combinedUriString("uifolder", combinedMailboxId(Mailbox.TYPE_INBOX));
         }
+        if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.SHOW_IMAGES)) {
+            values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.SHOW_IMAGES)] =
+                    Settings.ShowImages.ASK_FIRST;
+        }
 
         mc.addRow(values);
     }