AI 146359: DO NOT MERGE - we'll keep the fix for donut+

Automated g4 rollback of changelist 146273.
  *** Reason for rollback ***
  Inadvertently approved for cupcake, past deadline.
  *** Original change description ***
  Fixed "show pictures" button isnot displayed for HTML messages.
  BUG=1766880

Automated import of CL 146359
This commit is contained in:
Andy Stadler 2009-04-15 12:56:08 -07:00 committed by The Android Open Source Project
parent 65ad330b78
commit a065fff529

View File

@ -93,8 +93,8 @@ public class MessageView extends Activity
};
private static final int METHODS_STATUS_COLUMN = 1;
// regex that matches start of img tag. '<(?i)img\s+'.
private static final Pattern IMG_TAG_START_REGEX = Pattern.compile("<(?i)img\\s+");
// regex that matches start of img tag. '.*<(?i)img\s+.*'.
private static final Pattern IMG_TAG_START_REGEX = Pattern.compile(".*<(?i)img\\s+.*");
private TextView mSubjectView;
private TextView mFromView;
@ -963,7 +963,7 @@ public class MessageView extends Activity
* that HTML allows.
*/
// Check if text contains img tag.
if (IMG_TAG_START_REGEX.matcher(text).find()) {
if (IMG_TAG_START_REGEX.matcher(text).matches()) {
mHandler.showShowPictures(true);
}