• Home
  • History
  • Annotate
  • only in /packages/apps/Mms/src/com/android/
History log of /packages/apps/Mms/src/com/android/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f0dc5e40da75b3dab9d190e43cc3495548b38050 29-Nov-2012 Wei Huang <weih@google.com> Merge "Opening recent apps while on compose dismisses compose on re-rentering app" into jb-mr1.1-dev
0c1dc5c3df3336b076d47a151efef09f23365367 28-Nov-2012 Tom Taylor <tomtaylor@google.com> Merge "Change tri-state vibrate to single checkbox" into jb-mr1.1-dev
1b5e0f434ebd7ddf491fdd0fb3044b62656fa642 28-Nov-2012 Tom Taylor <tomtaylor@google.com> Opening recent apps while on compose dismisses compose on re-rentering app

Bug 7586014

Don't bail back to ConversationList when we've got an empty ComposeMessageActivity.
In the case where the user has entered a recipient and followed the same
repro steps in the bug, a draft is created (see CMA's saveDraft) because
the receipient editor is open and there is a recipient. In that case, the
working message is not discarded and does not go through the escape-to-
ConversationList case. By the way, I was not able to repro the original
bug 2793874 that added this escape clause code.

Change-Id: I92d84f19c8ba2c27a8c28975dc95d1d230b89f1c
ms/ui/ComposeMessageActivity.java
90e32e59610d4a395716b1cfa9c8b041b45e3d4e 28-Nov-2012 Tom Taylor <tomtaylor@google.com> Change tri-state vibrate to single checkbox

Bug 7616158

Update strings and summaries to match the spec, as well. Removed now unused
strings.

Change-Id: I4858cb093db55fc38380926de27c92e38ff436e9
ms/transaction/MessagingNotification.java
ms/ui/MessagingPreferenceActivity.java
6019ec8bfc8df57e95ca1ca36cf76c77ca84818e 27-Nov-2012 Tom Taylor <tomtaylor@google.com> SMS conversation list doesn't mantain scroll position

Bug 7585885

Change-Id: Ic500e0b3245b5f42a9e7994827a3825b041b1c01
ms/ui/ConversationList.java
24da6ee1d535d5d7aa1d43e1a386bb37048fbbc6 27-Nov-2012 Tom Taylor <tomtaylor@google.com> Area code is not displayed in To: field, while sending SMS from call log

Bug 7614149

The extra space after the comma was screwing up the Chips parser and causing
the comma delimeter to be parsed as part of the number.

Change-Id: I6239f6b1e45075b6faf9e7f0323d00945b23ce73
ms/ui/RecipientsEditor.java
63b5440a97cfccc17b3ad24bb89e34c01d893676 26-Nov-2012 Tom Taylor <tomtaylor@google.com> Unable to create application com.android.mms.MmsApp

Bug 7597021

Handle null result from detectCountry. Let the onCountryDetected listener
do the work and delay setting mCountryIso. Tested getCurrentCountryIso()
by always returning null to see that the app didn't crash.

Change-Id: I452958d857ee9c651a3d552300f39a5e0e5b281f
ms/MmsApp.java
ff3560f15287f7fac34769b3a4fa75839bacb3f0 10-Nov-2012 Tom Taylor <tomtaylor@google.com> Bringing up the keyboard when a picture is the last item visible will always scroll the conversation to the bottom

Bug 7511504

The code to scroll needs to test that the tall item is the last item in
the list.

Change-Id: I4a9d72178564b8047c40af1dc148904b75e79694
ms/ui/ComposeMessageActivity.java
de3b06d3102ef4e21c199e722592aaed73594643 08-Nov-2012 Tom Taylor <tomtaylor@google.com> MMS doesn't scroll

Bug 7487819

There was a bug where if the list only had a single item, the smooth scroll
function would bail out early without scrolling. Also, if the last item
is taller than the size of the list, we always want to scroll, regardless
of the other conditions.

Change-Id: I9ee4d3977678e577f10f768c987fbd80dc1ff436
ms/ui/ComposeMessageActivity.java
ac5b230500508d676267f264dc4ce63ae0900937 08-Nov-2012 Tom Taylor <tomtaylor@google.com> App doesn't know your pic on initial send

Bug 7498702

A previous CL to prevent flickering while receiving a new mms caused the
avatar to not always get updated. This CL fixes the bug and eliminates
flickering of previous mms items while the DB is getting changed.

Change-Id: Iac41ed42284235e31b0c26b53cc3496c4e21e9da
ms/ui/MessageListItem.java
38bdb2240dd1d6ed5c05be8700a3a59bad509568 07-Nov-2012 Tom Taylor <tomtaylor@google.com> Merge "Flickering when MMS received" into jb-mr1-dev
a2b5b37119939c265098ef58a410a721a0cf4e38 07-Nov-2012 Tom Taylor <tomtaylor@google.com> Merge "MMS doesn't scroll enough on tall list items" into jb-mr1-dev
184934b22db6e0235a568e74ddfbf698204e3239 06-Nov-2012 Tom Taylor <tomtaylor@google.com> MMS doesn't scroll enough on tall list items

Bug 7487819

When we've got a list item taller than the whole list when the keyboard
is up, scroll the top of the item off the screen so the bottom of the item
is visible just above the keyboard.

Change-Id: I746e4883cd9e69ca788742c05f8feacf96a8b771
ms/ui/ComposeMessageActivity.java
0fd8d0e7ec0fc246dcdbea999920cbbe7fca61e9 06-Nov-2012 Tom Taylor <tomtaylor@google.com> Flickering when MMS received

Bug 7481394

Don't clear the picture/video attachment when we're rebinding the same
list item to the same message. Fixes the double flash on send and the
flickering on receive.

Change-Id: I6a489fead27e81ac07388696c18dd7b0b6f1d89b
ms/ui/MessageListItem.java
288707d12efa6a0f5109e4796e1ce793198473e0 06-Nov-2012 Mike Dodd <mdodd@google.com> Fix to hide keyboard jank-free when coming back to MMS with no draft.

What was happening is that if you loaded a conversation, brought
up the IME, left, then came back, there was a brief period where the
window size was still small (leaving room for the IME), then the IME
would go away and the window size would expand.

Hiding the keyboard in onPause or onStop didn't prevent this. So
the fix is to extend the hack of delaying loading the draft messages
to all cases, not just the case where the keyboard is going to be
shown. This way the window manager settles down before we load
the content, and everything comes into view in the right place the
first time.

b/7481258

Change-Id: If2592737bda4d2938fc8fc982724459d3d26fd35
ms/ui/ComposeMessageActivity.java
d6566e19836c5671f333d048ba70bec4cda493bb 24-Oct-2012 Tom Taylor <tomtaylor@google.com> Merge "Add more logging for video capture" into jb-mr1-dev
14a5c29a1e912b787b6450a9e45ff3e5ca63bec9 24-Oct-2012 Tom Taylor <tomtaylor@google.com> Add more logging for video capture

Bug 7400003

Change-Id: Ic18af7b6dfa4255c547d1c3cf8049878b4d5e00c
ms/model/MediaModel.java
874ef885ee3f132491fddb3dee812e6d38660b79 23-Oct-2012 Wei Huang <weih@google.com> b/7378607: more tweaks to reduce jank interacting with the keyboard.

- remove the hack to hide keyboard in activity onPause(). Yay!
- hide the compose panel in onRestart(), so it doesn't flash when
we re-enter the activity thru. onRestart(). Show the compose panel
later when we load messages+draft.

Change-Id: I314e9298b7b4cfc54a4407d2521b70473d70ee30
ms/ui/ComposeMessageActivity.java
469db72fcf219fd4c60bc9b01c728bdc3e866d40 23-Oct-2012 Tom Taylor <tomtaylor@google.com> Crash trying to save a draft with a picture from the gallery

Bug 7374081

Change the persister api's to accept a HashMap of opened inputStreams
for the parts. The inputStreams are opened on the UI thread, but the
actual persisting takes place on a non-UI thread. We only pre-open the
inputStreams in onStop, before we lose the gallery permission.

Change-Id: I6eaa8a2635201164a80589e7d30b24a6dd60fcc7
ms/data/WorkingMessage.java
ms/model/ImageModel.java
ms/model/SlideshowModel.java
ms/transaction/MmsMessageSender.java
ms/transaction/NotificationTransaction.java
ms/transaction/PushReceiver.java
ms/transaction/RetrieveTransaction.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideshowEditActivity.java
6e39c964b56287aa74a4432b5531499cda3ab09d 22-Oct-2012 Wei Huang <weih@google.com> b/7390148, b/7392410: fix a couple of issues introduced by cl 558d4cc81f.

b/7390148: when coming back from attaching a photo (or whatever), don't load the draft.
Loading draft creates a new mWorkingMessage object, whch will clear the
attachment url and state, obtained in onActivityResult(). I created a new
member variable 'mShouldLoadDraft', and set it to false in onActivityResult().

b/7392410: when drawing the bottom panel with empty text (so there is less jank), we
need to remove the onTextChanged listener; otherwise, it will reset
mWorkingMessage's draft text too from the onTextChanged callback.

Change-Id: I67b2ec700d90bf85caf5a8b3c87cdb9f15273663
ms/ui/ComposeMessageActivity.java
9a75d01f8fa174396e3f1812e7793b58224e069e 22-Oct-2012 Wei Huang <weih@google.com> b/7386794: fix bad keyboard interaction in MMS.

- I misunderstood the meaning of 'mIsKeyboardOpen' in my previous cl 558d4cc8.
'mIsKeyboardOpen' is always true for soft keyboard. For device with
HW keyboard, it's true if the keyboard is open.

Reverted back the code for calling onKeyboardStateChanged(). We
should not be messing with that when the SW keyboard is open or closed.

Change-Id: I27684885a0dbd6edb3cd563c8d52d06099d6d063
ms/ui/ComposeMessageActivity.java
741128e7649310e41758e4e88d504c11d61c5458 22-Oct-2012 Tom Taylor <tomtaylor@google.com> Positioning of insertion point on sms draft re-launch

Bug 7381862

Change-Id: I805f83a3b579b36326ab98623bbd4873cdb025cb
ms/ui/ComposeMessageActivity.java
8e44e61e138f9dff19fec808e6639fab8523d8cb 20-Oct-2012 Wei Huang <weih@google.com> Merge "b/7363553: part 2 of fix keyboard and window layout interaction when re-entering ComposeMessageActivity." into jb-mr1-dev
9f12dda462847a17c9b9d5f357aaa897b09624b4 19-Oct-2012 Tom Taylor <tomtaylor@google.com> Merge "Size limit reaches for video recording even before time lapse from Messaging" into jb-mr1-dev
558d4cc81f9ddc3ea1353bb1e7d05a6a0d1e4b8b 18-Oct-2012 Wei Huang <weih@google.com> b/7363553: part 2 of fix keyboard and window layout interaction when re-entering ComposeMessageActivity.

(this is on top of the cl https://googleplex-android-review.googlesource.com/#/c/242627/4)

The simple idea is to delay loading the message history and draft text until the keyboard
is shown. The effect is, the compose screen shows blank, keyboard comes up, and the message
history and draft get displayed.

While the idea is simple, a lot has to be changed in ComposeScreenActivity to make this happen.

- message history query and draft loading were done separately before. Changed to perform
those actions together. If the keyboard needs to be shown, delay the loading of message+draft
until we detect the keyboard is shown the first time. The detection is done in the windowMgr
callback of onSizeChanged(). If we detect the new window height is less than the old height by
200 pixels, we treat it as "keyboard opened event".

the decision to show keyboard (plus delay message+draft loading) is done in onStart(), but
we set the window mode in onResume(), and hide the keyboard in onPause(). Hiding the keyboard
in onPause() makes it less janky to show keyboard when re-entering the activity.

- modify the initialization of the compose view to not display draft text (which can be
in the compose textfield w/o loading a draft), until the keyboard comes up and we are ready
to load the message+draft.

- remove conditional draft loading code in onRestart(). We always load the draft in onStart() now.
loadDraft() can be a no-op if we come back through onRestart(), if the draft is in memory
already.

- call loadMessageAndDraft in onNewIntent(), which doesn't go thru. onStart() code path.

Change-Id: I2ae953815fe2325b7038a8c647a415275cf77b5f
ms/ui/ComposeMessageActivity.java
868f2d2f4135a2ebeb1acbadfd66403aa91c167e 19-Oct-2012 Tom Taylor <tomtaylor@google.com> Merge "MMS creates a new thread when receiver is not in the Message thread" into jb-mr1-dev
14ec4de3727879a9116399c3ea6a77a7bcdfc35d 19-Oct-2012 Wei Huang <weih@google.com> Merge "b/7363553: fix a regression where keyboard isn't shown when composing a new message in SMS." into jb-mr1-dev
9446c6755d755e98b55747d03497834a5c05ae17 19-Oct-2012 Wei Huang <weih@google.com> b/7363553: fix a regression where keyboard isn't shown when composing a new message in SMS.

- fix a regression caused by https://googleplex-android-review.googlesource.com/#/c/242627/4.
Make sure to show keyboard for a new conversation.

Change-Id: I4d6465d46f9c18e1545a5d12e35368e53c5a4198
ms/ui/ComposeMessageActivity.java
8cc338d324dc4c92b686029064882147e9054f17 18-Oct-2012 Tom Taylor <tomtaylor@google.com> Empty draft created on deleting a group MMS message

Bug 7360609

Don't save an mms draft for a group message when there's no text. When the
last message in a thread is deleted, automatically go back to the
ConversationList. Earlier when my deletes were failing because of the
NULL threadId in the pdu table, I noticed an exception thrown from
Conversation.startDelete: "startDeleteAll already in the middle of a delete".
startDelete was being called in a loop and of course sDeletingThreads would
be true if the delete hadn't completed in between iterations. Fix by having
startDelete do all the deleting of multiple threadIds.


Change-Id: Idfb8c0d54d8bb1875bbe7c5163e75bbb0dfbf14d
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
bd9d9bc46fb988e69aa92a1ef0b00d20c8be593d 18-Oct-2012 Tom Taylor <tomtaylor@google.com> Size limit reaches for video recording even before time lapse from Messaging

Bug 7342867

Dynamically compute the number of seconds to record based on video/audio
bitrates in the video profile. Add a unit test.

Change-Id: Ia083b6dfc3e9849a512f7aa0ae077a7e5c439093
ms/ui/MessageUtils.java
41ae031d70cbb9973d283fa2bff1643f08999e3c 18-Oct-2012 Tom Taylor <tomtaylor@google.com> MMS creates a new thread when receiver is not in the Message thread

Bug 7334111

If a SIM doesn't have a number (i.e. getLine1Number returns null), hide
the group messaging setting and disable the feature.

Change-Id: Id658b9daad788898f3a4a9518ebf59c817d775c7
ms/ui/MessagingPreferenceActivity.java
d2885b1519cfb0b037f7934b39362c8fb60166c9 18-Oct-2012 Wei Huang <weih@google.com> Merge "b/7363553: fix keyboard interaction when re-entering Compose Message activity." into jb-mr1-dev
706aae13ff1d40788787dc2651defb4ba6c8ecda 17-Oct-2012 Wei Huang <weih@google.com> b/7363553: fix keyboard interaction when re-entering Compose Message activity.

rework the fix for b/7350054, use recommendations from Satoshi to call getWindow().setSoftInputMode()
instead of explicitly showing the keyboard later.

Reduce the number places to call showKeyboard() from 3 places to 1. The new logic is, if there
is a draft for this conversation, we set the window mode to SOFT_INPUT_STATE_VISIBLE, otherwise,
set the window mode to SOFT_INPUT_STATE_HIDDEN. We check DraftCache to see if there is a draft,
and don't need to wait until the full content is loaded to determine that.

In addition, employ a hack to hide the keyboard in onPause(), to avoid a jank caused by
onSizeChanged() called twice when re-entering the Compose activity. This improves the jank
slightly, as we still have to adjust the scroll position, leading to the page jump after the
keyboard is opened. It's arguably a little better than before.

Change-Id: Ic4874c103ae235ce3c813a15bbd72283bc844b1b
ms/ui/ComposeMessageActivity.java
99f6f6403b7d879386b3332bcd43c96b8d3800b3 18-Oct-2012 Tom Taylor <tomtaylor@google.com> Max file size limit from the same phone could be different across different runs attaching a captured video

Bug 7360783

Hide the "Attach" menu/actionbar item when there's already an attachment.
The user can use the view/replace/remove buttons to change the attachment.

Change-Id: Ie863a00433dbdcf14d0a3379a078639c8cff39ee
ms/ui/ComposeMessageActivity.java
846dc298acaa40c7229008174d849e91faaf8fbb 16-Oct-2012 Tom Taylor <tomtaylor@google.com> IME dismissed when composing message

Bug 7350054

Explicitly open the keyboard if we've got draft text.

Change-Id: Ifefc94830e053578d3927706a26f2fa6379b72a3
ms/ui/ComposeMessageActivity.java
ff3e6009a8180701d8f344f9c128c79610e8bcfb 11-Oct-2012 Tom Taylor <tomtaylor@google.com> "No Subject" string is different for incoming and outgoing MMS

Bug 7328074

One line change to "cleanse" the subject snippet for the conversation.

Change-Id: Ia08c65550b4ae53a5bb17bf87c3f78ec6a93045e
ms/data/Conversation.java
25274564748c89e2f24fa1ea2eaab0feb9be22e7 10-Oct-2012 Tom Taylor <tomtaylor@google.com> Conversation should scroll to the bottom when incoming received

Bug 7318677

Change-Id: I23a22d26839e204582b26a368e09d36266e2fde7
ms/ui/ComposeMessageActivity.java
9889006f9d29d0509c1c036987ce028de43ac96e 09-Oct-2012 Tom Taylor <tomtaylor@google.com> Add setting to turn on/off group MMS

Bug 6970173

Add a setting/preference to turn on/off group MMS. If group mms is disabled
by mms_config.xml, the preference is hidden from the user (this is consistent
with other mms features disabled by carriers). When group mms is disabled,
receiving a group mms is also disabled. In other words, the received message
will appear to have come from a thread with only the sender and not in a thread
with the sender + the other recipients.

Change-Id: I9510ae269f7b3968c768c7b5f5cf8dcc7fe4eca6
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/transaction/MmsMessageSender.java
ms/transaction/NotificationTransaction.java
ms/transaction/PushReceiver.java
ms/transaction/RetrieveTransaction.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessagingPreferenceActivity.java
9c9df2773645d195dbf17df91d7cccdf5154fe84 04-Oct-2012 Tom Taylor <tomtaylor@google.com> MMS not displaying image or text after sending

Bug 7276966

When a pdu or image is canceled during loading, remove the pdu/slideshow
or image from the cache so it's fully reloaded the next time the uri is
requested.

Change-Id: I0f898821cfc1ad75115f298394a4f2497c3e4706
ms/model/ImageModel.java
ms/model/VideoModel.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
ms/ui/MmsThumbnailPresenter.java
ms/util/ItemLoadedFuture.java
ms/util/NullItemLoadedFuture.java
ms/util/PduLoaderManager.java
ms/util/ThumbnailManager.java
d2f67cfca13a6e415636dc253c371fb76974f5fa 03-Oct-2012 Tom Taylor <tomtaylor@google.com> STOPSHIP: Turn off MessagingNotifications DEBUG flag

Bug 7131792

Undo the debug logging of several CL's. The debug logging tracked notifications,
setting the active thread, creating threadIds, and deleting threads. I left
four debug messages active in the log: 1) cancel notifications, 2) create a
new notification with sound, 3) an sms message was just received, and
4) a new mms message was just received. After debugging various notification
oddities over the last few weeks, those four messages will allow us to
continue to track notifications without a lot of log spew.

Change-Id: I96b599658432fa98f1f06df0d9113449c615dc2a
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
ms/transaction/NotificationTransaction.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
37f295b9c2e675cd2778e78f33977272035d58fb 27-Sep-2012 Tom Taylor <tomtaylor@google.com> Merge "Fix notification icon flashing" into jb-mr1-dev
8b4521b61b8ff87f2a3a13850eaa13d8e8901174 25-Sep-2012 Jeff Brown <jeffbrown@google.com> Update references to migrated global settings.

Bug: 7231172
Change-Id: Ic6019792b6cf4e2b681e8882e9ea1f4f313bca88
ms/transaction/SimFullReceiver.java
ms/transaction/SmsRejectedReceiver.java
b98c3af3e015c6e63476f152a7af1a1310cd0e9d 25-Sep-2012 Tom Taylor <tomtaylor@google.com> Fix notification icon flashing

While testing messaging notifications, I noticed there's a lot of flashing
of the mms icon in the notification bar. I didn't even have to look at the
code to know why. blockingUpdateNewMessageIndicator() gets called from a
number of places to update the notifications. Before rebuilding notifications
it first cancels any existing notifications. This causes the flash. A
simple solution that eliminates the flash is to not cancel the notification
if we're going to put up a new notification.

Change-Id: I7a12508d9e7c6725bbd581e231aa6dda090ec971
ms/transaction/MessagingNotification.java
d645c8b53ae904bc059ee1ca7232916637c223e5 25-Sep-2012 Tom Taylor <tomtaylor@google.com> Notifications ring many times

Bug 7190093

markAsRead() was causing multiple sound notifications. The code for playing
a half sound notification needed to check whether one of the outstanding
notification was actually for the focused conversation. I'll add this CL
to the list of CL's to turn off logging in.

Change-Id: I84ddc2434630ee60f2eabc273d40195c95cd6061
ms/data/Contact.java
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
ms/transaction/SmsReceiverService.java
ms/ui/ConversationList.java
74edcd117fce5097b2eee4e7b3260203257e7959 20-Sep-2012 Tom Taylor <tomtaylor@google.com> Merge "SMS delete behavior odd" into jb-mr1-dev
fef537959e6beb02279e4994934ec88df080846f 20-Sep-2012 Tom Taylor <tomtaylor@google.com> SMS delete behavior odd

Bug 7175606

Add more logging to see if we're trying to create a thread during delete.

Change-Id: If39845c370fd15a7641dc36db074ff0ef6b19c85
ms/data/Conversation.java
c6be7e1a81769764ce0b51ce03406ad96944d8e5 19-Sep-2012 Tom Taylor <tomtaylor@google.com> Notification beep sounds every time I open a previously viewed SMS

Bug 7192246
Bug 7117451

Only beep it there are outstanding notifications. Also, there was a race
condition between receiving an sms and putting up a notification and
the conversation getting marked as read.

Change-Id: Ib3050582cbcef2986214fcb82c8c64aa9948211f
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
99f719d1cb0c6ed68373d73427a816c4e56eb5ba 18-Sep-2012 Tom Taylor <tomtaylor@google.com> Add logging for "SMS delete behavior odd"

Bug 7175606

Change-Id: Ic7bf8afb348e89eed0a28781482a5030a23ff5cb
ms/transaction/NotificationTransaction.java
ms/ui/ConversationList.java
bb04f3d9317bb2bfdd0bdf50b13ea06a130517ae 18-Sep-2012 Tom Taylor <tomtaylor@google.com> Merge "Messaging notifications do not always come through" into jb-mr1-dev
2d65e7eb956e60c058de876ddbfff504620ce7a3 18-Sep-2012 Tom Taylor <tomtaylor@google.com> Messaging notifications do not always come through

Bug 7117451

Add more debugging so I can see that we're clearing setCurrentlyDisplayedThreadId()
in CMP.onPause.

Change-Id: I2230b2661f7bbebcdfdd29ee1ab4c31bb59deea2
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
bc7f97ae7d3661a44211d404fe4e187c35afadce 18-Sep-2012 Tom Taylor <tomtaylor@google.com> Notification goes to new message instead of existing thread

Bug 7169881

blockingUpdateAllNotifications() gets called from Conversation.markAsRead().
markAsRead gets called often, on every DB change (see CMP.mDataSetChangedListener)
and on every user interaction (see CMP.onUserInteraction()).
The call to blockingUpdateAllNotifications() wasn't passing in the threadId.
As a result, the code would build a notification for an incoming message
even though CMP was looking at that thread. This caused the messaging
notification icon to flash in notification bar as notification were
created then quickly dismissed. This change fixes that by not creating
notifications (other than a soft beep) for incoming messaging on the
thread the user is looking at. It also fixes the empty notification that
would take the user to a new conversation.

Change-Id: Ic0177cdd05d198abc85eae9077688c360573c879
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
3c307cabb5bd96ed174930ebf17f533bf2a79de7 15-Sep-2012 Tom Taylor <tomtaylor@google.com> Group MMS showing subject for every single message

Bug 7112646

Don't show "<Subject: no subject>" for mms messages where the subject
is "no subject"

Change-Id: I9b4c71ede607699273dbee2b791a879c96d0c993
ms/transaction/MessagingNotification.java
ms/ui/MessageItem.java
ms/ui/MessageUtils.java
ea339a26d0f2de0087d4c6ebf9f55c505b922695 13-Sep-2012 Tom Taylor <tomtaylor@google.com> Unable to view all participants of Group MMS thread

Bug 7087996
Bug 7161745

Add a group participants activity so a user can see all the members
of a group chat. Also fix a monkey bug with isCursorValid().

Change-Id: Ic73b6e27a139c74e4c735628ce822d102501da83
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListAdapter.java
ms/ui/RecipientListActivity.java
6fa42d477688e71295edcec942445a4beddde8a1 11-Sep-2012 Tom Taylor <tomtaylor@google.com> Clicking on a persons avatar causes undesired behavior in Messaging

Bug 6542880

Don't hide the keyboard when showing a quick contact.

Change-Id: I930bcd19c8d25005e3aba316d512a3991b2d6f65
ms/ui/ComposeMessageActivity.java
c6501ab9f1882d802ef7805967d936ecce52fbbf 10-Sep-2012 Tom Taylor <tomtaylor@google.com> Don't flash attachment box for text-only mms's

Bug 6764486

Change-Id: I5a4d86fc4948b0a4c9986730fd4290cc1a63acd2
ms/data/WorkingMessage.java
49c82e29195c5e18f7c702ae7109eba5d94813d2 10-Sep-2012 Tom Taylor <tomtaylor@google.com> Draft mms can't be sent because the send button is disabled

Bug 7132522

Drafts get loaded asynchronously, long after the send button state has
been updated. Once the draft is loaded, the code needs to update the
send button state based on the working message.

Change-Id: I92234c6e3ca123be744b495b173fcf9cc2ada8ca
ms/ui/ComposeMessageActivity.java
3d2624fe8d50e9bc3afadde0f4f8a48c8ee2de23 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 20da265f: am b2c79a9e: am fb15d874: Merge "Fix 2 bugs in Mms AppWidget"

* commit '20da265f643177296f67c630f605428db3d677f0':
Fix 2 bugs in Mms AppWidget
00d7a79d066f598f7347aabd8d51f7f0e6ec1630 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 99cd6ecc: am 39dede5b: am 3a48f611: Merge "Only delete the cache files if cache is null"

* commit '99cd6ecc4d619efe384374f07c3a3251082ae9f0':
Only delete the cache files if cache is null
b2c79a9e772846b3c68cbf9051aa0dedb3ad702d 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am fb15d874: Merge "Fix 2 bugs in Mms AppWidget"

* commit 'fb15d874a5da2744f1cf56c3132328cdd8b7ad4a':
Fix 2 bugs in Mms AppWidget
39dede5b367b177cad0903695b87b32b4e505cbf 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 3a48f611: Merge "Only delete the cache files if cache is null"

* commit '3a48f611fafc0deee964e9c2964ebd84e6d29545':
Only delete the cache files if cache is null
fb15d874a5da2744f1cf56c3132328cdd8b7ad4a 10-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix 2 bugs in Mms AppWidget"
24149983964b1de6a98bcefeb5e6ebfa2d0d7953 10-Sep-2012 Tom Taylor <tomtaylor@google.com> Fix a couple of bugs

Bugs 7087793, 7128602

When creating a new conversation, CMA crashes because the code is trying
to access contact[0]. There's a path when adding a picture and it fails,
where the slideshow can get reset to null and subsequently NPE's.

Change-Id: I0b6eeb3df5cf4484d82e2e78d9fdc01380614548
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
9be7edc95cd1e40b79a390e8ae173d4e2710527a 09-Sep-2012 Wei Huang <weih@google.com> bug #7087793: remove "add to people" action menu item for group MMS.

Change-Id: I825c05bddad3dfad95481b28afd5a8c78763e8e4
ms/ui/ComposeMessageActivity.java
95e0a156327c18f2e9afc72a45a5985ad6ae7abb 09-Sep-2012 Wei Huang <weih@google.com> bug #7128602: Messaging app crash on choosing to share all the picture attachment received on Gmail

- if we cannot get the mime_type from the "mime_type" column, then try getting it by calling
ContentResolver.getType(uri);

Change-Id: I510ab2444eaa3bc96e2551cfb659d4afb77d3af6
ms/ui/UriImage.java
67f9035e9a0651b8bf894568aff8a130a17297d8 09-Sep-2012 Wei Huang <weih@google.com> Merge "bug #5139811: Get rid of toast for converting message from MMS to SMS." into jb-mr1-dev
bf8489d5454f11c5a2f6432f5eb5d705db5bb5a9 09-Sep-2012 Wei Huang <weih@google.com> bug #5139811: Get rid of toast for converting message from MMS to SMS.

Change-Id: If25c0230d2b9933b7516105f8e8dc4f3f8db3bfa
ms/ui/ComposeMessageActivity.java
ce2abbf3040005587afd97017a1c46e740d28e46 09-Sep-2012 Tom Taylor <tomtaylor@google.com> Merge "java.lang.IllegalArgumentException: View not attached to window manager" into jb-mr1-dev
993503e844e596dac255d2beb63ec3580c8dd5e0 09-Sep-2012 Tom Taylor <tomtaylor@google.com> java.lang.IllegalArgumentException: View not attached to window manager

Bug 6692683

Don't try and close the progress dialog if the activity is finishing.

Change-Id: Iff96254436626c1dd6d15df9bc8a5e87d2942046
ms/ui/AsyncDialog.java
6d2ba55a4bd1937bbec101ab2a4c005b566b43f8 09-Sep-2012 Tom Taylor <tomtaylor@google.com> Messaging notifications do not always come through

Bug 7117451

Add some temporary always-on debug logging messages to the Messaging app's
notification code.

Change-Id: I9a33c39338d1e119d7b343af0e0fcfb5218f65c0
ms/transaction/MessagingNotification.java
01303749a722c0e8c8be740166bf4858c12eb7ec 09-Sep-2012 Tom Taylor <tomtaylor@google.com> Old thumbnail shown

Bug 6602473

When a message is deleted, remove the uri from the pdu cache. When a
thread is deleted, clear the pdu cache.

Change-Id: Idb4476c35271180f4faca0f8dbaefd5cff8b8fac
ms/data/Conversation.java
cee64965b033733a494df675892267e109a23dd6 09-Sep-2012 Roger Chen <cxr514033970@gmail.com> Fix 2 bugs in Mms AppWidget

1. Update all appwidgets instead of the first one.
2. Notify the appwidgets to update after deleted messages.

Change-Id: Iac114c3457de80a2b3bd09bf87c48f6c66eb07a1
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/widget/MmsWidgetProvider.java
ffe45d561b2d756d010face2018f411c7d69ae80 07-Sep-2012 Roger Chen <cxr514033970@gmail.com> Only delete the cache files if cache is null

No need to call getImageCacheService() to get the instance to delete
image cache files if the cache instance is null.
It will renew an instance for cache and lead to the memory leak
if renew too many instances by calling getImageCacheService()
multi-times.

Change-Id: I3ff83f49e9e8a8bc211dc26c773f3ccefc974881
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/util/ThumbnailManager.java
4847b98115373613b09cf50f43a760e95dd9a15c 07-Sep-2012 Tom Taylor <tomtaylor@google.com> Group MMS flickers between white square and received message when initially checking

Bug 7113015

Add a new column in the pdu that keeps track of whether a message is
text-only. The UI can use that flag to decide whether to show the attachment
box or not.

Change-Id: I70adf1a36d99ba5710c559651188f68e7f412ea3
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
56e8095ef2e82f8db5fd4a04fa0a67c91cc7fbd3 06-Sep-2012 Tom Taylor <tomtaylor@google.com> Auto-retrieve of MMS messages doesn't work if the option is turned on after a message is received

Bug 6970173

When the user turns on the auto-retrieve-mms's option, start the TransactionService
to start downloading any outstanding messages.

Change-Id: Id88a7b0a38093adaa62720fe4ce4c47928549206
ms/transaction/TransactionService.java
ms/ui/MessagingPreferenceActivity.java
cb8815fb447309322097bdd273d610ca5557b21a 06-Sep-2012 Tom Taylor <tomtaylor@google.com> Merge "On receiving a Group MMS the List view displays as two messages received" into jb-mr1-dev
6cb0e9bb8faa8c00294bd35ebebc010979c6669a 06-Sep-2012 Tom Taylor <tomtaylor@google.com> ANR in messaging after launch and clicking on an existing thread

Bug 6772676

The UI thread was calling PhoneNumberUtil.isPossibleNumber which ends up
calling PhoneNumberUtil.getMetadataForRegion which is blocked on a sync
while a data file is loaded. In this case, our loading the contacts in a non-UI
thread associated with all the conversations happened to get there first.
Loading the file was slow enough to cause the blocked UI thread to ANR.
We can never call a file loading function on the UI thread. Since this
call is simply coming from context menu code, deciding whether to show an Add contact
menu item for the number, I'm now using Telephony.Mms.isPhoneNumber which doesn't result in a file getting
loaded on the UI thread.

Change-Id: I4bc1db22c6e20fd78e988fa7e56b7cb37a5cc62e
ms/ui/ComposeMessageActivity.java
ms/util/AddressUtils.java
ca239ab55759fae4b16823329d5f03a52829ff4d 06-Sep-2012 Tom Taylor <tomtaylor@google.com> On receiving a Group MMS the List view displays as two messages received

Bug 7081327

When an mms is sent, the first thing that is received is an mms
notification message. This message only contains the address of
the sender and not all the other addresses the message was additionally
sent to. The messaging app stores this message in a new thread
(if there isn't an existing one) of the sender's phone number.
Then if the mms auto download setting is turned on (the default),
the app will use the information in this notification message to
download the content of the message. The app will then receive an
mms retrieve confirmation message. This message contains the
full addresses of all those in the group conversation. The app then
creates (if there isn't an existing one) a thread made up of all
the addresses. Then it deletes the original mms notification message.
At this point, you see two two threads for the same message. This CL
fixes the problem by not creating a thread for notification_ind messages
when autodownload is enabled. Messages will show up when they're completely
downloaded.

Change-Id: If515f134026bafaa2256673de1cff89976df8f59
ms/transaction/NotificationTransaction.java
ms/transaction/PushReceiver.java
ms/ui/ComposeMessageActivity.java
f19ef48297645cc464e2d89cff7bfff23a7fbe6e 06-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 56f72536: am 253230d4: Merge "Mms: Two popups are displayed when Press Enter key on message screen."

* commit '56f72536efb4f9d0c35f79b87df69c3b8315de17':
Mms: Two popups are displayed when Press Enter key on message screen.
56f72536efb4f9d0c35f79b87df69c3b8315de17 06-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 253230d4: Merge "Mms: Two popups are displayed when Press Enter key on message screen."

* commit '253230d4c5a654a451dbe3fb11023490435a632d':
Mms: Two popups are displayed when Press Enter key on message screen.
253230d4c5a654a451dbe3fb11023490435a632d 06-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: Two popups are displayed when Press Enter key on message screen."
eae91d793a2d9b2fb4631879f44de0615a085c19 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 62076938: am fe7e1e43: Merge "Mms: Fix the logging of the TransactionBundle"

* commit '6207693855fd74263549568c0d984fec87e66ff8':
Mms: Fix the logging of the TransactionBundle
a968384f86d5b87601293029d1f6b7bcc94f415d 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 3f6c1d2f: am 2dd0767f: Merge "Mms: JAVACRASH in com.android.mms at android.os.AsyncTask.done"

* commit '3f6c1d2f07b7d00fdd1ef1a9383b94ebb9028809':
Mms: JAVACRASH in com.android.mms at android.os.AsyncTask$3.done
a0cbec1365920c5916da95327ddcd0cdac6f1b03 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am b22ea8fb: am 822ff2e4: Merge "We sometimes need a new thread id to update drafts"

* commit 'b22ea8fbc79f3361907e96e4d7737bc304db4ddf':
We sometimes need a new thread id to update drafts
6207693855fd74263549568c0d984fec87e66ff8 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am fe7e1e43: Merge "Mms: Fix the logging of the TransactionBundle"

* commit 'fe7e1e43345afa87b5d300d8d2dfc7e77120bd8e':
Mms: Fix the logging of the TransactionBundle
3f6c1d2f07b7d00fdd1ef1a9383b94ebb9028809 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 2dd0767f: Merge "Mms: JAVACRASH in com.android.mms at android.os.AsyncTask.done"

* commit '2dd0767f7fcd042463f2e3037157d8b4fb2868c3':
Mms: JAVACRASH in com.android.mms at android.os.AsyncTask$3.done
b22ea8fbc79f3361907e96e4d7737bc304db4ddf 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 822ff2e4: Merge "We sometimes need a new thread id to update drafts"

* commit '822ff2e46f8937c3dc38870bf28ca0c244eaf9bd':
We sometimes need a new thread id to update drafts
fe7e1e43345afa87b5d300d8d2dfc7e77120bd8e 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: Fix the logging of the TransactionBundle"
2dd0767f7fcd042463f2e3037157d8b4fb2868c3 05-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: JAVACRASH in com.android.mms at android.os.AsyncTask$3.done"
4c6c7c65a1033d5cc0d87cc8b0e07a69db1842e8 04-Sep-2012 Tom Taylor <tomtaylor@google.com> SmsReceiverService NullPointerException in replaceFormFeeds

Bug 7006780
Bug 7082042

Protect against a null message. When there's a null message, put an empty
message in the database (vs. "null"). While testing, I hit a crash in
MessagingNotification.updateNotification where calling:
NotificationInfo mostRecentNotification = sNotificationSet.first();
hit an exception. We should never be inside updateNotification without
there actually being a notification. updateNotification is called from
blockingUpdateNewMessageIndicator() which is called by several async
services, such as SmsReceiverService and TransactionService. The code
relied on a global variable. There's no need for the variable to be global.

Change-Id: I23b0a0ebed30905468832b2f0f80f2f0016768f0
ms/transaction/MessagingNotification.java
ms/transaction/SmsReceiverService.java
d6f77b1faf5a6a230026815e8b63d50f71c2361f 31-Jul-2012 Frederic Predon <frederic.predon@intel.com> Mms: Fix the logging of the TransactionBundle

The byte array returned by the getPushData() function should be
properly converted before beeing logged.

Change-Id: If24a20bc636282bdab5631935f1bcc6eafc20d90
Author: Frederic Predon <frederic.predon@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 28037
ms/transaction/TransactionBundle.java
c222f543bf642c07b980331faa66281083ab24f9 01-Mar-2012 Fang, JiuX <jiux.fang@intel.com> Mms: JAVACRASH in com.android.mms at android.os.AsyncTask$3.done

TestCase:
1>"%1$" displays when Restore to default in SMS settings
2> Fore close when there is no app that start activity
3> manage sim messages
4> Force close happened when open a MMS with vcard
5> Audio is inserted to MMS, and then user play it. If long pressing
progress bar of the audio playback until play finished, messaging will crash

Change-Id: I04eec747029fe4d6d73e290dfa682c949a5930a8
Author: b497 <b497@borqs.com>
Signed-off-by: Fang, JiuX <jiux.fang@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 25327
ms/model/SlideModel.java
3ff7cd6ffa23c9330d448d580b83fe925a69ac55 21-Feb-2012 Kun Jiang <kunx.jiang@intel.com> Mms: Two popups are displayed when Press Enter key on message screen.

When the framework transfers the KEY EVENT to MMS, both KEY UP and
KEY DOWN event trigger the onEditorAction.
We need to confirm the send message only when we have the KEY DONW
event.

Change-Id: Ia0fcbb9a915f7e6b9f6b0101293eeaae80b3bccd
Author: Kun Jiang <kunx.jiang@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 20356
ms/ui/ComposeMessageActivity.java
c1f03822994dc09939060c41e0ce9cb37175b054 29-Aug-2012 Tom Taylor <tomtaylor@google.com> Implement group mms

Bug 6282172

When multiple recipients are added on a new conversation, the message is
automatically turned into an mms. This is the default, but add an mms_config.xml
option to turn that feature off. In a group mms message list, show the
sender's name on the line with the timestamp.

Change-Id: I8be4c325023bcbaf2498b8c9d8346a2a94ef63ef
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
6fb06ef2242ee4167d2e9b9ee2a05bf46c124f19 28-Aug-2012 Roger Chen <cxr514033970@gmail.com> We sometimes need a new thread id to update drafts

We are saving the draft in a conversation which had been
deleted all messages one by one(Now the thread id is orphaned).
The draft will be saved in a obseleted thread, so we lose them
and cann't find them in ConversationList. We need to get a new
thread id in this case.

Refer to ef3eb49cde359d36f9536dbaffe5c16f3639c1f2, it fixed this
issue while we are saving the Mms draft, but Sms.

Change-Id: I29b3c1abf373877924b1afb45027417a12a1ec68
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/data/WorkingMessage.java
343bdb86f61f48a360b706fa23083c8aba89a7ec 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0650192d: am c72f7ded: Merge "Mms: "Add slide" item is not displayed during Edit slideshow"

* commit '0650192dce7a00c7d3bba6b548a2b08c4d5cf0d8':
Mms: "Add slide" item is not displayed during Edit slideshow
556eb9048a1b752028730f18ca4e2a6abc5aaad0 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4f9ed184: am ffb649bf: Merge "Mms: Correction to display the dial number of SMS"

* commit '4f9ed184a3c4d285804863f19b4fee1a410dfd37':
Mms: Correction to display the dial number of SMS
0650192dce7a00c7d3bba6b548a2b08c4d5cf0d8 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c72f7ded: Merge "Mms: "Add slide" item is not displayed during Edit slideshow"

* commit 'c72f7deda30ebe19757624d958ea2e3e913dbf99':
Mms: "Add slide" item is not displayed during Edit slideshow
4f9ed184a3c4d285804863f19b4fee1a410dfd37 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ffb649bf: Merge "Mms: Correction to display the dial number of SMS"

* commit 'ffb649bf0525877496f075115e2cef04cbc18ce2':
Mms: Correction to display the dial number of SMS
fcdd4562597c40ec7ddca5f5ac371fe2e5c1e382 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0e5a0df0: am 5a2f5ae9: Merge "Mms: Searching result is not displayed when searching " ""

* commit '0e5a0df07d0cd3a1f3d12d0c00e0a2a4f32dc002':
Mms: Searching result is not displayed when searching " "
0e5a0df07d0cd3a1f3d12d0c00e0a2a4f32dc002 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 5a2f5ae9: Merge "Mms: Searching result is not displayed when searching " ""

* commit '5a2f5ae90240f46e656ae704ff437a2146ec2241':
Mms: Searching result is not displayed when searching " "
c72f7deda30ebe19757624d958ea2e3e913dbf99 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: "Add slide" item is not displayed during Edit slideshow"
ffb649bf0525877496f075115e2cef04cbc18ce2 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: Correction to display the dial number of SMS"
5a2f5ae90240f46e656ae704ff437a2146ec2241 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: Searching result is not displayed when searching " ""
8726525934dcdb4975b9ae993799aa0177becfc5 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am ea0670a1: am d274f385: Merge "Initialize Timestamp to "" instead of NULL"

* commit 'ea0670a15cf5deb79a5eda42788b2f7bc1097249':
Initialize Timestamp to "" instead of NULL
ea0670a15cf5deb79a5eda42788b2f7bc1097249 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d274f385: Merge "Initialize Timestamp to "" instead of NULL"

* commit 'd274f3853e0798f7169cbb08a355a09a2db8d0df':
Initialize Timestamp to "" instead of NULL
8aee2389b3feb40b4abf3110c2f74be30dd0256e 24-Aug-2012 Roger Chen <cxr514033970@gmail.com> Initialize Timestamp to "" instead of NULL

The expired time shows NULL before PduLoadedMessageItemCallback
was executed.

It sometimes canbe reproduced in the expired time of Notification
IND.

Change-Id: Idac021d23e0807f61a5bcead8af1b369398dff26
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/MessageItem.java
895dda6bd5a70673763b3a8714c346429e0598fe 06-Mar-2012 Kun Jiang <kunx.jiang@intel.com> Mms: Searching result is not displayed when searching " "

When querying a double quote , there will be a SqliteException, so
the cursor wil be null.
When cursor is null, we have to set the title.

Change-Id: I6fc91ad5562ca770412968b19cbc45aa1a667bd4
Author: b533 <b533@borqs.com>
Signed-off-by: Kun Jiang <kunx.jiang@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 25854
ms/ui/SearchActivity.java
3b3f302a3bca5c74f8fb3b85baaf2b3f4d587af7 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 494b3fd9: am fbc27988: Merge "Mms: Send Messaging with attachment,repeat 10-20 times crash"

* commit '494b3fd98a4bb1b51d75786364e18455453a46d4':
Mms: Send Messaging with attachment,repeat 10-20 times crash
494b3fd98a4bb1b51d75786364e18455453a46d4 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am fbc27988: Merge "Mms: Send Messaging with attachment,repeat 10-20 times crash"

* commit 'fbc27988d2c402691a5636ffa02909da455a9d60':
Mms: Send Messaging with attachment,repeat 10-20 times crash
bd2629c28f74608d1315e8bca91369c0d57195dc 03-Nov-2011 Blackbay Build <blackbay-build@intel.com> Mms: Send Messaging with attachment,repeat 10-20 times crash

ConcurrentModificationException occurs when you add the elements
while traversing a list with Iterator.
The issue is resolved by using CopyOnWriteArrayList instead of
ArrayList.

Change-Id: Ic717ed047475eae9a810d5767ed0a3fbf41ae86f
Author: Wenjie Qin <wenjie.qin@borqs.com>
Signed-off-by: Frederic Predon <frederic.predon@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 7844
ms/model/Model.java
e753c800a1533ee7e4f8bc3843991269f1295ec0 14-Mar-2012 Emmanuel Delaude <emmanuelx.delaude@intel.com> Mms: Correction to display the dial number of SMS

This patch fixes the display of the dial number of SMS, if the SMS
text contains the dial number.

Change-Id: Ia9f690106dc6ca084f2d04e33b2fdb4e1a004f36
Author: Emmanuel Delaude <emmanuelx.delaude@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 26712
ms/ui/MessageListItem.java
f164314f19ff727b27455174b30fd704474651a7 26-Aug-2011 Arun Ravindran <arun.ravindran@intel.com> Mms: "Add slide" item is not displayed during Edit slideshow

With this patch the "Add Slide" item is added as the last item
when some items are removed during edit slide show.

Change-Id: I57fa159183b87628ff2908a4ad299b97031f2d41
Author: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 7875
ms/ui/SlideshowEditActivity.java
db3e1f904955f22a331990325137bebd2a5e6721 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 69dcda5d: am 64fadb8c: Merge "Support necessary options on non-trackball devices"

* commit '69dcda5df46706d88f920b815ba482d5bbbf2cbc':
Support necessary options on non-trackball devices
52f66f6da846ec5d4046e32e0fb9360e3eca7355 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d5dd477e: am b17114ec: Merge "Mms: Fix ic_dialog_alert usage"

* commit 'd5dd477e0dc1d1fe77b8295f163e48b1daea676f':
Mms: Fix ic_dialog_alert usage
69dcda5df46706d88f920b815ba482d5bbbf2cbc 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 64fadb8c: Merge "Support necessary options on non-trackball devices"

* commit '64fadb8c94b12ea93787b5fea4bba9f4752799ac':
Support necessary options on non-trackball devices
d5dd477e0dc1d1fe77b8295f163e48b1daea676f 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am b17114ec: Merge "Mms: Fix ic_dialog_alert usage"

* commit 'b17114ec52e330accd962ecf753f487e1117b174':
Mms: Fix ic_dialog_alert usage
64fadb8c94b12ea93787b5fea4bba9f4752799ac 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Support necessary options on non-trackball devices"
dd3437a93a00940e7dc53d8f00acc16a36aaf492 01-Aug-2012 Roger Chen <cxr514033970@gmail.com> Support necessary options on non-trackball devices

Support move up/down, remove slide and add slide options
in context menu of SlideshowEditActivity.

We cannot move the position in ListView on the device
which hasn't the trackball, so we add the necessary
options in the context menu.

Change-Id: I5b9228b09d51a7ac571cf3fb9185644e211ad729
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/SlideshowEditActivity.java
7ad0a61f99867ac19cabd31b0d8db2ef4c234d24 31-May-2012 Björn Lundén <blunden2@gmail.com> Mms: Fix ic_dialog_alert usage

The code wasn't updated for ICS everywhere so it points to
old upscaled Gingerbread drawables in a few places.

Change-Id: I8224c6cce285d42fa0ba3317367a0b025050a83c
ms/LogTag.java
ms/ui/ManageSimMessages.java
ms/ui/MessagingPreferenceActivity.java
407a26a1d016a37c6ff7b4e8bc71a00008645ee9 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am f9f9b394: am 18e80bf2: Merge "Clean and format all imported packages"

* commit 'f9f9b39420d9f3325a96fee6817eb3eac4f31aaf':
Clean and format all imported packages
f9f9b39420d9f3325a96fee6817eb3eac4f31aaf 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 18e80bf2: Merge "Clean and format all imported packages"

* commit '18e80bf2080b4ebbe9f8b2bd2ba37589a4ae9b5f':
Clean and format all imported packages
18e80bf2080b4ebbe9f8b2bd2ba37589a4ae9b5f 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Clean and format all imported packages"
51294a1a8be202f3ce2dfc0e0b0dab7b275421a5 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 53f8f726: am c31a78e3: Merge "Let the text in Mms can be selected"

* commit '53f8f726e51f51aac84555000eaf4f7f9332f42d':
Let the text in Mms can be selected
5ab9fbd9d9dc597044c28f0b3d5dcad2f7966aa9 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am fac3e6ec: am 7616eb89: Merge "Recreate the options menu after drew the top panel"

* commit 'fac3e6ec451f6518828d907c33ea7071617c8a2c':
Recreate the options menu after drew the top panel
53f8f726e51f51aac84555000eaf4f7f9332f42d 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am c31a78e3: Merge "Let the text in Mms can be selected"

* commit 'c31a78e31d8479ca910ebb49fcaaa633211d1792':
Let the text in Mms can be selected
fac3e6ec451f6518828d907c33ea7071617c8a2c 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 7616eb89: Merge "Recreate the options menu after drew the top panel"

* commit '7616eb890a841d55bfc01002198b345c07878966':
Recreate the options menu after drew the top panel
c31a78e31d8479ca910ebb49fcaaa633211d1792 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Let the text in Mms can be selected"
1430eb33c30443e2435ad00c9d68dbefdc247a97 03-Aug-2012 Tom Taylor <tomtaylor@google.com> am 51fd116d: am 364d9267: SMS isn\'t converted to MMS even after 7 segments of messages

* commit '51fd116d992e1a99a5daf78fc7ef0014bb76a0cc':
SMS isn't converted to MMS even after 7 segments of messages
51fd116d992e1a99a5daf78fc7ef0014bb76a0cc 02-Aug-2012 Tom Taylor <tomtaylor@google.com> am 364d9267: SMS isn\'t converted to MMS even after 7 segments of messages

* commit '364d926784135e4889d74c570868db046a67cceb':
SMS isn't converted to MMS even after 7 segments of messages
d64419030e1fec1e751695dab3bd7236e2fb0214 02-Aug-2012 Roger Chen <cxr514033970@gmail.com> Clean and format all imported packages

Change-Id: I2e45f5ba1d56b9b17314a8b0f4c0fc1a5d8fc4d9
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/LogTag.java
ms/MmsConfig.java
ms/SuggestionsProvider.java
ms/TempFileProvider.java
ms/data/Contact.java
ms/data/ContactList.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/dom/smil/SmilLayoutElementImpl.java
ms/dom/smil/SmilMediaElementImpl.java
ms/dom/smil/SmilPlayer.java
ms/dom/smil/parser/SmilContentHandler.java
ms/dom/smil/parser/SmilXmlParser.java
ms/drm/DrmUtils.java
ms/layout/LayoutManager.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ImageModel.java
ms/model/LayoutModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/RegionMediaModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/transaction/HttpUtils.java
ms/transaction/MessageStatusService.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationPlayer.java
ms/transaction/NotificationTransaction.java
ms/transaction/PrivilegedSmsReceiver.java
ms/transaction/ProgressCallbackEntity.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/SmsRejectedReceiver.java
ms/transaction/SmsSingleRecipientSender.java
ms/transaction/Transaction.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/ui/AsyncDialog.java
ms/ui/AttachmentEditor.java
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/AudioAttachmentView.java
ms/ui/BasicSlideEditorView.java
ms/ui/ChipsRecipientAdapter.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConfirmRateLimitActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/ConversationListItem.java
ms/ui/DeliveryReportActivity.java
ms/ui/DeliveryReportAdapter.java
ms/ui/DeliveryReportListItem.java
ms/ui/EditSlideDurationActivity.java
ms/ui/IconListAdapter.java
ms/ui/ImageAttachmentView.java
ms/ui/LayoutSelectorAdapter.java
ms/ui/ManageSimMessages.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/MiniPreferenceActivity.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/NumberPickerDialog.java
ms/ui/PresenterFactory.java
ms/ui/RecipientsAdapter.java
ms/ui/RecipientsEditor.java
ms/ui/SearchActivity.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideViewInterface.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowAttachmentView.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowEditor.java
ms/ui/SlideshowPresenter.java
ms/ui/UriImage.java
ms/ui/VideoAttachmentView.java
ms/ui/WarnOfStorageLimitsActivity.java
ms/util/AddressUtils.java
ms/util/BlobCache.java
ms/util/CacheManager.java
ms/util/DownloadManager.java
ms/util/DraftCache.java
ms/util/ImageCacheService.java
ms/util/PhoneNumberFormatter.java
ms/util/RateController.java
ms/util/Recycler.java
ms/util/SendingProgressTokenManager.java
ms/util/SmileyParser.java
ms/util/ThumbnailManager.java
ms/widget/MmsWidgetService.java
364d926784135e4889d74c570868db046a67cceb 02-Aug-2012 Tom Taylor <tomtaylor@google.com> SMS isn't converted to MMS even after 7 segments of messages

Bug 6903793

Resurrect the mms_config.xml setting "smsToMmsTextThreshold" to allow
overlays to specify an sms->mms conversion after a certain number
of sms segments have been created. Tested on mysid, yakju, and sojus. All
three have different settings for this feature. Also tested bug fixed by
https://googleplex-android-review.googlesource.com/#/c/103729/.

Change-Id: Ibcfd235edbaa264fede6e48f84f04345d16368fa
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
d7426b1e94b4fb0a13a400da3dfd705eeea6f4f6 01-Aug-2012 Roger Chen <cxr514033970@gmail.com> Let the text in Mms can be selected

Change-Id: I7420dfe552c848966cf7dce1ea54f5fc67645cff
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/SlideView.java
36498ea16b8b01b71be62f9edab2c7921364279b 16-Jul-2012 Roger Chen <cxr514033970@gmail.com> Recreate the options menu after drew the top panel

The onPrepareOptionsMenu will be called back before the
draft loaded, since the loading proccess has moved to
the non-UI-thread. We always need to notify CMA to
recreate the options menu after drew the top panel.

Change-Id: I91a56b9012a2934d474ceee3e499c559aa8e934b
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/ComposeMessageActivity.java
04818b1d6ea29e05ee6033efb173aa1ee902307f 24-Jul-2012 Tom Taylor <tomtaylor@google.com> am 34159b15: am 5851c6bc: Merge "Widget returning view type count of 1, uses 2" into jb-dev

* commit '34159b15e781342a0b98eecfaae479f719cd0e15':
Widget returning view type count of 1, uses 2
34159b15e781342a0b98eecfaae479f719cd0e15 23-Jul-2012 Tom Taylor <tomtaylor@google.com> am 5851c6bc: Merge "Widget returning view type count of 1, uses 2" into jb-dev

* commit '5851c6bcdfc9d534514013918fb3f478ca427de6':
Widget returning view type count of 1, uses 2
09fb57c41102b5e10beb7081f203d5b5ed8fa71e 01-Jul-2012 Wink Saville <wink@google.com> Use telephony-common and mms-common - DO NOT MERGE

Change-Id: I37581d9f85ed1d10e33370eafcce3260f7a36fa1
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
15042402db52f738fc74da4322b8c5667252899d 12-Jul-2012 Wink Saville <wink@google.com> Merge commit '7c602da8' into mit

* commit '7c602da8':
Use telephony-common and mms-common
1e1be6fad69b0941e446576c20a6dfd79e8da629 12-Jul-2012 Tom Taylor <tomtaylor@google.com> Widget returning view type count of 1, uses 2

Bug 6794052

The second view type is the loading-another-page of conversations view.
Tested with lots of conversations so I saw that loading view.

Change-Id: Id82571c3b878fc7cd1f05d0da6d42e17c31a5a57
ms/widget/MmsWidgetService.java
7c602da8c9e7434dcd273197827825950bc44828 01-Jul-2012 Wink Saville <wink@google.com> Use telephony-common and mms-common

Change-Id: I37581d9f85ed1d10e33370eafcce3260f7a36fa1
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
19c6852d8723de787d7848bab87c7ee6ce0928ba 02-Jul-2012 Tom Taylor <tomtaylor@google.com> am cf60e2ae: am e18c2967: Text message scrolling broken again

* commit 'cf60e2aeeb6dc86ec7da7524da8f65182705de59':
Text message scrolling broken again
cf60e2aeeb6dc86ec7da7524da8f65182705de59 02-Jul-2012 Tom Taylor <tomtaylor@google.com> am e18c2967: Text message scrolling broken again

* commit 'e18c29676c04f22044a759cbaa854560ba227a4f':
Text message scrolling broken again
e18c29676c04f22044a759cbaa854560ba227a4f 02-Jul-2012 Tom Taylor <tomtaylor@google.com> Text message scrolling broken again

Bug 6740178

ComposeMessageActivity needs to keep track of whether it was scrolled to
the end when paused so it can rescroll to the end when resumed.

Change-Id: Ib7e7a5e13df354c45a0eddaaa96a5c0f66c05873
ms/ui/ComposeMessageActivity.java
a651a5c8d47dfe9805f11f351a49740703171072 26-Jun-2012 Tom Taylor <tomtaylor@google.com> am a37cc9a0: am 452c9fda: Sending multiple addresses via intent will result in a single address

* commit 'a37cc9a079f8e01bb6a3838031b4f0b0ee970a95':
Sending multiple addresses via intent will result in a single address
a37cc9a079f8e01bb6a3838031b4f0b0ee970a95 26-Jun-2012 Tom Taylor <tomtaylor@google.com> am 452c9fda: Sending multiple addresses via intent will result in a single address

* commit '452c9fda4e3c9ef219bca695630faa8c802fd09b':
Sending multiple addresses via intent will result in a single address
452c9fda4e3c9ef219bca695630faa8c802fd09b 26-Jun-2012 Tom Taylor <tomtaylor@google.com> Sending multiple addresses via intent will result in a single address

Bug 6728637, 6736747

We need to append the addresses one-at-a-time for them to be dealt with
by chips. Also, if you manually type in multiple numbers (vs. choosing
multiple chip suggestions), only the last number will be selected. This
is because when the user types a comma to start a new number, the chips
code asks the text editor for the last token. The mms recipient editor's
token parser looked at the position of the cursor, saw it was a comma,
and returned that position. With this change, if the cursor is sitting on
a delimiter, it will back up to find the previous token. This fix actually
fixes another odd behavior. Prior to this change, if you hit backspace on
a chip, it would turn into the number and you had to delete all the chars
of the number to delete the chip. With this change, the chip is deleted in
a single backspace. Note that this token parsing didn't change in JB, but
the interaction with Chips resulted in this bug.

Change-Id: I9de569a803ba319c5ac0576a649fcf057d94c133
ms/ui/RecipientsEditor.java
e1d9bebdc5c0f1822c348f7c1dcc4cf414212dcc 26-Jun-2012 Jake Hamby <jhamby@google.com> am 13ec132e: am 78e2f412: Add menu item to access Cell Broadcasts from MMS app.

* commit '13ec132ee69cf27877c829661e9d9bcf00cf33a7':
Add menu item to access Cell Broadcasts from MMS app.
13ec132ee69cf27877c829661e9d9bcf00cf33a7 26-Jun-2012 Jake Hamby <jhamby@google.com> am 78e2f412: Add menu item to access Cell Broadcasts from MMS app.

* commit '78e2f412983f8f3732b87bfd794e04d3b20233bb':
Add menu item to access Cell Broadcasts from MMS app.
78e2f412983f8f3732b87bfd794e04d3b20233bb 21-Jun-2012 Jake Hamby <jhamby@google.com> Add menu item to access Cell Broadcasts from MMS app.

Add a menu item to MMS to jump to the main activity of the
Cell Broadcast app when the "config_cellBroadcastAppLinks"
config item is set to true. This allows the Cell Broadcasts
launcher icon to be removed while still allowing the user to
view the list of previously received cell broadcasts.

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: Iaf6ec9106bbd2875da81c929945342c5649fbe6f
ms/ui/ConversationList.java
6f94b699b0c79bf89bc85b148bdd318875385947 22-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am efdc60fb: am ee418972: Merge "Mms: Take Ellipsis also in to consideration when comparing width"

* commit 'efdc60fb9116c8b0a78e4a4c9a2a038f1bac17e3':
Mms: Take Ellipsis also in to consideration when comparing width
efdc60fb9116c8b0a78e4a4c9a2a038f1bac17e3 22-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am ee418972: Merge "Mms: Take Ellipsis also in to consideration when comparing width"

* commit 'ee41897222ece3b5afeed00c638905111ccabc2e':
Mms: Take Ellipsis also in to consideration when comparing width
ee41897222ece3b5afeed00c638905111ccabc2e 22-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: Take Ellipsis also in to consideration when comparing width"
37101df090e74191ded6b7dc409c1f7ca7a6b39d 21-Jun-2012 Tom Taylor <tomtaylor@google.com> am fe77b3c3: am 106d27e6: Messaging does not contain text to go with pictures

* commit 'fe77b3c3f36b508124d2529a31f9cdb8ac3a5662':
Messaging does not contain text to go with pictures
fe77b3c3f36b508124d2529a31f9cdb8ac3a5662 21-Jun-2012 Tom Taylor <tomtaylor@google.com> am 106d27e6: Messaging does not contain text to go with pictures

* commit '106d27e66e192ac88eb86440c015a617f990c2a6':
Messaging does not contain text to go with pictures
106d27e66e192ac88eb86440c015a617f990c2a6 21-Jun-2012 Tom Taylor <tomtaylor@google.com> Messaging does not contain text to go with pictures

Bug 6702702

The text wasn't getting rebuilt when the pdu was loaded.

Change-Id: I23ad0b4a4d4a5fb3b95d65e9bac2dcb92355f47e
ms/ui/MessageListItem.java
bb2151cb14deaf6adaaada44119834bc128a6c39 20-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 61913bd1: am 247cca23: Merge "Mms: Consider only Inbox messages for reply path"

* commit '61913bd161aacfc6d2045b323f392a6c00ffc0bb':
Mms: Consider only Inbox messages for reply path
61913bd161aacfc6d2045b323f392a6c00ffc0bb 20-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 247cca23: Merge "Mms: Consider only Inbox messages for reply path"

* commit '247cca233d5fa774a42e4137413d4fa8bcb66482':
Mms: Consider only Inbox messages for reply path
1a9cb3a2ecf9c30ba1cdf416d1c83f43bdee157d 20-Jun-2012 Tom Taylor <tomtaylor@google.com> am 4808e6fc: am 65f27c56: Size limit reaches for video recording even before time lapse from Messaging

* commit '4808e6fc5b0b1befbc11d1876ba7afcd4dad5091':
Size limit reaches for video recording even before time lapse from Messaging
4808e6fc5b0b1befbc11d1876ba7afcd4dad5091 20-Jun-2012 Tom Taylor <tomtaylor@google.com> am 65f27c56: Size limit reaches for video recording even before time lapse from Messaging

* commit '65f27c5665a912deae21b285c399d41ee930bfe1':
Size limit reaches for video recording even before time lapse from Messaging
65f27c5665a912deae21b285c399d41ee930bfe1 20-Jun-2012 Tom Taylor <tomtaylor@google.com> Size limit reaches for video recording even before time lapse from Messaging

Bug 6697505

Adjust limit down from 90% to 85%.

Change-Id: I774fd7f20234187ff0599957e69ef207c09e400b
ms/ui/MessageUtils.java
6f124954f936d247ce5655a98148c462a215df24 19-Jun-2012 Tom Taylor <tomtaylor@google.com> am 35a99ca4: am a71358d3: Action bar showing inconsistent information about recipients

* commit '35a99ca46d7c9576ebfd03a7c9209a3b6fb3cd49':
Action bar showing inconsistent information about recipients
35a99ca46d7c9576ebfd03a7c9209a3b6fb3cd49 19-Jun-2012 Tom Taylor <tomtaylor@google.com> am a71358d3: Action bar showing inconsistent information about recipients

* commit 'a71358d3489f50d4fb2a1d522a93feb78ec55a7e':
Action bar showing inconsistent information about recipients
8ed2c41a14a0adf71c9bb8643753f52c927bb2e2 05-Mar-2012 Suresh Koleti <skolet@codeaurora.org> Mms: Take Ellipsis also in to consideration when comparing width

For initial comparison of Message width and available text field width
Ellipsis is not taken in to consideration so Mms app is crashing
if message width is between 435 to 450.

Modify to take Ellipsis also in to consideration when ever
comparing the message width.

Change-Id: Id089b5f2707720d1038d4a348bc20389fccf6a9b
ms/ui/SearchActivity.java
0ab429ad782452331367e76909031a7b7b5d0485 15-Jun-2012 Suresh Koleti <skolet@codeaurora.org> Mms: Consider only Inbox messages for reply path

SMSC info is not filled in MO SMS even if MT SMS is having
reply path (in GSM/WCDMA case). With current design Android telephony
is considering latest SMS message in thread to know the reply path.

Ex: If one MT message is available in Inbox and if User wants to
send MO SMS as reply app stores MO SMS in queue and send the queued
messages to lower layers. Now SMS app is having two messages - one is
MT and one is MO (queued message). In this case before sending SMS the app
is considering the latest queued message instead of MT message to get SMSC.

Consider only Inbox messages to get SMSC.

Change-Id: If37d5fdf9f11f9286f41839ea5b3028f02c1de3e
ms/transaction/SmsMessageSender.java
a71358d3489f50d4fb2a1d522a93feb78ec55a7e 19-Jun-2012 Tom Taylor <tomtaylor@google.com> Action bar showing inconsistent information about recipients

Bug 6688110

Get the contacts, not just the numbers, from the receipient editor.

Change-Id: Ia221195fa5b4b98792519d188e1c9447284f8873
ms/ui/ComposeMessageActivity.java
3254b452389b6a9efaeb76766850047315e9c92f 15-Jun-2012 Wei Huang <weih@google.com> am 2fdb00cb: am b8ff5f43: bug #6664404: fix gratuitous scrolling in MMS compose activity.

* commit '2fdb00cbaaa12c9659c8c0b4df8d0a5377cb66be':
bug #6664404: fix gratuitous scrolling in MMS compose activity.
2fdb00cbaaa12c9659c8c0b4df8d0a5377cb66be 15-Jun-2012 Wei Huang <weih@google.com> am b8ff5f43: bug #6664404: fix gratuitous scrolling in MMS compose activity.

* commit 'b8ff5f43809661d46e89a40cce06a54587383112':
bug #6664404: fix gratuitous scrolling in MMS compose activity.
b8ff5f43809661d46e89a40cce06a54587383112 15-Jun-2012 Wei Huang <weih@google.com> bug #6664404: fix gratuitous scrolling in MMS compose activity.

- while on Compose activity, with the Message list view scrolled up somewhere, if the screen powers
off and back on, CMA requeries the message history, then calls to scroll to the bottom of the
message history. This behavior was on ICS and prior. However, if the IME keyboard is up while the
screen off/on happened, we somewhat get two extra sizeChanged callbacks. The first callback has
the message history view at full height, and the 2nd callback has it shrunk to accommodate the IME
keyboard height. In each callback, we call ListView.setSelection(), which seems to cause the
gratuitous scrolling jank.

I did two things to fix this:
1. in onPause(), remember the last scroll position for the Message history list view. After the
activity is resumed and the message list re-queried, I set the ListView's selection to the saved
scroll position (instead of always scroll to the end). This addressed Hiroshi's concern that
we shouldn't automatically scroll to the end after the screen turned back on.
2. in the 1st sizeChanged() callback, the Message history ListView's layout isn't completed yet.
So don't call scroll to end in that case.

These two things made the gratuitous scroll go away (well, because we are not scrolling to end
in the first place)

- fixed some logic in smooth scrolling. We don't need mFirstScrolled flag. It was used incorrectly
sometimes. Also, don't smooth scroll at all if the delta of the scroll is too big. That just seems
gratuitous.

-

Change-Id: I52a073061ac014089b78587bcda0ba64c97d3a78
ms/ui/ComposeMessageActivity.java
32b7a07e51f1c394efce5fcde19fd32399d10b6f 14-Jun-2012 Daniel Sandler <dsandler@android.com> am 952d9778: am b9e796c4: Merge "Show blank line after SMS text to get the smallIcon back." into jb-dev

* commit '952d97788a9085a1453fdffc678320783eb8f73c':
Show blank line after SMS text to get the smallIcon back.
952d97788a9085a1453fdffc678320783eb8f73c 14-Jun-2012 Daniel Sandler <dsandler@android.com> am b9e796c4: Merge "Show blank line after SMS text to get the smallIcon back." into jb-dev

* commit 'b9e796c4ad42329ae2783cdc9c2673ed1d6e7669':
Show blank line after SMS text to get the smallIcon back.
b9e796c4ad42329ae2783cdc9c2673ed1d6e7669 14-Jun-2012 Daniel Sandler <dsandler@android.com> Merge "Show blank line after SMS text to get the smallIcon back." into jb-dev
f46bf01472bf9934b140d8fae4dfe17b90fc4d52 14-Jun-2012 Daniel Sandler <dsandler@android.com> am 4a72fb3a: am 41e2e460: Merge "Remove blank line after SMS text." into jb-dev

* commit '4a72fb3a6a7f52799c75ba16844fd52cda991aa2':
Remove blank line after SMS text.
64fefc1c9b26bd6778c318e83cec696abb389c22 14-Jun-2012 Daniel Sandler <dsandler@android.com> Show blank line after SMS text to get the smallIcon back.

Showing the app icon is important enough to justify the
extra blank line, so if we kick out the smallIcon with an
avatar we need to force the last line to show.

(Partially reverts commit cfb8ce08686890c943a824b418ad56a44ae1dd85)

Bug: 6654922
Change-Id: I887fde6bd8246701d422cc89aa44e2d041d7284f
ms/transaction/MessagingNotification.java
4a72fb3a6a7f52799c75ba16844fd52cda991aa2 14-Jun-2012 Daniel Sandler <dsandler@android.com> am 41e2e460: Merge "Remove blank line after SMS text." into jb-dev

* commit '41e2e460f54fda4c181fd5a2df4709b16123788d':
Remove blank line after SMS text.
41e2e460f54fda4c181fd5a2df4709b16123788d 14-Jun-2012 Daniel Sandler <dsandler@android.com> Merge "Remove blank line after SMS text." into jb-dev
cfb8ce08686890c943a824b418ad56a44ae1dd85 13-Jun-2012 Daniel Sandler <dsandler@android.com> Remove blank line after SMS text.

The last line is now hidden for you by the framework if you
don't have some text to show there; putting a space negates
this, which leaves a weird empty row down there. Space (and
row) removed.

Bug: 6657006
Change-Id: I672a18de4c6c05e261cf04b67dcdf2aa39f614b8
ms/transaction/MessagingNotification.java
1f4c1078a052bf0752640047c1450eb8302d7de1 13-Jun-2012 Tom Taylor <tomtaylor@google.com> am cd7af42f: am eb1a5d14: Merge "ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME" into jb-dev

* commit 'cd7af42fc1b0f37baff33ddd8a7cf3609116f3e4':
ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME
cd7af42fc1b0f37baff33ddd8a7cf3609116f3e4 13-Jun-2012 Tom Taylor <tomtaylor@google.com> am eb1a5d14: Merge "ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME" into jb-dev

* commit 'eb1a5d14f90fcf8516317cef218f6e07a044a081':
ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME
0082aabf126e2237756a3de64965096d1a23c92c 12-Jun-2012 Tom Taylor <tomtaylor@google.com> ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME

Bug 6634949, 6635459

Revert commit f49fecfcd5617627f283e45e3879f6b6cb52f1b6 first, then fix
the smooth scrolling bugs.

Change-Id: I4c7b020e56ce210fa8338bf0a26b50ebeaa6a1fe
ms/ui/ComposeMessageActivity.java
ms/ui/EditMessageView.java
ms/ui/MessageListView.java
6711772aaeaed41197bb0a93d21b081bc5b9d7c8 08-Jun-2012 Tom Taylor <tomtaylor@google.com> am 0e6a6e20: am 420d5286: Merge "Messaging: Scroll up, start typing, when second line reached, the view scrolls" into jb-dev

* commit '0e6a6e2002785c3d9fce172f5bcde1d0d187a2b8':
Messaging: Scroll up, start typing, when second line reached, the view scrolls
0e6a6e2002785c3d9fce172f5bcde1d0d187a2b8 08-Jun-2012 Tom Taylor <tomtaylor@google.com> am 420d5286: Merge "Messaging: Scroll up, start typing, when second line reached, the view scrolls" into jb-dev

* commit '420d52867f71e91d279062823f892d52de9689ef':
Messaging: Scroll up, start typing, when second line reached, the view scrolls
420d52867f71e91d279062823f892d52de9689ef 08-Jun-2012 Tom Taylor <tomtaylor@google.com> Merge "Messaging: Scroll up, start typing, when second line reached, the view scrolls" into jb-dev
5385295f2c823caeffac1642443ff6095167c626 08-Jun-2012 Daniel Sandler <dsandler@android.com> am 3298f356: am 398f10eb: Merge "Show SMS text in collapsed notifications again." into jb-dev

* commit '3298f356144d115b381fc89dbfb5524a77de3995':
Show SMS text in collapsed notifications again.
3298f356144d115b381fc89dbfb5524a77de3995 08-Jun-2012 Daniel Sandler <dsandler@android.com> am 398f10eb: Merge "Show SMS text in collapsed notifications again." into jb-dev

* commit '398f10ebd01d213425222490b40b5f95d84d7d09':
Show SMS text in collapsed notifications again.
398f10ebd01d213425222490b40b5f95d84d7d09 08-Jun-2012 Daniel Sandler <dsandler@android.com> Merge "Show SMS text in collapsed notifications again." into jb-dev
9d6bec714447ce03a29a36dcd3ae6d1d8358c613 08-Jun-2012 Tom Taylor <tomtaylor@google.com> am f8f46e9f: am f0190cda: Crash trying to send mms on sojus

* commit 'f8f46e9fb63d6783b4385de944ead9593d4433a4':
Crash trying to send mms on sojus
f8f46e9fb63d6783b4385de944ead9593d4433a4 07-Jun-2012 Tom Taylor <tomtaylor@google.com> am f0190cda: Crash trying to send mms on sojus

* commit 'f0190cdad812e64f3f3a67931cb2d0bf0edf4b05':
Crash trying to send mms on sojus
f0190cdad812e64f3f3a67931cb2d0bf0edf4b05 07-Jun-2012 Tom Taylor <tomtaylor@google.com> Crash trying to send mms on sojus

Bug 6628243

Safe fix. Check for null and return.

Change-Id: I40edada1bce586d9d10e7e8dddcef549d58215e3
ms/util/ThumbnailManager.java
ca7b54a002b5bc627171d1b275cb016bf1105da2 07-Jun-2012 Daniel Sandler <dsandler@android.com> Show SMS text in collapsed notifications again.

Bug: 6614376
Change-Id: I4c2a541cbc4e5bf622c192ad952bc2df5d2323a2
ms/transaction/MessagingNotification.java
f49fecfcd5617627f283e45e3879f6b6cb52f1b6 07-Jun-2012 Tom Taylor <tomtaylor@google.com> Messaging: Scroll up, start typing, when second line reached, the view scrolls

Bug 6612809

Change-Id: I094d9fc1bac4ed4ec68a4a44ed658ff4efb57bee
ms/ui/ComposeMessageActivity.java
ms/ui/EditMessageView.java
ms/ui/MessageListView.java
18325d35b9c75ded0a2e14baae4820a5416f49c7 07-Jun-2012 Tom Taylor <tomtaylor@google.com> am 559f0a7a: am 3a999c3e: Unable to save picture attachment from received MMS message

* commit '559f0a7a352cf1796bc0a7bc9b02fa53f33be37a':
Unable to save picture attachment from received MMS message
559f0a7a352cf1796bc0a7bc9b02fa53f33be37a 07-Jun-2012 Tom Taylor <tomtaylor@google.com> am 3a999c3e: Unable to save picture attachment from received MMS message

* commit '3a999c3e0f9a93b08341d9d43374e12695d4b905':
Unable to save picture attachment from received MMS message
3a999c3e0f9a93b08341d9d43374e12695d4b905 06-Jun-2012 Tom Taylor <tomtaylor@google.com> Unable to save picture attachment from received MMS message

Bug 6615046

I was able to repro this by sending a picture attachment to my Sprint
phone via Sprint's gateway 12313123123@pm.sprint.com. The received SMIL
contained the picture, but also contained a text attachment and saving
that was causing the ContentResolver to choke on the type. The fix is
to skip the non-picture, video, and sound parts. This broke in JB
implementing the new drm. The fix is to put in a check that was in the
code for ICS.

Change-Id: I9ce5dcd7bac322b398d11f1d22cf59bc4755fcf0
ms/ui/ComposeMessageActivity.java
bf139e813df83a72f9ed2cc6faeb7b35bb4bd823 06-Jun-2012 Tom Taylor <tomtaylor@google.com> am ca837761: am 2c432920: Merge "Wrong image shown in MMS preview" into jb-dev

* commit 'ca8377615358c6fe37fc9f25a4fe36a91c78e03a':
Wrong image shown in MMS preview
ca8377615358c6fe37fc9f25a4fe36a91c78e03a 06-Jun-2012 Tom Taylor <tomtaylor@google.com> am 2c432920: Merge "Wrong image shown in MMS preview" into jb-dev

* commit '2c432920ea8d8d2ffea7c117218e3079a1e246d1':
Wrong image shown in MMS preview
e5486018e640aa2c36f68f56d19682a8fd614291 05-Jun-2012 Tom Taylor <tomtaylor@google.com> Wrong image shown in MMS preview

Bug 6104869

The change looks bigger than it is because of moving a function to WorkingMessage
where it's more general. Remove a message's thumbnails from the cache when
the attachment is removed or replaced.

Change-Id: Ib396029bec41884aa06f70a15c028e2d8ff08a0c
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
326598536a4e09ad23e90a7467ea58e4250fd3f7 05-Jun-2012 Tom Taylor <tomtaylor@google.com> am d9a30f0c: am 9b1488b9: Backing out of forwarding an mms leaves a row with no thread_id in the pdu table

* commit 'd9a30f0c9136748dcf32ea7075fcbdd4921656d0':
Backing out of forwarding an mms leaves a row with no thread_id in the pdu table
d9a30f0c9136748dcf32ea7075fcbdd4921656d0 05-Jun-2012 Tom Taylor <tomtaylor@google.com> am 9b1488b9: Backing out of forwarding an mms leaves a row with no thread_id in the pdu table

* commit '9b1488b9d20c5b79ddc0aa984bfd75844a0b0249':
Backing out of forwarding an mms leaves a row with no thread_id in the pdu table
9b1488b9d20c5b79ddc0aa984bfd75844a0b0249 05-Jun-2012 Tom Taylor <tomtaylor@google.com> Backing out of forwarding an mms leaves a row with no thread_id in the pdu table

Bug 6600669

This bug can also be reproduced by creating an mms message and then backing
out. You'll get a dialog that the message has no valid recipients and will
be deleted, but because the thread doesn't have a thread id (it has
no recipients), the pdu will get orphaned in the pdu table, never to be
deleted. With this change, when deleting a draft without a thread id, the
orphaned pdu(s) is delete as well. While I tested this with the various
combinations of mms attachments, forwarding, sending normally, and drafts,
there's some risk with this change because of the complexity of mms. In
the future, the code should be examined and changed so that a pdu with
no thread id is ever entered into the DB, but that's a much larger change
and research project than can be dealt with right now.

Change-Id: Ie0641873f052c9551fcd7ba56058cdb97287220a
ms/data/WorkingMessage.java
8dba25a41b95dfc2940afb39eb67ecea567517fa 02-Jun-2012 Wei Huang <weih@google.com> am d8ca504f: am ebea8dc3: Merge "Stop phantom thread" into jb-dev

* commit 'd8ca504fa27e65a7052ff30d9632a1b71a8daa5e':
Stop phantom thread
d8ca504fa27e65a7052ff30d9632a1b71a8daa5e 02-Jun-2012 Wei Huang <weih@google.com> am ebea8dc3: Merge "Stop phantom thread" into jb-dev

* commit 'ebea8dc30b950e66b215d2f31ee706aae8edad66':
Stop phantom thread
4057a8b18678db0b76a26e80c2626f185a91eea5 02-Jun-2012 Tom Taylor <tomtaylor@google.com> Stop phantom thread

Bug 6593778

Implement a much more targeted fix when deleting all the messages from
a conversation.

Change-Id: I30b949dc752a7dfd5016520cab42d6eb47e05a13
ms/ui/ComposeMessageActivity.java
449246cebb5bb709c4f2544635a50f3097520652 31-May-2012 Tom Taylor <tomtaylor@google.com> am ec5ba174: am ae4731a4: SMS notification is not always dismissing after selecting notification

* commit 'ec5ba1741e200238b81b88e8a101078c10de07d4':
SMS notification is not always dismissing after selecting notification
ec5ba1741e200238b81b88e8a101078c10de07d4 31-May-2012 Tom Taylor <tomtaylor@google.com> am ae4731a4: SMS notification is not always dismissing after selecting notification

* commit 'ae4731a4976595fb5ed0e055f1a2d101c5ca1ff0':
SMS notification is not always dismissing after selecting notification
ae4731a4976595fb5ed0e055f1a2d101c5ca1ff0 31-May-2012 Tom Taylor <tomtaylor@google.com> SMS notification is not always dismissing after selecting notification

Bug 6569342

markAsRead() wasn't explicitly getting called when ComposeMessageActivity
starts up. Instead, it was relying on onDataSetChanged getting called
*after* the window has focus. With this change, markAsRead always gets
called on startup, whether via onCreate or onNewIntent.

Change-Id: I7a8d5ef163cb6f3d6fb5e91b520e6f1cf9080560
ms/ui/ComposeMessageActivity.java
9ceacf26a1e2999a13f44c4e116666daa3f457a9 30-May-2012 Tom Taylor <tomtaylor@google.com> am 9c7e7951: am 3c297a56: Merge "Messaging app does not scroll while composing message" into jb-dev

* commit '9c7e795175b222fef874d10639045744041863f2':
Messaging app does not scroll while composing message
9c7e795175b222fef874d10639045744041863f2 30-May-2012 Tom Taylor <tomtaylor@google.com> am 3c297a56: Merge "Messaging app does not scroll while composing message" into jb-dev

* commit '3c297a56a9071736cdc966038fb86764e5169551':
Messaging app does not scroll while composing message
f092ccefb6a6b1289a111ea147cd7ace22d5ad5d 30-May-2012 Tom Taylor <tomtaylor@google.com> Messaging app does not scroll while composing message

Bug 6570272

When the compose message field grows, the list needs to tell the
activity so it can smooth scroll the list to keep it at the bottom.

Change-Id: I2f0ff514b71d9736181addfb00ca176b4af5051a
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListView.java
c3ee39b67d12113cc47676e9890f32057d384922 30-May-2012 Jean-Baptiste Queru <jbq@google.com> am 5a5e569e: am 590a5428: Merge "Make the liftcycle of cursor under the Activity"

* commit '5a5e569ed5f0d96f73091c6714a350854de288ba':
Make the liftcycle of cursor under the Activity
60cfa3f8378d44bb081744a7f35c4821d8f8098a 30-May-2012 Jean-Baptiste Queru <jbq@google.com> am d3c4293c: am 44206319: Merge "Fix a BadTokenException when user wakeuped device"

* commit 'd3c4293c76a6f814397285c0f076f265315e1209':
Fix a BadTokenException when user wakeuped device
5a5e569ed5f0d96f73091c6714a350854de288ba 30-May-2012 Jean-Baptiste Queru <jbq@google.com> am 590a5428: Merge "Make the liftcycle of cursor under the Activity"

* commit '590a5428d6ff905e9ffb21f3451121353f94327c':
Make the liftcycle of cursor under the Activity
d3c4293c76a6f814397285c0f076f265315e1209 30-May-2012 Jean-Baptiste Queru <jbq@google.com> am 44206319: Merge "Fix a BadTokenException when user wakeuped device"

* commit '442063196f524a2a42a6f1c93aa2b224c821ad3e':
Fix a BadTokenException when user wakeuped device
590a5428d6ff905e9ffb21f3451121353f94327c 30-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Make the liftcycle of cursor under the Activity"
442063196f524a2a42a6f1c93aa2b224c821ad3e 30-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix a BadTokenException when user wakeuped device"
bb49471b60cda4726788a6583820f69835fb1307 30-May-2012 Tom Taylor <tomtaylor@google.com> am d5a5cd84: am 12ba1749: Merge "Deleting individual sms message didn\'t work" into jb-dev

* commit 'd5a5cd8417e3d6262d4c76e06dfcfbff0e194fd5':
Deleting individual sms message didn't work
d5a5cd8417e3d6262d4c76e06dfcfbff0e194fd5 30-May-2012 Tom Taylor <tomtaylor@google.com> am 12ba1749: Merge "Deleting individual sms message didn\'t work" into jb-dev

* commit '12ba1749c0f323c5854a025663feb86e35c8ce9b':
Deleting individual sms message didn't work
c1bc98060f5e5f777e4450673bc877204bad0e16 30-May-2012 Tom Taylor <tomtaylor@google.com> am 3928563b: am f1b8b750: Merge "Cleanup notifications to match latest spec" into jb-dev

* commit '3928563bb62de0096efda87aa1b4e14fb93b310a':
Cleanup notifications to match latest spec
12ba1749c0f323c5854a025663feb86e35c8ce9b 30-May-2012 Tom Taylor <tomtaylor@google.com> Merge "Deleting individual sms message didn't work" into jb-dev
3928563bb62de0096efda87aa1b4e14fb93b310a 30-May-2012 Tom Taylor <tomtaylor@google.com> am f1b8b750: Merge "Cleanup notifications to match latest spec" into jb-dev

* commit 'f1b8b7504583ce45881f5b1269f2d207b912f920':
Cleanup notifications to match latest spec
6f82efcfc934f13b7774a05c8d5ed9fafa2c4fca 28-May-2012 Roger Chen <cxr514033970@gmail.com> Make the liftcycle of cursor under the Activity

The cursors of ComposeCardActivity and ConversationList
were never be closed. So the database will throw an
CursorWindowAllocationException if the cursors which not
be closed are too many to be allocated then the database
will return a NULL cursor back to onQueryComplete().
After that Mms will be crashed by the NullPointerException.

Change-Id: Ib8730b326edf9177bbcce48a42b85405acff51ba
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ee0f8ea8d8739358387443b4fe7d1d9edf44f601 29-May-2012 Tom Taylor <tomtaylor@google.com> Cleanup notifications to match latest spec

Bugs 6494688, 6494834, 6495125, 6495123

Change-Id: Iee09e8118b6c5d0a95ea992c129699b1a7d16fc1
ms/transaction/MessagingNotification.java
e41d7c6d4a691888904461264c93f9948f1e20c4 29-May-2012 Tom Taylor <tomtaylor@google.com> Deleting individual sms message didn't work

Bug 6538916

Also fix a bug reported by an external developer where individually
deleting all the messages in a thread, then typing a message (w/o sending it)
and then going back to the conversation list shows "Saving draft" but
no draft or thread gets saved. In addition, I found that if you individually
delete all messages, then type a message and hit send, the thread disappears.
Both cases are due to the fact that when all messages are deleted from
a thread, the thread gets deleted. We need to recognize that situation
and clear the conversation's threadId so the next time the threadId is
needed, a new thread will be created.

Change-Id: Ic3aa8c3bf61709a75b5dd9d172c46fdef73d342b
ms/ui/ComposeMessageActivity.java
4e2b8183565e71a872b9d610b0efa4fbef19ae99 22-May-2012 Jean-Baptiste Queru <jbq@google.com> am 72f91d0c: am 06ff7691: Merge "Fix an NullPointerException when finished"

* commit '72f91d0cf3386ab9a263cabfed1675b2d92de909':
Fix an NullPointerException when finished
342203dd6e1ee3a4e3e7afb7bfe99ec94b5a60a1 22-May-2012 Jean-Baptiste Queru <jbq@google.com> am d4aeb6c6: am 4e7b1be5: Merge "Fix a StaleDataException issue when pressed MENU in busy"

* commit 'd4aeb6c6551c6ad704f90bb223d4c7c62f4ad88a':
Fix a StaleDataException issue when pressed MENU in busy
72f91d0cf3386ab9a263cabfed1675b2d92de909 22-May-2012 Jean-Baptiste Queru <jbq@google.com> am 06ff7691: Merge "Fix an NullPointerException when finished"

* commit '06ff76910981e8e97549ffa3f7df4d28320e6e33':
Fix an NullPointerException when finished
d4aeb6c6551c6ad704f90bb223d4c7c62f4ad88a 22-May-2012 Jean-Baptiste Queru <jbq@google.com> am 4e7b1be5: Merge "Fix a StaleDataException issue when pressed MENU in busy"

* commit '4e7b1be5c44f1a93226c7fb19a908d92b6904efb':
Fix a StaleDataException issue when pressed MENU in busy
06ff76910981e8e97549ffa3f7df4d28320e6e33 22-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix an NullPointerException when finished"
4e7b1be5c44f1a93226c7fb19a908d92b6904efb 22-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix a StaleDataException issue when pressed MENU in busy"
0a29bbc3de8e515e337a23f8a80135dea6daf9cb 22-May-2012 Roger Chen <cxr514033970@gmail.com> Fix an NullPointerException when finished

No need to continue the querying when it was finished.
Otherwise it will be thrown an NullPointerException,
since RecipientEditor need to be initialized after
the querying completed.

Change-Id: Ie96e8c690b2227971bcd10cc4dab72eb0ec3bacf
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/ComposeMessageActivity.java
468672662a81dc047a48cc4324342101a7d19b7f 22-May-2012 Jean-Baptiste Queru <jbq@google.com> am 232d9734: am 4897fcb5: Merge "Remove message notification while in conversation ui"

* commit '232d97346349fb3257652dca4fd7cf5041b81fa9':
Remove message notification while in conversation ui
232d97346349fb3257652dca4fd7cf5041b81fa9 22-May-2012 Jean-Baptiste Queru <jbq@google.com> am 4897fcb5: Merge "Remove message notification while in conversation ui"

* commit '4897fcb586999c2830f41d208534c6c09590d0b1':
Remove message notification while in conversation ui
86728ac5898ebacde2205525e819a7fcec34d6c4 21-May-2012 Tom Taylor <tomtaylor@google.com> am a776affe: am 8d095e45: Can\'t attach video -- too big

* commit 'a776affec3cece60b497a2b75b551cc90e6c1603':
Can't attach video -- too big
a09eb87abac8f831d9c6c26c13a5c839f60bb39f 21-May-2012 Tom Taylor <tomtaylor@google.com> am 537f96e6: am 2c48c789: Crash on choosing to share a saved image via Messaging app

* commit '537f96e6b6bc2dd3a06b4fa8a658a00dca83f895':
Crash on choosing to share a saved image via Messaging app
6264b2e6ed32759a30ac95a0cac73b921e88fde9 21-May-2012 Roger Chen <cxr514033970@gmail.com> Fix a BadTokenException when user wakeuped device

SlideshowActivity will be destoryed if user pressed POWER
to sleep the device, since it was set to noHistory=true in
AndroidManifest.xml. So it will make SlideView throw a
BadTokenException when user wakeup and then scroll the
SlideView.

Change-Id: Ib67e7547aa47f7c7c6bb469c07482f24db34668d
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/SlideView.java
69d8b665c2af926031b0b13b0deb63ec17a41ea0 21-May-2012 Roger Chen <cxr514033970@gmail.com> Fix a StaleDataException issue when pressed MENU in busy

Need to check the state before got the count of mCursor,
since it will be closed in refeshing the list.

Change-Id: Ib636fd8802ced47c6b30fa4cb6fde8173386dd7b
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ms/ui/ManageSimMessages.java
fdcb76d5ef7f79a358fa0cadb20a1a3e74aefb0b 18-May-2012 Tom Taylor <tomtaylor@google.com> am 3453de7a: am 7b6fe946: Old thumbnail shown

* commit '3453de7a011379f1c12e4db47c088560a1fa2121':
Old thumbnail shown
8d095e452ac84b0a8e040fe4fdcdba45a44f4dc9 17-May-2012 Tom Taylor <tomtaylor@google.com> Can't attach video -- too big

Bug 5968665

Occasionally the video camera will return a video of size > X when
a max size of X is requested. Try to accommodate that problem by
requesting videos of a max size of .9X
ms/ui/MessageUtils.java
2c48c7894f1c4d4265bfe499e596fdd6fd3e9484 17-May-2012 Tom Taylor <tomtaylor@google.com> Crash on choosing to share a saved image via Messaging app

Bug 6507437

Images downloaded from the web have a column "mimetype", whereas images
from the gallery have a column "mime_type". With this change the code
handles both.

Change-Id: I01ab19ec46ef43b51d6bfd6beac96535bbc7ae35
ms/ui/UriImage.java
7b6fe946f2e1020432e3600c8863f72449cd4e68 16-May-2012 Tom Taylor <tomtaylor@google.com> Old thumbnail shown

Bug 6490001

DO NOT MERGE
hen a message is deleted, remove the uri from the pdu cache and clear the
thumbnail cache. When a thread is deleted, clear both the pdu and thumbnail
caches.

Change-Id: I361d48fe5430cbf9885656e2fe91ee2f566a25b9
ms/data/Conversation.java
ms/transaction/MmsSystemEventReceiver.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/util/CacheManager.java
ms/util/ImageCacheService.java
ms/util/PduLoaderManager.java
ms/util/ThumbnailManager.java
766f5466386f15cbd91705f74c6a0c905ed18efa 16-May-2012 Tom Taylor <tomtaylor@google.com> am fbcd6a72: Jank when sending a picture

* commit 'fbcd6a7287afd459fee2521bfaf2d4f70668c85a':
Jank when sending a picture
fbcd6a7287afd459fee2521bfaf2d4f70668c85a 16-May-2012 Tom Taylor <tomtaylor@google.com> Jank when sending a picture

Bug 6492075

The default when asking what kind of attachment we've got returned TEXT,
rather than unknown. Depending on when this function is called, the input
param might be null. In any case, when we don't know, the function needs
to return ATTACHMENT_TYPE_NOT_LOADED, not TEXT. When TEXT is returned,
MessageListItem hides the mms view. When the pdu/slideshow is loaded,
then the mms view is shown again, causing the jank. With this change,
the mms view remains visible throughout the sending process when there's
a picture/sound/video/slideshow attachment and the user sees no jank.

Change-Id: Iecd6067b164ee00a7e21c7ef753d6920188bda14
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
6d5bbe9ab99f94b3d456563634e953c0f42f1e93 15-May-2012 Tom Taylor <tomtaylor@google.com> am 6f21719c: SMS Sender Not Displaying Name

* commit '6f21719c32796092cb2d07a3d375633a1f3c4c6b':
SMS Sender Not Displaying Name
6f21719c32796092cb2d07a3d375633a1f3c4c6b 15-May-2012 Tom Taylor <tomtaylor@google.com> SMS Sender Not Displaying Name

Bug 6342230

Add logtag logging in Contacts so this particular user can turn on logging
so we can see what's going on.

Change-Id: I0537280380282c95b9c2e62afa71076eb5e579e2
ms/LogTag.java
ms/data/Contact.java
ms/ui/ConversationListItem.java
39a4d2748910e20e573909f0b3d0d3f5b8d05396 11-May-2012 Tom Taylor <tomtaylor@google.com> am f743e576: Merge "Attachment is getting discarded and unable to send message in messaging" into jb-dev

* commit 'f743e5768921ea1a359fcd7a9f50a4c0fc6f0dcd':
Attachment is getting discarded and unable to send message in messaging
f743e5768921ea1a359fcd7a9f50a4c0fc6f0dcd 11-May-2012 Tom Taylor <tomtaylor@google.com> Merge "Attachment is getting discarded and unable to send message in messaging" into jb-dev
42879b065d90c56ca0fc01d685f8cce496ad85e1 11-May-2012 Tom Taylor <tomtaylor@google.com> am ee2749f9: Show draft tag in widget

* commit 'ee2749f9d077a6dfddd536b66694b4428c5df92c':
Show draft tag in widget
ee2749f9d077a6dfddd536b66694b4428c5df92c 11-May-2012 Tom Taylor <tomtaylor@google.com> Show draft tag in widget

Bug 6470636

Change-Id: I9414b0d455ca45967d0efdd1ce33585ade3fe4ca
ms/widget/MmsWidgetService.java
b30a184c839d71adcc86dfd3e27a1e8bd59ff85d 10-May-2012 Tom Taylor <tomtaylor@google.com> Attachment is getting discarded and unable to send message in messaging

Bug 6471138

Complicated repro steps for a relatively simple bug. When populating the
receipients editor with no recipients, the underlying chips base class
wasn't doing anything. Therefore, the ui was left in a state showing
a recipient, yet the conversation didn't think there were any recipients.
Trying to send in that situation triggered the recipients mismatched warning.

Change-Id: Ifa93e32901ddccfa5e5a7bf13b191a5b13e18368
ms/ui/RecipientsEditor.java
4addf5f30953b5ee1d8fc14a3440e4ba81f4bb86 10-May-2012 Tom Taylor <tomtaylor@google.com> am d3794cd6: Smooth scroll when new messages are sent/recvd

* commit 'd3794cd6aeb631084eaf0989a6aba46803520177':
Smooth scroll when new messages are sent/recvd
de9560c2b02cc50741f80b653ae5e61e361629be 10-May-2012 Tom Taylor <tomtaylor@google.com> am cdbd2ded: Thread with no recipients getting created

* commit 'cdbd2dedafb1fe786ae9bf21ea0f8185b358172a':
Thread with no recipients getting created
d3794cd6aeb631084eaf0989a6aba46803520177 10-May-2012 Tom Taylor <tomtaylor@google.com> Smooth scroll when new messages are sent/recvd

Bug 5136495

Change-Id: I957200191d1243cc6b4e824ee8208eb3d5a3b55b
ms/ui/ComposeMessageActivity.java
cdbd2dedafb1fe786ae9bf21ea0f8185b358172a 10-May-2012 Tom Taylor <tomtaylor@google.com> Thread with no recipients getting created

Bug 6453254

Don't allow a thread to be created with no recipients, by not saving a
draft when there are no recipients.

Change-Id: I13cf91cf032f1338b2eda8067f591a3fdb5b7892
ms/data/WorkingMessage.java
ms/transaction/MmsMessageSender.java
c02d4d127f2a150901d7fe17d7fd6b614e195d1f 08-May-2012 Tom Taylor <tomtaylor@google.com> am 0cf7a7c3: Random person showed up as the sender of an email originated sms

* commit '0cf7a7c3bf1e23e03933eddb9bfc4b67f568fc16':
Random person showed up as the sender of an email originated sms
d3a616af9df2b0795d064f8b034b0da023907d70 08-May-2012 Tom Taylor <tomtaylor@google.com> am 5ec5b11b: Merge "SMS multi-selection showing mismatched selector drawables" into jb-dev

* commit '5ec5b11b8b8a4d3e196ed6227eec8b84957641fa':
SMS multi-selection showing mismatched selector drawables
6c77a441a08216bc2ec36cc7d58039ee49ea621d 08-May-2012 Tom Taylor <tomtaylor@google.com> am b69333da: Merge "NPE on orientation change while in Edit slide show page" into jb-dev

* commit 'b69333da8bf63a69e3fafb3b223de19e54dc9663':
NPE on orientation change while in Edit slide show page
0cf7a7c3bf1e23e03933eddb9bfc4b67f568fc16 07-May-2012 Tom Taylor <tomtaylor@google.com> Random person showed up as the sender of an email originated sms

Bug 6132498

When loading the contact for an email address, the correct person id
was getting overwritten by the email id. In many or most cases, this
would be an unknown contact id, but in this particular bug, happened
to be the contact id for a person in the contacts db. With this change,
the correct contact info and avatar are fetched for an email address.

Change-Id: Iec03a892bcfe1408a7ab68972c0794eb86c88691
ms/data/Contact.java
5ec5b11b8b8a4d3e196ed6227eec8b84957641fa 07-May-2012 Tom Taylor <tomtaylor@google.com> Merge "SMS multi-selection showing mismatched selector drawables" into jb-dev
b69333da8bf63a69e3fafb3b223de19e54dc9663 07-May-2012 Tom Taylor <tomtaylor@google.com> Merge "NPE on orientation change while in Edit slide show page" into jb-dev
08bb81bd6698cf813713e625e6c3851de847b310 07-May-2012 Tom Taylor <tomtaylor@google.com> am 7fd2c943: Merge "IME overlaps camera for a second" into jb-dev

* commit '7fd2c943d931f609c88c720981e85a4ba259657a':
IME overlaps camera for a second
7fd2c943d931f609c88c720981e85a4ba259657a 07-May-2012 Tom Taylor <tomtaylor@google.com> Merge "IME overlaps camera for a second" into jb-dev
c756eac67b9aa159d954c35f85e6b2062b9a5414 07-May-2012 Tom Taylor <tomtaylor@google.com> IME overlaps camera for a second

Bug 6447431

Hide open keyboard when launching activities for a result.

Change-Id: I6cb08f22ddb170142bbdf65d3166db3e7cb8b688
ms/ui/ComposeMessageActivity.java
8812565d4201fba3bbcd362db24fc2f4bc4b8910 07-May-2012 Todor Kalaydjiev <todor@google.com> am be8c4cdb: Fix quiet notifications: there was a concurrency issue w/ thread ID tracking

* commit 'be8c4cdb145e2919e1b5916355e5a92978e013f7':
Fix quiet notifications: there was a concurrency issue w/ thread ID tracking
be8c4cdb145e2919e1b5916355e5a92978e013f7 05-May-2012 Todor Kalaydjiev <todor@google.com> Fix quiet notifications: there was a concurrency issue w/ thread ID tracking

Bug: 6424461
Change-Id: I6ce2f3aef4035156e227275af3fdc277bc36ec63
ms/data/WorkingMessage.java
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
852b629e3be73f8eb01651f1868f3ed1857df815 05-May-2012 Tom Taylor <tomtaylor@google.com> NPE on orientation change while in Edit slide show page

Bug 6445435

A debug line was causing the crash. Consolidated the test.

Change-Id: I571879a07ce4f0aee8596bd81618ac822b058833
ms/ui/UriImage.java
c0f139d682d08a6a6f012fc6e7ae7ee451bb6e87 04-May-2012 Tom Taylor <tomtaylor@google.com> SMS multi-selection showing mismatched selector drawables

Bug 6273077

Implement checkable interface to fix this.

Change-Id: Ib6e69baa4a7e8c77eece53997c7b94fc5cb68db1
ms/ui/ConversationListItem.java
fce623cf2721102e3eebc30ddf6107ddc9a657c1 04-May-2012 Tom Taylor <tomtaylor@google.com> am 2664505a: Received SMS message content is shown twice in the Notification bar

* commit '2664505ad7917a1d1cc2294bbc958b72aa335e56':
Received SMS message content is shown twice in the Notification bar
2664505ad7917a1d1cc2294bbc958b72aa335e56 04-May-2012 Tom Taylor <tomtaylor@google.com> Received SMS message content is shown twice in the Notification bar

Bug 6439922

Don't set both a content message and bigText message.

Change-Id: Ifaee4f37ae01dd84f623a0abe3554f8e41c0b0f6
ms/transaction/MessagingNotification.java
0169743a3f37ded4d8ef83f6ea671d011c22ae67 04-May-2012 Tom Taylor <tomtaylor@google.com> am 5bb8cd1c: Merge "java.lang.NullPointerException at com.android.mms.ui.ConversationList.onSearchRequested" into jb-dev

* commit '5bb8cd1cade20848378de2a4dc73ffee70ec1a62':
java.lang.NullPointerException at com.android.mms.ui.ConversationList.onSearchRequested
4a0d14c517c1968c0f1e59544a54277ede9a8fa4 04-May-2012 Tom Taylor <tomtaylor@google.com> java.lang.NullPointerException at com.android.mms.ui.ConversationList.onSearchRequested

Bug 6438366

Change-Id: I546a9758ae45989274f420657d3a46f6f959d7da
ms/ui/ConversationList.java
d984ee4a1c18ee6319338571814e93aa5cf10a13 03-May-2012 Tom Taylor <tomtaylor@google.com> am 5d403c7c: Messaging crashed on sending

* commit '5d403c7cb873004bbc203536e818075a7223c0a5':
Messaging crashed on sending
5d403c7cb873004bbc203536e818075a7223c0a5 03-May-2012 Tom Taylor <tomtaylor@google.com> Messaging crashed on sending

Bug 6329947

Handle the case when getBitmap fails. I tested the case when the code
returns null and it correctly shows the generic image icon.

Change-Id: I7400febcde2845a8ffdf1678f64c029daad0b8f0
ms/util/ThumbnailManager.java
9699244071b9d3ee56aa2fecc5da59bbc2ee5630 03-May-2012 Tom Taylor <tomtaylor@google.com> am 402b4a84: java.lang.RuntimeException: An error occured while executing doInBackground()

* commit '402b4a84df9426e0079739621b8926dfb8731923':
java.lang.RuntimeException: An error occured while executing doInBackground()
402b4a84df9426e0079739621b8926dfb8731923 03-May-2012 Tom Taylor <tomtaylor@google.com> java.lang.RuntimeException: An error occured while executing doInBackground()

Bug 6336278

Tested that callers can handle null return value from this function.

Change-Id: I617daefff6c8b5d896419c64610e461a465fb15e
ms/data/WorkingMessage.java
1f1ecd6769f4162fbf5e0ccb2262f58ee581f781 02-May-2012 Tom Taylor <tomtaylor@google.com> am f677c24f: Crash when received MMS notification

* commit 'f677c24f07befa52ae977461c56fedeb0ad3eb47':
Crash when received MMS notification
f677c24f07befa52ae977461c56fedeb0ad3eb47 02-May-2012 Tom Taylor <tomtaylor@google.com> Crash when received MMS notification

Bug 6432493, 6432516, 6432515

Change-Id: Iac15087642e5ac03c5deab5bf4f383c8bd78d7ea
ms/transaction/MessagingNotification.java
36cd40549bd4ef3166fbe451ec51130e83b25c9e 02-May-2012 Tom Taylor <tomtaylor@google.com> am 6bbfdd3c: Messaging app crashed

* commit '6bbfdd3cc9cbe6b31dc64f122f3308563d19e077':
Messaging app crashed
6bbfdd3cc9cbe6b31dc64f122f3308563d19e077 02-May-2012 Tom Taylor <tomtaylor@google.com> Messaging app crashed

Bug 6350665

There's a race condition in Telephony.Threads.getOrCreateThreadId when it
calls MmsSmsProvider.getThreadId. If a user deletes a thread and a message
for that thread arrives at the same time, it's possible for the delete
to remove the thread found in getThreadId. With this change, getOrCreateThreadId
is wrapped by a function that blocks if we're doing a delete. I tested this
technique by adding a 10 second sleep in onDeleteComplete. The SmsReceiverService,
which calls getOrCreateThreadId is fine being blocked, since it does all of
its work on a background thread.

Change-Id: Ia9fc04052adac15c2252034006dd6cdd5c02f108
ms/data/Conversation.java
ms/transaction/SmsReceiverService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
f62f36f3fdf451ad5f6aa934c04ef95b19cbd65a 02-May-2012 Adam Powell <adamp@google.com> am fb706802: Follow API change in TaskStackBuilder

* commit 'fb7068020e74e431acc9511212d2a6d17258ab9e':
Follow API change in TaskStackBuilder
fb7068020e74e431acc9511212d2a6d17258ab9e 02-May-2012 Adam Powell <adamp@google.com> Follow API change in TaskStackBuilder

Change-Id: Ie6e509675e1ab6ae7ff3ec35d7adfbe6eb24245c
ms/transaction/MessagingNotification.java
ms/widget/MmsWidgetProvider.java
93d13759400d6d359da41eb404922aad98134e7e 30-Apr-2012 Tom Taylor <tomtaylor@google.com> am 6cc254af: Back should progress through the app before returning to Home

* commit '6cc254afc74dee97c7ef356612ae9ec7bc8b77ce':
Back should progress through the app before returning to Home
9f9c9066c7bab2e9b9aec5935c0d05014b01e012 30-Apr-2012 Tom Taylor <tomtaylor@google.com> am 81f337b9: Merge "Tapping a message should do something" into jb-dev

* commit '81f337b9a136700e78b02ada3cc9a27d4bc228f8':
Tapping a message should do something
e2fed3a030846272f5fd9fdd9d6671912cd11441 30-Apr-2012 Tom Taylor <tomtaylor@google.com> am d0144065: Merge "Implement wonder-notifications" into jb-dev

* commit 'd01440656d82542ca2dab2cc3034a47ed081c295':
Implement wonder-notifications
8b8ebf8090dbd0bf6c8fc47119ed3e2025217078 30-Apr-2012 Tom Taylor <tomtaylor@google.com> am 8f4333b0: Red chip is shown for the number though the number is correct

* commit '8f4333b0cd6bcacfcb4ffc9f1cc188f1ceb6170e':
Red chip is shown for the number though the number is correct
6cc254afc74dee97c7ef356612ae9ec7bc8b77ce 30-Apr-2012 Tom Taylor <tomtaylor@google.com> Back should progress through the app before returning to Home

Bug 6385001, 6384668

Use the TaskStackBuilder for both notifications and the widget so when
the user hits back, they'll go back to the conversation list (if not
already there) and then back to home.

Change-Id: I238619d2cac4f6286d701bbc1e20290e183fdb0a
ms/transaction/MessagingNotification.java
ms/widget/MmsWidgetProvider.java
81f337b9a136700e78b02ada3cc9a27d4bc228f8 30-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "Tapping a message should do something" into jb-dev
d01440656d82542ca2dab2cc3034a47ed081c295 30-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "Implement wonder-notifications" into jb-dev
3efec5a219021385d816639f5c801c4cd277ae9d 28-Apr-2012 Tom Taylor <tomtaylor@google.com> Tapping a message should do something

Bug 5920525

Tapping a message now shows the details dialog.

Change-Id: I24f9fbfcf82a4c9cbdd29b5a94869cdf781ad864
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
429f4c0b2a6ada384e30af31644f1edba0284b4d 27-Apr-2012 Tom Taylor <tomtaylor@google.com> Implement wonder-notifications

Bug 6288543

Support wonder-notifications. Show picture from first
slide. Show big text notifications where the whole message is displayed.
When there are several unread conversations, show them all using a digest
notification.

Change-Id: I41addcddd6783074a31ed479bef4c0a04383e9aa
ms/transaction/MessagingNotification.java
ms/ui/MmsThumbnailPresenter.java
8f4333b0cd6bcacfcb4ffc9f1cc188f1ceb6170e 27-Apr-2012 Tom Taylor <tomtaylor@google.com> Red chip is shown for the number though the number is correct

Bugs 6391820, 6373342, 6387440, 6404611

Add a Validator to mms's recipient editor. Without a Validator, the chips
code will always construct a chip and color it red, indicating it is
invalid. Since mms has to handle email addresses, phone numbers, short codes,
and aliases, anything is valid. With this change the chips are created with
a gray background to match that of gmail (b/6391820). Also, supply a custom
chips recipient list item so when we list the phone numbers, we can display
the type as well (i.e. Mobile, Home, etc.). Also fixes coming into the
Messaging app via an intent (i.e. from Contacts) and showing the chip for
that person, instead of just the number.

Change-Id: I6826ecbfbd2e389b7d3fa5852059807db9431ac1
ms/ui/ChipsRecipientAdapter.java
ms/ui/RecipientsEditor.java
433482450f73811b0f197b5e9197b3adcc831a12 25-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "java.lang.RuntimeException : at com.android.mms.LogTag.warnPossibleRecipientMismatch"
1e2705f1e5a97c993cb87e1f96bc353588e30f4e 25-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "Sending and receiving MMS over 4G is flaky"
65ea0444ba1fdf6981e9d366834e8a1008f0d37c 25-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "Sending a video is almost impossible"
3dde4a0552dc6365002071cbf7dbbdfce8570112 24-Apr-2012 Tom Taylor <tomtaylor@google.com> Sending and receiving MMS over 4G is flaky

Bug 6094676

On Sprint we were getting back an empty, but not null APN name (from Sprint)
during the transaction handshake. Then the code would try to look up that
empty name in Telephony's carrier table. It would fail. With this change,
MMS send/recv is restored on Sprint (and perhaps other carriers).

Change-Id: Id5b47e513a72c7e9758e4fc1acd12ad03c213169
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
dc5cc03ec49f31906c409b13cd76e71038f0f02f 17-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "Cannot open MMS images"
546ab4e7454419618bcae0fc683d03f047cccf02 17-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "Area code getting removed"
7e5609247f67f439568b980fb60e61d04864ef56 17-Apr-2012 Tom Taylor <tomtaylor@google.com> Sending a video is almost impossible

Bug 5928519

Add more logging to see if we're getting funky information when trying
to attach a captured video. It only happens the first time, but the
question is, the first time after what sequence of events (reboot, reflash?).

Change-Id: If8623b2ed8eac242d83e409ebe71a487ebda7102
ms/model/CarrierContentRestriction.java
b1b7ee90078a41caf0508dd13df2416bfce8e023 17-Apr-2012 Tom Taylor <tomtaylor@google.com> Cannot open MMS images

Bug 6349084

Change-Id: I41b6c314622b7c60d10df71d7d6a84b1a5ef0274
ms/ui/ComposeMessageActivity.java
9ab4d755b862392724b7dbb12e636235a05cb3bd 17-Apr-2012 Tom Taylor <tomtaylor@google.com> When screen is turned off with Messaging in foreground, no notifications are seen in notification bar

Bug 6198513

Add some logging in the notification code to see if we can track this down.
I can't repro the problem, but other JB users regularly miss notifications.

Change-Id: I130531dd73b765fe2c1eca6d39c9557a32e258e2
ms/transaction/MessagingNotification.java
fadeebc9df5e72f52438229b98ec6c2ee1938c51 17-Apr-2012 Tom Taylor <tomtaylor@google.com> Area code getting removed

Bug 6332661, 6321866

Change-Id: Ib8a8928ff815d5137ae54ce5c1ca82d749b12f1e
ms/ui/RecipientsEditor.java
49e599163acc3200e9bda4fb7825c041b67960f1 13-Jan-2012 jshin <jgsin@samsung.com> Fix for Arabic digit issue in MMS app.

Change Arabic and other Unicode digits to ASCII digits.

bug: 5615791
Change-Id: I22b32aabf3433df6381451bb4989812344e84d6c

Signed-off-by: Jake Hamby <jhamby@google.com>
ms/data/Conversation.java
ms/ui/RecipientsEditor.java
9be0403f8a1399781438b704e96a9c6088add751 13-Apr-2012 Tom Taylor <tomtaylor@google.com> Merge "Wrong image shown in MMS preview"
b8eae066a7ba60722de07300bf990d519f5c81d8 13-Apr-2012 Tom Taylor <tomtaylor@google.com> Wrong image shown in MMS preview

Bug 6104869

A static uri is used for capturing images from the camera. The code needs
to remove the thumbnail from the cache when capturing a new image or video.
In addition, the code needs to make sure it doesn't save thumbnails for
temp files in the on-disk thumbnail cache.

Change-Id: I646368d0f83fb7d6b204b611982a04275d4cd8bc
ms/TempFileProvider.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
ms/util/SimpleCache.java
ms/util/ThumbnailManager.java
271b5212603ba1424ea2b95732932ab7c2368d14 13-Apr-2012 Tom Taylor <tomtaylor@google.com> Sending a video is almost impossible

Bug 5928519

I was able to reproduce this a couple of times, "Can't attach video" error.
After putting in some debug info, I couldn't repro the problem. Even rebooting,
just like in the original bug, I wasn't able to repro. Adding some log code
to print out the exception next time the bug occurs.

Change-Id: I584ad0ff99a55c91e57fef8c64f40f36ae327a96
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
f5454ee8758e087d54c7b2dd6e0e097467c4f03e 13-Apr-2012 Tom Taylor <tomtaylor@google.com> java.lang.RuntimeException : at com.android.mms.LogTag.warnPossibleRecipientMismatch

Bug 6109090

The mDebugRecipients weren't getting updated when sending with the
recipients editor window open.

Change-Id: I8dfffd6d9476953f468aaf3e92be17fd539f6f9c
ms/ui/ComposeMessageActivity.java
cd775166502f602abfc41eee0cdc749a4b655867 12-Apr-2012 Tom Taylor <tomtaylor@google.com> Sending MMS does not show in active thread and starts in different thread without any recipient

Bug 6330102

Use an Rfc822Tokenizer to tokenize the result from the ChipsUI so the
address can easily be extracted.

Change-Id: I84d4c1470eb5c40e362c555d8f881eb7dd2d7e9c
ms/ui/RecipientsEditor.java
7616b16b95cc2d2c694cf199851a55ce8391b94e 11-Apr-2012 Tom Taylor <tomtaylor@google.com> NPE when previewing a slide in the slide editor

Bug 6319889

Change-Id: Icb0738b267557658bf278a3f8f5c75f7bc0176a8
ms/ui/SlideEditorActivity.java
6ac41e1f86acd6fdd37f72c98ea4dc386a1700b3 10-Apr-2012 Tom Taylor <tomtaylor@google.com> We should not auto convert multiple SMS to MMS messages

Bug 2216705

Restore the functionality of the original fix from:
https://android-git.corp.google.com/g/#change,40101
but keep the behavior from the subsequent CL:
https://android-git.corp.google.com/g/#/c/102637/

With this change, the messaging app's sms multipart functionality is
still controlled by the mms_config.xml flag "enableMultipartSMS". When
this is true, the user can type a message up to 2000 characters and it
will be broken up and sent as parts. If enableMultipartSMS is false, as
soon as the user types more than a single segment (i.e. 140 chars), the
message will be sent as mms. Like the original fix, there's no part
threshold anymore that determines when a long message will be converted
from a multi-part sms to an mms.

Change-Id: I5a70f27876417786a2d79436614cb02cc8c69f82
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
2d4b986e57a67eabacc0599219c726de8600836d 07-Apr-2012 Tom Taylor <tomtaylor@google.com> Support "chips" UI for choosing addresses for compose

Bug 5066294

Change-Id: I3e50b25587c15663514e20bb18c5dba22be499f8
ms/ui/ChipsRecipientAdapter.java
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
fd36e337347b5f9a945806961d61f1c0b8b3514e 06-Apr-2012 Tom Taylor <tomtaylor@google.com> Notifications do not dismiss

Bug 6298996

A line of code got eliminated in Conversation.markAsRead(). Fixed!

Change-Id: I528930f5dd8424147d97aa0ad3da9bf0590a8f28
ms/data/Conversation.java
4cab16e396f9f5381e14121011d55a7c12e3c317 06-Apr-2012 Tom Taylor <tomtaylor@google.com> Empty forward draft not removed

Bug 6222154

A number of problems to fix for this relatively innocent looking bug.
First, the PDU was getting persisted on the UI thread. Second, persisting
a PDU automatically creates a thread, but on the forwarded message side,
the thread id wasn't getting set. Since the thread id was zero, the
working message code didn't think there was any draft to delete.

Change-Id: I3021b864bdf9876eb8c66e4048295516b085406f
ms/data/WorkingMessage.java
ms/ui/AsyncDialog.java
ms/ui/ComposeMessageActivity.java
661957caeb3110ae3328a995edd467ceedc07a36 05-Apr-2012 Tom Taylor <tomtaylor@google.com> ANR on the Messaging application, when editing the attachment

Bug 5973755

When slideshows are involved, there's the possibility of an ANR because
the slideshow is saved on the UI thread. With this change, the heavy-duty-
disk-writing work is done in a background thread. If the task takes longer
than a half second, a modal progress dialog is displayed. The various
target activities, such as SlideEditorActivity and SlideshowEditActivity,
still read/save the PDU on the UI thread. They should use the PduLoaderManager.
A separate bug has been filed.

Change-Id: I384968d406fe10e192abf1614e3ce0b27f20c93d
ms/ui/AsyncDialog.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
d3bf0ec216693b4143bc304a17e3bc2e36a81ab0 03-Apr-2012 gilles le brun <gil.lebrun@orange.com> Remove message notification while in conversation ui

While composing message, on data set changed, such as new
incoming message, remove from notification bar any
notification regarding the current conversation.

While display list of conversations, on query complete, such
as new incoming message, remove from notification bar any
notification regarding the whole list of conversations.

Change-Id: I806d4a921ed13af3db07f1e55b0fc5ba021ea0ad
Signed-off-by: gilles le brun <gil.lebrun@orange.com>
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
a56495caea392de00eea50fb84ffdc06537110ba 03-Apr-2012 Tom Taylor <tomtaylor@google.com> Multiple Recipient Failure in MMS

Bug 6062623

The following command fails:
adb shell am start -a android.intent.action.SENDTO -d “sms:+15178923456,+15174356789?body=MessageText”
The app needs to replace commas with semiscolons.

Change-Id: I2c5c349065079f0dcbb12817fec5fe6d3b1a85df
ms/data/Conversation.java
7cd48d68a911c8052ed82431abe905af3a37cd5b 31-Mar-2012 Daniel Sandler <dsandler@android.com> Merge "Use the new larger notifications APIs to show an entire SMS."
d9dfeefda92e0537cce690051063a6d70351c889 16-Mar-2012 Tom Taylor <tomtaylor@google.com> Scrolling through a Compose Message Activity message thread is not 60 fps

Bug 5928605

Turn off the custom border that's preventing us from hitting
60 fps. We'll come up with a new design in b/6179069

Change-Id: Ib72e2556875fd1baa52e8eee7f70d065ad25882c
ms/ui/MessageListItem.java
365bd94c0d80a3ac8d48136c40a5ea3d1514df99 29-Mar-2012 Tom Taylor <tomtaylor@google.com> Merge "Messaging App crashes/phone becomes unresponsive"
6a53d30825817a8e70a3da0e591449377306959a 29-Mar-2012 Tom Taylor <tomtaylor@google.com> Messaging App crashes/phone becomes unresponsive

Bug 6175605

Threads were getting created out of control. Greatly
simplify markAsRead and associated code. Use an
AsyncTask (which uses a thread pool) than a bare
naked thread.

Change-Id: Icd1b56a36f45c5d47f30d071fb967b3dca8a6c9b
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
08712ce9d30d4f28476436b218f2b76c7bdfb89c 29-Mar-2012 Tom Taylor <tomtaylor@google.com> Don't load draft on the UI thread

Bug 2475394

Load the draft off of the UI thread and then show
the editor. In most cases, you can't see any difference.

Change-Id: I7c2aedb0628a6efcd6355f888b4c9f6bb19fcb45
ms/MmsApp.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
674b5045f39aedf85e6a7e38237860d000f46de0 29-Mar-2012 Daniel Sandler <dsandler@android.com> Use the new larger notifications APIs to show an entire SMS.

Multiple messages will still be aggregated into a single
(small) notification. TODO: use templates that have not yet
been designed to show a list of unread threads, or to show
the full text of the most recent message alongside a summary
of the rest of your inbox.

Change-Id: Ia7c7adf6230daba95ff645ffeca49ff7903bb0f2
ms/transaction/MessagingNotification.java
b0ef8fc2738b210a2bb0490e75eedc1e7b7b491f 29-Mar-2012 Tom Taylor <tomtaylor@google.com> Calling MessagingNotification.updateSendFailedNotification results in a DB query on the UI thread

Bug 6248511

An AsyncTask comes to the rescue. Do the query in the
background and do the UI work on the UI thread.

Change-Id: Id27790e08ba763df30a86fd0d4c3a0531e01fb8e
ms/transaction/MessagingNotification.java
ms/transaction/SmsReceiverService.java
ms/ui/ConversationList.java
cfe68b0edf81bddbaf1e0c11dcab4bb3a5ce3da8 29-Mar-2012 Tom Taylor <tomtaylor@google.com> Long tap on messaging thread second time shows ANR

Bug 6247313

Don't go into PDU code unless we've got an mms message.

Change-Id: I28965ac7390aa65d35a8f09dc25b3edc582e3427
ms/ui/ComposeMessageActivity.java
49a12964d03ed83e9f0e2d8c88e51e66ec1e771c 28-Mar-2012 Tom Taylor <tomtaylor@google.com> TransactionService.onStartCommand does DB query on UI thread

Bug 6245487

Use TransactionService's built-in ServiceHandler to do all the work
that was previously in onStartCommand.

Change-Id: Ic8e5f2f7f90ff785b12bafc32c17e17ad8ba1816
ms/transaction/TransactionService.java
0ecc26df09777835cfa8dbfd3c48ca7b7fa7f011 27-Mar-2012 Tom Taylor <tomtaylor@google.com> Use the new DRM scheme in MMS

Bug 5158047

Change-Id: Id5d0ed03816b70c9f06b98af982cd5afb9af38d5
ms/MmsApp.java
ms/data/WorkingMessage.java
ms/drm/DrmUtils.java
ms/drm/DrmWrapper.java
ms/model/AudioModel.java
ms/model/ImageModel.java
ms/model/LayoutModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/RegionMediaModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/transaction/DefaultRetryScheme.java
ms/transaction/HttpUtils.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/ui/MessageUtils.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/SlideshowPresenter.java
ms/util/PduLoaderManager.java
6a3fc7a0b8889e1ab3933f18331267fda88597ea 20-Mar-2012 Tom Taylor <tomtaylor@google.com> "Respond via SMS": Non-secure keyguard bogusly appears when using "Custom message"

Bug 4998569

Change-Id: Ib307c638d36e647e47262b6fa2cc0ecdec707bc8
ms/ui/ComposeMessageActivityNoLockScreen.java
ms/ui/NoConfirmationSendService.java
c34f7a2cec918c02b68335966dc2547579eb183f 19-Mar-2012 Tom Taylor <tomtaylor@google.com> Strict mode violation: NoConfirmationSendService running on UI thread

Bug 6193569

Use an IntentService so the work will be done off the UI thread.
Verified in the debugger. Tested with phone calls and sending
messages from the incoming call screen.

Change-Id: I2dcf163e3361abd757ded97c8ef4e7de3d3b92dc
ms/ui/NoConfirmationSendService.java
28af0405f300b050bed3b4649ad777bde8f28971 19-Mar-2012 Tom Taylor <tomtaylor@google.com> Strict Mode violation: not closing cursor

Bug 6193456

There are a few places in onQueryComplete where the code isn't
closing the returned cursor.

Change-Id: I25fe762e12a4d020648edf4b7a3d3f016feb5de1
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
84d10517ef556231b24f5432f236d3ec1eb2cfb0 19-Mar-2012 Tom Taylor <tomtaylor@google.com> Merge "Add a widget for SMS/MMS"
c7aa632be8e7d3ebe71f236f534ea2f0af71e04a 19-Mar-2012 Tom Taylor <tomtaylor@google.com> Add a widget for SMS/MMS

Bug 5935857

Change-Id: I1246487d974fef9de0f26e7b55fad2a940b084d5
ms/LogTag.java
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/transaction/MessagingNotification.java
ms/transaction/NotificationTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/SmsReceiverService.java
ms/ui/ClassZeroActivity.java
ms/ui/ConversationListItem.java
ms/widget/MmsWidgetProvider.java
ms/widget/MmsWidgetService.java
b542562125619f1d35958ca11c4ffa34eca55cb1 16-Mar-2012 Todor Kalaydjiev <todor@google.com> Make synchronization in DraftCache (way) more granular.

It was previously causing the main thread to block when calling
addOnDraftChangedListener until the DB query is done.

Needed for b/5928517

Change-Id: I5d5114badfb08ea8468503381a4b45920346a4cc
ms/util/DraftCache.java
8112b6847de98297068915e7d95a87a8dc842c64 17-Mar-2012 Todor Kalaydjiev <todor@google.com> Run ContactsCache's worker thread at a lower priority. Same with the
thread that marks all conversations as seen.

This gives us another 30% improvement in the remaining startup time.

Needed for b/5928517

Change-Id: Ia06eb30d4c320e3eb43133658a9a1f0475e9abad
ms/data/Contact.java
ms/data/Conversation.java
ff013e77fd2e30fe98f8935ae04802a2b7fbf714 16-Mar-2012 Todor Kalaydjiev <todor@google.com> Do Conversation.init in a low-priority thread.

This alone gives us an improvement of about 30% in startup time on Crespo.
Needed for b/5928517

Change-Id: Ib6382a3772c11c3fceda51ca7a6f058ce2dd28f9
ms/data/Conversation.java
ddd31c4011b4191035bdfbba05a8edb1785f71af 13-Mar-2012 Todor Kalaydjiev <todor@google.com> Give names to all background threads we create. No logic changes.

Also, fix some warnings by adding @Overrides, etc.

Change-Id: I3d7306f25fb917817359bd46b9274e04d86f4e26
ms/data/Contact.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/dom/smil/SmilPlayer.java
ms/transaction/MessagingNotification.java
ms/transaction/NotificationTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/SendTransaction.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageUtils.java
ms/ui/SearchActivity.java
ms/util/DraftCache.java
ms/util/ThumbnailManager.java
a46c89868eb1cd1ec9d0b3c248c83cfab21c8203 12-Mar-2012 Tom Taylor <tomtaylor@google.com> Scrolling through a Compose Message Activity message thread is not 60 fps.

Bug 5928605

We're up to 57 fps for a conversation with only mms picture
attachments (but only 2-3 listitems are on screen at once) and
up to 48 fps for a conversation with only sms items (8 listitems
on screen at the same time). This CL adds a couple of tweaks.
One, the date wasn't getting shown on mms items. Two, the
expensive message building wasn't getting cached.

Change-Id: Ibcf214e571c9bbb91ba78a48321445633f9d9abb
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
f5b73486499febb57260bd63f694c47b07e240fa 09-Mar-2012 Tom Taylor <tomtaylor@google.com> [VzW Issue] MMS picture file attachments disappeared when sent to an exchange email account (Sam_Int_36081)

Bug 6116662

Use the original filename if available as the name of the attachment.
Prior to this change, the code was using the leaf name of the uri
handed to the app from the gallery. This was typically a timestamp.
This was never a problem, but apparently MMSs mailed to Exchange
is a problem because it can't deal with images without extensions.

Change-Id: I17cac0113439fece6986459925d72dfddf41528f
ms/ui/UriImage.java
f627528d5e7780baa20975c067637126c3fc0f57 08-Mar-2012 Tom Taylor <tomtaylor@google.com> Use fixed-size listitems for mms

Bug 6125115

If we know a listitem is an mms listitem, preload the mms portion
of the listview so it'll be fullsize. This greatly reduces jank
scrolling a conversation list the first time.

Change-Id: I8f4e4f55e03adaf10d4e0fad10848c776a14d4c8
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MmsThumbnailPresenter.java
721ad07121cb9b0cd76bdbbc88494aa8f4d45a6d 06-Mar-2012 Tom Taylor <tomtaylor@google.com> Increase cache size and put downsized thumbnail images on disk

Bug 6093907

Use Gallery code to compress thumbnails and store them in the
app's cache dir (not on the sd card). Increase the size of the
in-memory thumbnail cache to 16 images. Set the pdu and image
loader threads to a lower priority than the UI thread. Don't
extract the empty image bitmap on the UI thread. In fact, don't
show the empty image bitmap until we're sure the image can't
be decoded. Don't set the image bitmap multiple times. Remove
excess color list background that slows things down. Clean up
the thumbnail loader and get rid of the width, height params.
Lower the pdu cache to 16 items to match the thumbnail cache limit.
Modify SimpleCache to support both hard and soft references and
use hard refs for the small pdu and thumbnail caches. The result
is much faster and less janky scrolling.

Change-Id: Ifc0d590d4ab27bb66d306b681082b4e95cf3d64d
ms/model/ImageModel.java
ms/model/VideoModel.java
ms/ui/MessageListItem.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/UriImage.java
ms/util/BackgroundLoaderManager.java
ms/util/BlobCache.java
ms/util/CacheManager.java
ms/util/ImageCacheService.java
ms/util/PduLoaderManager.java
ms/util/SimpleCache.java
ms/util/ThumbnailManager.java
1fa60ebcc53a535f056977ab1f8f305fb347b3a2 05-Mar-2012 Todor Kalaydjiev <todor@google.com> Merge "Minor simplification in the code; no logic changes"
14d33d97ed762ec8f6398297b8ec04436d1acefc 05-Mar-2012 Todor Kalaydjiev <todor@google.com> Merge "Play sound at half-volume and don't show notification for new msgs in current thread"
ba7455b4de3c892aed830763ca80d22c8c940e78 05-Mar-2012 Todor Kalaydjiev <todor@google.com> Minor simplification in the code; no logic changes

Change-Id: Iefd4915abb32f8dbea96a7ac54bcc3dbf1fe4c24
ms/ui/RecipientsEditor.java
c8d727902ff6976c45285a12aab176545a7848bb 28-Feb-2012 Todor Kalaydjiev <todor@google.com> Play sound at half-volume and don't show notification for new msgs in current thread

bug: 5928707
Change-Id: I6954f8f1700daa7d4bca971f72da55d153ab5d39
ms/transaction/MessageStatusService.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationPlayer.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
64989ecb6d0e4bea59487bade662915317b6b54b 02-Mar-2012 Todor Kalaydjiev <todor@google.com> Remove jank with title of ConversationList

bug: 5927494
Change-Id: I87bb14d626bc2a41025ea112f6335522b16a83d1
ms/ui/ConversationList.java
eee73088ec62f011fe99abfc7aac1ec6fd3feb52 01-Mar-2012 Tom Taylor <tomtaylor@google.com> Some pictures not showing up

Bug 6092116

The pdu loaded callback was only getting set if the slideshow
was non-null. It should be the other way around.
Since the slideshow gets built at the same
time as the pdu gets loaded, list items weren't getting told
when the pdu was finished loading. With this change, the
code registers for the pdu loaded callback when the slideshow
and pdu haven't been loaded yet.

Change-Id: I93773f2a1e79a45d8cf6940b4a7f8f13b232ed4f
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
8b7d36818736d447d1de55ca11df681d0abe0e51 29-Feb-2012 Tom Taylor <tomtaylor@google.com> Merge "Jank: Strict mode violation loading video thumbnail"
79bf6f70c54d08dc9c3481b8461a3a46a3cefb83 29-Feb-2012 Tom Taylor <tomtaylor@google.com> Jank: Strict mode violation loading video thumbnail

Bug 6083533

The video thumbnail was getting loaded on the UI thread. Now use
the ThumbnailManager to load the thumbnail in the background.

Change-Id: I4369fb1d0e4674d0365778ee0fd2379d01892b58
ms/model/VideoModel.java
ms/ui/AudioAttachmentView.java
ms/ui/BasicSlideEditorView.java
ms/ui/ImageAttachmentView.java
ms/ui/MessageListItem.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideViewInterface.java
ms/ui/SlideshowAttachmentView.java
ms/ui/VideoAttachmentView.java
ms/util/PduLoaderManager.java
ms/util/ThumbnailManager.java
2b7b55b57847c180ae982fa2ffbd352cf3b4c8bd 29-Feb-2012 Todor Kalaydjiev <todor@google.com> Merge "Remove spinner that used to show up during async DB queries"
595599826b336e509c6f619c8a0a3aba3c6f90ed 29-Feb-2012 Tom Taylor <tomtaylor@google.com> Merge "Strict Mode Warning is displayed when receiving message"
5c113729220385c970b9e941b93a162054285209 29-Feb-2012 Tom Taylor <tomtaylor@google.com> Remove jank: For incoming MMS message, Get picture shows download button for no good reason

Bug 5928613

When autodownloading is on (and other conditions), don't show the
download button.

Change-Id: I3470c15769437c0b17a79e9f203e6a1b666638ce
ms/ui/MessageListItem.java
ms/util/DownloadManager.java
f168c442a50961a9f011a570c9de4040da111e29 29-Feb-2012 Todor Kalaydjiev <todor@google.com> Remove spinner that used to show up during async DB queries

bug: 5920233
Change-Id: I5bc04082c3c1718e46e3749f2776f05dd36240de
ms/ui/ConversationList.java
ac2f043e7ded55ce835d474e578155ecc0c79668 29-Feb-2012 Tom Taylor <tomtaylor@google.com> MESSAGE_TYPE_NOTIFICATION_IND causes a DB read on UI thread in MessageListitem

Bug 6084942

The code called the DownloadManager which read the status column
from the pdu table. With this change, we read the status column
along with the other columns associated with the message. When
the value changes, the MessageListAdapter requeries automatically
so the value is kept up to date.

Change-Id: Ief027ac0178b7261e34781741760a0a756936458
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/util/DownloadManager.java
07ddb5c577a10e5aa3b4442426a055f3b95d5202 28-Feb-2012 Tom Taylor <tomtaylor@google.com> Strict Mode Warning is displayed when receiving message

Bug 5928704

Instead of updating the DB in the receiver itself, start a small
service and do the update there. Also, update some copyrights for
open source.

Change-Id: I8e9dbcfe4ed23527ba267f3ad7a592e8f27960a8
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessageStatusService.java
ms/util/BackgroundLoaderManager.java
ms/util/ItemLoadedCallback.java
ms/util/ItemLoadedFuture.java
ms/util/NullItemLoadedFuture.java
ms/util/PduLoaderManager.java
ms/util/ThumbnailManager.java
75db0e6ff565cd46a17cd93fa85b4b68d32dce46 28-Feb-2012 Tom Taylor <tomtaylor@google.com> Merge "Remove jank: Manage SIM card messages should have back icon"
eb575e00dd0e08d0c9295c9b1adae91e191889a6 28-Feb-2012 Tom Taylor <tomtaylor@google.com> Merge "Scroll jank when scrolling MMS images"
51e4621fa12400b1e79cc18b7bb0f9a83af6b622 27-Feb-2012 Tom Taylor <tomtaylor@google.com> Scroll jank when scrolling MMS images

Bug 5919625

Load PDU, slideshow, and images in the background.

Change-Id: I456ba8e0044a902af7310427f3172441f40cf215
ms/LogTag.java
ms/MmsApp.java
ms/data/WorkingMessage.java
ms/model/ImageModel.java
ms/ui/AttachmentEditor.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/Presenter.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowPresenter.java
ms/ui/UriImage.java
ms/util/BackgroundLoaderManager.java
ms/util/ItemLoadedCallback.java
ms/util/ItemLoadedFuture.java
ms/util/NullItemLoadedFuture.java
ms/util/PduLoaderManager.java
ms/util/SimpleCache.java
ms/util/ThumbnailManager.java
f6b398a6ca8ccb75f495d3ff59c5cbbe06231de5 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 59473ab0: am 978cfe29: am 9b0e35db: am fea21972: Merge "Fix some license statements"

* commit '59473ab0ccd00690ca0e68483f0b17c36363ed93':
Fix some license statements
9b0e35dbf566a50e365799e33a6606e8e7fde8be 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am fea21972: Merge "Fix some license statements"

* commit 'fea21972ee4977325731b9da9bc122f8618a2a78':
Fix some license statements
26b9d70ba7ab0dd1f99b3e86acae93444f4ee57d 27-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Fix some license statements

Change-Id: I405200fff5360e1428af0e4521fef2ac52c363b9
ms/ui/Divot.java
ms/ui/QuickContactDivot.java
6d0646916bac17a1ee627a0aa15d3345ff9b5479 24-Feb-2012 Tom Taylor <tomtaylor@google.com> Remove jank: Manage SIM card messages should have back icon

Bug 5924888

Change-Id: I63c6fe37fadd13292d6b7acdb9a6bfa5308f35a0
ms/ui/ManageSimMessages.java
3c29f8152eaa5ac11b0d8e2c12797b558be0a1e9 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 1d9630a2: am 0383a00f: am 5ac27303: Merge "Extended search for duplicate MMS messages during download"

* commit '1d9630a2350ca6b32334622d4d08d8f3cf003542':
Extended search for duplicate MMS messages during download
2b64b14b3f1c98fc03e89c77f05bd8bd286610ac 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am dac5cbc7: am ffede8f6: am 4fbc794d: Merge "Use name and number for SMS delivery reports"

* commit 'dac5cbc7742135cec66bd9c75fe359a71dc5438b':
Use name and number for SMS delivery reports
0383a00f9836fc7cc41e897e9b61132aa192dd7f 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5ac27303: Merge "Extended search for duplicate MMS messages during download"

* commit '5ac273037a80066892ccff1b6c1449df801d9e99':
Extended search for duplicate MMS messages during download
ffede8f6c62e25c74400f20c622a9bc94994fc9c 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 4fbc794d: Merge "Use name and number for SMS delivery reports"

* commit '4fbc794dc817c67b90fa6fe69d2ca335f99b8986':
Use name and number for SMS delivery reports
5ac273037a80066892ccff1b6c1449df801d9e99 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Extended search for duplicate MMS messages during download"
4fbc794dc817c67b90fa6fe69d2ca335f99b8986 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Use name and number for SMS delivery reports"
d21239ad9fbc002fdd6ee130cdc9a8792b61a242 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 82e0f490: am 15bd398f: am a85ca658: Merge "Problems sending/receiving MMS, tears down MMS APN"

* commit '82e0f4900929ca8cb7f3369f62339a022cfe6d73':
Problems sending/receiving MMS, tears down MMS APN
b7eb6357e0884b7423a81ae3fed008e8e07c14e1 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge 1539be7a

Change-Id: Ifdc972a26b4528c0c7dddc313a4f7ad71fb696f3
60461c4d56ab120ed861b5d9279d05cbbc80b497 03-Nov-2010 Matthias Thomae <matthias.thomae@teleca.com> Extended search for duplicate MMS messages during download

MMS messages sent from some test servers all have the same message ID,
which results in the message being deleted from the Inbox after a
first message has been downloaded. This is fixed by requiring that the
IDs and subjects of two messages are identical to regard them as
duplicates.

Change-Id: I02a9143296f98bbe5c5125510c4fd89d650ab4eb
ms/transaction/RetrieveTransaction.java
15bd398f7a41cbe6b92e2d6396095c2156c489f8 17-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am a85ca658: Merge "Problems sending/receiving MMS, tears down MMS APN"

* commit 'a85ca6589ce69cf8ecd21735195fad0f5b2881b4':
Problems sending/receiving MMS, tears down MMS APN
0a3da64a0815d0b6ed8abaa34f3d78aef5c1a8be 08-Oct-2010 Matthias Thomae <matthias.thomae@teleca.com> Problems sending/receiving MMS, tears down MMS APN

The MMS APN incorrectly tears down when connected. This is due to an
error in the code checking if the phone is connected to a MMS APN. In
TransactionSettings the default path is used, but this causes the
selection parameter to be ignored in TelephonyProvider. The result is
that when connected to a non-MMS APN it believes it is connected to a
MMS APN. The fix is to simply remove default in the URI and construct
the WHERE clause manually.

Change-Id: I25ffc26c68a40676841e34fd56aeab08604f4920
ms/transaction/TransactionSettings.java
92bf054558be5898b54bd3c4f098c6924c2f77bb 17-Feb-2012 Tom Taylor <tomtaylor@google.com> Show current vibrate setting

Bug 6014134

Show the current vibrate setting in the pref's summary rather than
making the user tap on the setting in order to bring up a dialog
of the current setting.

Change-Id: Idc2408f79174704da6fbf4eec7f4d67f74812695
ms/ui/MessagingPreferenceActivity.java
c7797433b1641be0cb77e02541b8bfed94c48835 07-Feb-2012 Tom Taylor <tomtaylor@google.com> MMS appears after delay in the thread

Bug 5032682
Bug 5939766

When sending an MMS, immediately insert a placeholder pdu in the pdu table
that'll show the user that we're in the process of sending the message.
Also fix a bug where typing a single char wouldn't bring up the contacts
search results.

Change-Id: I2f6f14048a07360b69a2529e8a61c524a753485c
ms/LogTag.java
ms/MmsApp.java
ms/data/WorkingMessage.java
ms/transaction/MmsMessageSender.java
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
ac9a5e52dc349faae2a7d8a990ff2b674c61f027 01-Feb-2012 Alexander Blom <alexvem@gmail.com> Use name and number for SMS delivery reports

Switched SMS delivery reports to display both
name and number of the contact instead of just
displaying their number.

I also switched to using Context.getString() instead
of String.format and also added brackets to the if
statements to follow the Android coding style.

Change-Id: Icb95712714523c2ac465835eeb94a99865fae0c3
Signed-off-by: Alexander Blom <alexvem@gmail.com>
ms/transaction/MessagingNotification.java
37880013315d8b7abefd9081b2c36b060083d6fa 27-Jan-2012 Tom Taylor <tomtaylor@google.com> The pictures shown while playing a slide-show are very small

Bug 5180652
The slideshow pictures were showing thumbnails. Now show larger images.
Not perfect, but better than before.

Change-Id: I38222676e50923a8c69ffea2b323725e384d490d
ms/data/WorkingMessage.java
ms/layout/HVGALayoutParameters.java
ms/layout/LayoutManager.java
ms/model/ImageModel.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/SlideView.java
ms/ui/SlideshowPresenter.java
ms/ui/UriImage.java
20b806ae4bce99fd582b9c4d492115cb14e0c753 27-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "Messaging app displays messages from SIM card right-aligned"
6b97c4bd0b9e7a69f9388e8840db2fe512d73fc3 26-Jan-2012 Tom Taylor <tomtaylor@google.com> Messaging app displays messages from SIM card right-aligned

Bug 5706440

SIM card messages all have a type of 0, which is Mms.MESSAGE_BOX_ALL.
Adjust the message type interpretation code to indicate Mms.MESSAGE_BOX_ALL
as incoming. Messages in the sms table always have a specific type set
(non-zero). Mms.MESSAGE_BOX_ALL is only used as a query parameter in
the provider.

Change-Id: I8c6288365ecaa80018e9951f69595fa2f151996b
ms/ui/MessageListAdapter.java
441ba1b7e58c737c090f646c5e32df06644d1b4a 26-Jan-2012 Tom Taylor <tomtaylor@google.com> am 7b55af4a: am 2a2e37b3: Not able to call a number that isn\'t saved in contacts, when pressing the call button from messaging app

* commit '7b55af4a267a4aca74ffcbac876deb90cf9937b2':
Not able to call a number that isn't saved in contacts, when pressing the call button from messaging app
2a2e37b3cf7d67e837da1786dd677ce5dd2921d4 26-Jan-2012 Tom Taylor <tomtaylor@google.com> Not able to call a number that isn't saved in contacts, when pressing the call button from messaging app

Bug 5922602

Don't build the options menu until after the visibility of the recipients
editor is determined.

Change-Id: Ie70019808b130f5ac982285a48b537dce60ca914
ms/ui/ComposeMessageActivity.java
dd0c1d248bb72d95d596e0c4673bb6d36899609f 26-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "Date of delivery report not available anywhere"
3d8877fa3e07c019d1779793ca0081beca177b6a 24-Jan-2012 Tom Taylor <tomtaylor@google.com> Crash in MMS on discarding a Message

Bug 5899557

There are two serious bugs here.
The first bug is that UriImage.getResizedImageData would get stuck in an
infinite loop when the picture data couldn't be decoded. Normally this loop
handles the case where an exception is thrown because the image is too big,
but in the case where the data is empty or perhaps corrupted, BitmapFactory.decodeStream
will return null and the code will end up in an infinite loop. This is done
in MmsSender in a background thread, so it doesn't affect the UI, but the
user sees that the sent message isn't showing up in the message list.
The second bug is when an exception is thrown, CMA puts up a dialog.
In the repro steps of this bug, backing out and the coming back in caused
this exception to be handled after (or during) the activity was finished.
I was easily able to repro this by hitting send and back quickly.

Change-Id: I3fe780119f15ef7d99dae45a3ebd2b4b56688e85
ms/ui/MessageUtils.java
ms/ui/UriImage.java
13b128add2d48a3778e53164abd5df2d2c8c97d2 23-Jan-2012 Tom Taylor <tomtaylor@google.com> am cdfa141c: am 758276fd: [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)

* commit 'cdfa141c0a02bc75f0507a374ed95aa90c7aaf9e':
[Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)
1328f4c41f23be60889216f8eb5157ac3ed6ab68 21-Jan-2012 John Huang <jsh@google.com> am c8cb2c6e: am 0f34940e: Merge "[MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]" into ics-mr1

* commit 'c8cb2c6ea4e5fbe3c9f8ed0a546be670bd38fdbc':
[MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]
758276fd1342cb573f9fb6bcff7ce427b2f411d0 20-Jan-2012 Tom Taylor <tomtaylor@google.com> [Crespo-S] Message not able to be sent to a Korean number with a plus code in front (i.e. +82...)

Bug 5800721

Remove separators from numbers before passing them to the SmsManager.
For numbers like "+8211-111-1111", Sprint will send back an SMS saying
the destination is invalid. By removing the separators ("-"), the number
sends fine.

Change-Id: I890a5c25063288e0527a468b65bcc26b00b57892
ms/transaction/SmsSingleRecipientSender.java
831b1232edf7f01b9d31322083ad0180b2b375b9 20-Jan-2012 Tom Taylor <tomtaylor@google.com> Date of delivery report not available anywhere

Bug 5723399

Show the delivery report date in the message details and in the delivery
report dialog.

Change-Id: I97fb60fc0f53fc23a32de7f568f667b60929654e
ms/transaction/MessageStatusReceiver.java
ms/ui/DeliveryReportActivity.java
ms/ui/DeliveryReportAdapter.java
ms/ui/DeliveryReportItem.java
ms/ui/DeliveryReportListItem.java
ms/ui/MessageUtils.java
0f34940e938ff70feaa1eb4097e75b152d42bc7d 19-Jan-2012 John Huang <jsh@google.com> Merge "[MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]" into ics-mr1
6012a9b55021a36d954ec633be5ea5c202bceec6 19-Jan-2012 John Huang <jsh@google.com> [MR1] MMS: Fix Verizon IOT 2.6.1 fail [patch3]

patch3: change local variable name for understanding

Add exception handling when MMSC send 404: file not found
for retrieving mms. Show error message and do not retry to
retrieve.
This is Verizon MMS IOT test case. They remove MMS from MMSC
before try to retrieve MMS.

Bug: 5245918

Change-Id: I2546db94b2ce2e2cdd7f1667a30b82e926d1b132
Signed-off-by: <goodsc.lee@samsung.com>
ms/transaction/RetryScheduler.java
8e80b28fb9f12ce2087359ce94aa7426b76cc36c 14-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "SMS number input should auto-format like the dialer does"
6f251511f9b6123a4d7d2611013935af60d64b78 13-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "Implement back intent on notifications"
4a44fb2e6796db816197842f48514fcf08fb0c07 12-Jan-2012 Tom Taylor <tomtaylor@google.com> SMS number input should auto-format like the dialer does

Bug 5851956

The recipients editor will now auto-format the number as the user types.
This only works on the first recipient, which is going to handle the
majority of the use cases. Holding off for now making it work with
multiple recipients until we decide whether we're going to implement
the "chips" ui (see b/5066294) for selecting recipients. While this
new code only works for the first recipient, it doesn't affect adding
additional recipients -- that works the same way it always has.

Change-Id: I9552997721829a5a84f15e6b5a3438639de88602
ms/ui/ComposeMessageActivity.java
ms/util/PhoneNumberFormatter.java
860b225dc33319977c74f934d4f03d747ad7b953 13-Jan-2012 Todor Kalaydjiev <todor@google.com> Merge "Prime image thumbnail cache on background thread when adding MMS attachment"
40e9f8b3728339f5d0f0f16d84a05ccb0dda7636 12-Jan-2012 Todor Kalaydjiev <todor@google.com> Prime image thumbnail cache on background thread when adding MMS attachment

Change-Id: I7749e9242b0c711b1020399e0bd3c68aed733244
ms/data/WorkingMessage.java
d50991158fa945e1cf97d751689e4e329d12d509 12-Jan-2012 Tom Taylor <tomtaylor@google.com> Sent Message on fast reply has a strange number in the messaging app

Bug 5765939

The CountryCode was not getting initialized until the country actually changed.
As a result, numbers were getting formatted based on the locale's country,
instead of the actual country.

Change-Id: I2e930d379ef407ec4de6c3318c709ec424af731e
ms/MmsApp.java
c0b938e899f202ba9f4ac9bd2b5736b7f96c5b57 11-Jan-2012 Tom Taylor <tomtaylor@google.com> Use libphonenumber for testing whether an address is a phone number

Bug 5855222
"Add to contacts" wasn't showing up in the ComposeMessageActivity menu
for German numbers containing slashes. The phone number checker in
Telephony.Mms.isPhoneNumber() is too simplistic. The code is now using
the sophisticated libphonenumber for testing phone numbers.

Change-Id: I6ea8c463e6bc7496e8c483c465b16ef860f2c9fc
ms/ui/ComposeMessageActivity.java
ms/util/AddressUtils.java
1fdc24a996e1c2d6a1add1f40260c5e0380f3112 11-Jan-2012 Tom Taylor <tomtaylor@google.com> Implement back intent on notifications

Bug 5214808

When the user selects a sms notification while in another app, they're
taken to the message conversation. Now when they tap back, they'll go
back to the conversation list. Tapping back again will take them back to
the activity they came from. This is the new standard in ICS.

Change-Id: I3a3dd97f6c895edd64656abf2995d17474950d11
ms/transaction/MessagingNotification.java
5a3b82f21de865f9a436e4390f9b0553cd8b72a6 10-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "Sent Message on fast reply has a strange number in the messaging app Bug 5765939"
636c0377b67b870a096902950e5b2776d3ad5fed 10-Jan-2012 Todor Kalaydjiev <todor@google.com> Merge "Remove some dialog icons and titles as per b/5446108."
0e49d13dfd2bbd949a5cb2e66d99a004e5427088 10-Jan-2012 Tom Taylor <tomtaylor@google.com> Sent Message on fast reply has a strange number in the messaging app
Bug 5765939

The CountryCode was not getting initialized until the country actually changed.
As a result, numbers were getting formatted based on the locale's country,
instead of the actual country.

Change-Id: I5d7807fe771231ff0e3a51f4d86359ed24ba1651
ms/MmsApp.java
7367592a9ce0a4482cc2bb248041d3543ec02f55 10-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "Handle the case where the recycler deletes a visible message Bug 5789152"
77d3c7e9963f551c9add7de09cab3bb58b595f17 10-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "Weird refresh in list of smses showing only numbers for a second"
cdc2268b368ab7eef20198ad5525b50bebe5863f 10-Jan-2012 Tom Taylor <tomtaylor@google.com> Merge "[Prime-China] 100% Force Close occurred when select or tap email address"
1b1af7c751218e380bd119629ff9a652157fbb21 10-Jan-2012 Tom Taylor <tomtaylor@google.com> Weird refresh in list of smses showing only numbers for a second

Bug 5649763
When deleting a thread, the code was rebuilding the whole contacts cache
and threads would only show numbers while the contacts were loading. This
is normally only visible for folks with a LOT of conversations. With this
change, deleting a single thread only removes the associated contact(s)
from the cache.

Change-Id: Ia31f9fdcb3654461d93ed5de205a28ab5389a865
ms/data/Contact.java
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
442a32e235a56401a849beda5564912bb2783e57 10-Jan-2012 Tom Taylor <tomtaylor@google.com> Handle the case where the recycler deletes a visible message
Bug 5789152

The recycler deletes messages from the database in a background thread.
The UI's list adapter can momentarily be out of sync. Gracefully handle
the case where a mms message can't be loaded.

Change-Id: I33919495aa61781417eda8df64277b8029e37128
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
3baaad82f5aba38a4c8fd115cc8d94295efbd28d 20-Dec-2011 Tom Taylor <tomtaylor@google.com> Not able to play attached audio file in Messaging Application

Bug 5782423
When an mms draft is deleted, the code needs to clear its draft uri
variable. Otherwise when the code goes to update a draft, it will try to
update a draft that's not there, rather than creating a new draft.

Change-Id: I92f252aaac4524d693827395becb341f06c0828f
ms/data/WorkingMessage.java
37fcee8d52f7fa928b04cd34709eddf7a247fbed 21-Dec-2011 Tom Taylor <tomtaylor@google.com> Wrong message deleted after changing device orientation while deleting a message

Bug 5787017
When a longpress menu item was selected, the old code relied on the cursor
being the same as when the tap took place. When the device orientation is
changed, the adapter rebuilds the list and the cursor is left at a random
position. With this change, the code saves the tapped message item and
ultimately uses the actual item when/if a menu item is selected.

Change-Id: I2f5af609b2ac918f1ffe613fc8e5397afff5ce64
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListAdapter.java
bb576861100138c4180438ec82c31be0dce44fc8 20-Dec-2011 Tom Taylor <tomtaylor@google.com> Not able to play attached audio file in Messaging Application

Bug 5782423
When an mms draft is deleted, the code needs to clear its draft uri
variable. Otherwise when the code goes to update a draft, it will try to
update a draft that's not there, rather than creating a new draft.

Change-Id: I92f252aaac4524d693827395becb341f06c0828f
ms/data/WorkingMessage.java
ee69ec2f1de67eccd80d221462d5e142c34a5576 20-Dec-2011 Tom Taylor <tomtaylor@google.com> Copy text message sometimes does not copy the right message

Bug 5778889
I wasn't able to repro the bug, but the code was using a deprecated
ClipboardManager and api. With this change, we're using the "new"
ClipboardManager and correct api to put text on the clipboard.

Change-Id: I8081aa5edd45b82840da4d798761da98c904ee39
ms/ui/ComposeMessageActivity.java
c9d65756a13cf8633124204e2ddbcc044e5c992e 13-Dec-2011 Tom Taylor <tomtaylor@google.com> am b6f28459: am 5a859d2b: Remove extra logging statement

* commit 'b6f28459f6b9a2a551a4f03b5051a8031614021c':
Remove extra logging statement
5a859d2b5245b027c19be511c0406c1de9c71815 13-Dec-2011 Tom Taylor <tomtaylor@google.com> Remove extra logging statement

Bug 5749853
WorkingMessage is leaking the number the user types as a recipient
into the debug log. Remove the log statement.

Change-Id: I1fe1a0c6e3221c059d8bcfce1f4c51857c0b9fb3
ms/data/WorkingMessage.java
6f459788b3fdd1da70ff62087a32309f04b60778 12-Dec-2011 Tom Taylor <tomtaylor@google.com> Merge "After resetting to default settings, I can see malformatted strings in the settings"
e0dccd0713d9349dadef5f0b41ce7da5e970f541 09-Dec-2011 Tom Taylor <tomtaylor@google.com> Show "Loading conversations" instead of "No conversations" while querying

Bug 5717044
The empty view is shown when the adapter has no items. The empty view,
which used to read, "No conversations", can show up during a query. With
this change, we follow email's model and show "Loading conversations". If
the result of the query is no items, the message is changed to "No conversations"

Change-Id: I8e95eb134dd0ba73c2c2c0b60dc3a178302f1504
ms/ui/ConversationList.java
dd52c9d19bbc089d69d86811f49fead9b52be507 09-Dec-2011 Tom Taylor <tomtaylor@google.com> After resetting to default settings, I can see malformatted strings in the settings

Bug 5726505
When resetting prefs, the activity was updating the old prefs, not the
new set that just got created when reloaded.

Change-Id: Iffd5cba8bdbb5995e19e715a7fe3c01036640b78
ms/ui/MessagingPreferenceActivity.java
b4ef5fdc458756bc259806a39c3379108fe804e0 07-Dec-2011 Tom Taylor <tomtaylor@google.com> [Prime-China] 100% Force Close occurred when select or tap email address

Bug 5654127
Let the linkified spans handle the clicks instead of our code extracting
the uri's, building an intent, and launching the intent. Do we want this
for MR1 (instead of master)?

Change-Id: I84a5b3638fa2cf295f3958a8a4938af2e9472651
ms/ui/MessageListItem.java
16640dcb981babc03d26bfdde55c8cebf8befd08 07-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> am 4a68d1bf: Trim leading 0\'s off ipv4 octets.

* commit '4a68d1bf3e11c304d298765bad73303a7e02906e':
Trim leading 0's off ipv4 octets.
4a68d1bf3e11c304d298765bad73303a7e02906e 07-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> Trim leading 0's off ipv4 octets.

The underlying libraries will interpret leading zeros as on octel value
and choke.

bug:5262995
Change-Id: I335488a079bda6a20f2e29c9ee4ed168b321df13
ms/transaction/TransactionSettings.java
1fa5ccab1de955de3dc2a8ae45db459644fe1d3d 07-Dec-2011 Todor Kalaydjiev <todor@google.com> Remove some dialog icons and titles as per b/5446108.

Change-Id: I4d967e756f62c8a333643beaf2132e7d6f72b573
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
328d6a9383fb257caf7134f97a8bd36b42778017 02-Dec-2011 Wei Huang <weih@google.com> am b02e3b14: Merge "Not able to select sent and received messages" into ics-mr1

* commit 'b02e3b14c28d7b63b463befd24e8a1b657d1fe3a':
Not able to select sent and received messages
727135ed7884ee5841a54076152e393df5532855 02-Dec-2011 Tom Taylor <tomtaylor@google.com> am 06d23e28: Merge "MMS doesn\'t automatically get sent after ending call in 2G mode" into ics-mr1

* commit '06d23e28c81068a954b74259c878a50b2b396824':
MMS doesn't automatically get sent after ending call in 2G mode
b02e3b14c28d7b63b463befd24e8a1b657d1fe3a 02-Dec-2011 Wei Huang <weih@google.com> Merge "Not able to select sent and received messages" into ics-mr1
06d23e28c81068a954b74259c878a50b2b396824 02-Dec-2011 Tom Taylor <tomtaylor@google.com> Merge "MMS doesn't automatically get sent after ending call in 2G mode" into ics-mr1
9549e0f231f524440c6a9112fe07ac898f82c88a 01-Dec-2011 Tom Taylor <tomtaylor@google.com> Not able to select sent and received messages

Bug 5637710
Make sure all recycled list items are reset to clickable==false. When
clickable is true, the listview doesn't get the chance to handle the
click. Instead, the click goes directly to the listitem.

Change-Id: I14f0a4c04e70a6bd218e5ac8d49dc4ba6522a0d3
ms/ui/MessageListItem.java
1e0d005e0e460a479a04535a606ad9ce94b2959d 01-Dec-2011 Tom Taylor <tomtaylor@google.com> MMS doesn't automatically get sent after ending call in 2G mode

Bug 5635957
With this change, the code detects the case where a call ends and then
sets the transaction state so it will re-request MMS connectivity.

Change-Id: I7e68aab0b7b347adbdcac29e400afa10829b2a5c
ms/transaction/TransactionService.java
c72d2aaf8f81c709916afda3000925463a784481 01-Dec-2011 Tom Taylor <tomtaylor@google.com> am f827f522: Merge ""Send calls to voicemail" should also mute SMS notications" into ics-mr1

* commit 'f827f522631c08f5cb6da623d6af63302317a714':
"Send calls to voicemail" should also mute SMS notications
f827f522631c08f5cb6da623d6af63302317a714 01-Dec-2011 Tom Taylor <tomtaylor@google.com> Merge ""Send calls to voicemail" should also mute SMS notications" into ics-mr1
1b8df494e49bf934fe160baea54ab5afc2ff3100 01-Dec-2011 Tom Taylor <tomtaylor@google.com> "Send calls to voicemail" should also mute SMS notications

Bug 5677944
When a user marks a contact with send-calls-to-voicemail, don't show
sms/mms notifications for that contact. Tested the changes with sms,
mms, and incoming messages with email addresses (a different code path
in Contact.java).

Change-Id: I7ac443dbee0659fc2f5782f5f2141a65a9c07071
ms/data/Contact.java
ms/transaction/MessagingNotification.java
e3c2e38196432b2858f67b269feef4cc067773c2 29-Nov-2011 Tom Taylor <tomtaylor@google.com> maguro] Modification for Buganizer issue No. 5509903
- Description: When sending multi-pages SMS, delivery report is received several times.
- Solution: In order to receive just one delivery report, PendingIntent for
MessageStatusReceiver is added to deliveryIntents if it is the last page.

Merged from master

Change-Id: Idd7217c2432f71baddaa33c58ddd4e7c2c5446a5
ms/transaction/SmsSingleRecipientSender.java
ec01d4ec2f6099fbbdd34e729a8955fae69d01d3 18-Nov-2011 Wei Huang <weih@google.com> am 7c253679: Merge "MMS delivery reports and read reports are displayed as sent/read while the message is still being sent" into ics-mr1

* commit '7c253679c2d182b38c74ccbfddd166c69628771f':
MMS delivery reports and read reports are displayed as sent/read while the message is still being sent
7c253679c2d182b38c74ccbfddd166c69628771f 18-Nov-2011 Wei Huang <weih@google.com> Merge "MMS delivery reports and read reports are displayed as sent/read while the message is still being sent" into ics-mr1
21a30a301e99a15217f02fddcbacfc2aa622fc7b 18-Nov-2011 Tom Taylor <tomtaylor@google.com> MMS delivery reports and read reports are displayed as sent/read while the message is still being sent

Bug 5533745
This is a regression from Eclair. We're showing icons that indicate a message
has been delivered and/or read, when that might not be the case. With this
change, we do what we did in Eclair: show an icon that indicates there
might be more information available under the details menu.

Change-Id: I56a7677b3e0e675eee8c0adcd53f89681d50a8a8
ms/ui/MessageListItem.java
e6b120fad442726c9811a356f6ab9af4c0b5fb8c 17-Nov-2011 Tom Taylor <tomtaylor@google.com> am 5b7e0f34: NPE in MessageStatusReceiver.onReceive(MessageStatusReceiver

* commit '5b7e0f3442f25481e5ee4ebe4ca37413ddd04b71':
NPE in MessageStatusReceiver.onReceive(MessageStatusReceiver
5b7e0f3442f25481e5ee4ebe4ca37413ddd04b71 17-Nov-2011 Tom Taylor <tomtaylor@google.com> NPE in MessageStatusReceiver.onReceive(MessageStatusReceiver

Bug 5629806
There's a bug when receiving an sms delivered receipt where the message can
end up being null (for several different reasons) and the code tries
to dereference the message. I wasn't able to repro the bug, but I beefed
up the code and tested it with null.

Change-Id: I28c4a04e867234a16b632b9ef95c0c7169902192
ms/transaction/MessageStatusReceiver.java
a938871add9311f5c038d1b3e4e2d518c246a612 14-Nov-2011 Tom Taylor <tomtaylor@google.com> am b5a54885: Merge "Revert "5198894 Remove saveInstanceState"" into ics-mr1

* commit 'b5a54885cbe412fb00f58fc4d19695cd42096e33':
Revert "5198894 Remove saveInstanceState"
7423f02a38be445665b3a4cab48e5aac8ca23442 14-Nov-2011 Tom Taylor <tomtaylor@google.com> am d8367568: Add a new intent to allow 3rd party apps to disable SMS\'s notification

* commit 'd83675687b1ef742c33bffe8195d7b1852c2c01d':
Add a new intent to allow 3rd party apps to disable SMS's notification
b5a54885cbe412fb00f58fc4d19695cd42096e33 14-Nov-2011 Tom Taylor <tomtaylor@google.com> Merge "Revert "5198894 Remove saveInstanceState"" into ics-mr1
a95e267c5e123139f4551758586b1f44ef02f9d2 11-Nov-2011 Tom Taylor <tomtaylor@google.com> Revert "5198894 Remove saveInstanceState"

This reverts commit 7d128943d1b6377fdbe399eb919970ab9544867e.

At the same time, it fixes bug 1556157, where a picture sent via mms
from the camera, will show up again in a draft when ComposeMessageActivity
is killed and restarted. That behavior was caused by the fact that when
an activity is re-created with an instance bundle, it's passed the
original intent to attach a picture. With this fix, we don't try and
reattach a photo. In addition, killing the activity and restarting will
restore the activity to its pre-killed state (i.e. preserve the message,
subject, etc).

Change-Id: I2059d289bce6f40f11c286436c2fa0971d0ff273
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
d83675687b1ef742c33bffe8195d7b1852c2c01d 11-Nov-2011 Tom Taylor <tomtaylor@google.com> Add a new intent to allow 3rd party apps to disable SMS's notification

Bug 5552615
In response to the new intent, the messaging app will put up a dialog
that let's the user turn off messaging notifications.

Change-Id: I36f7e561fd85e3ba45ca8831943fdae50a14f432
ms/transaction/MessagingNotification.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/MiniPreferenceActivity.java
52fdf0dc1bd1f86d725eb186455fd97fe100f0df 08-Nov-2011 Tom Taylor <tomtaylor@google.com> Merge "If an attachment fails, preserve the old attachment"
0985d55731e130b5f5c8c4a276a68c8979d09f42 08-Nov-2011 Tom Taylor <tomtaylor@google.com> am 46174f77: Merge "Delete thread option is missing in thread view" into ics-mr1

* commit '46174f77e55fb363b4e5358cfde6aabc365fc7dd':
Delete thread option is missing in thread view
ceda222ba8264279579b5b4179b43627bf082886 07-Nov-2011 Tom Taylor <tomtaylor@google.com> Delete thread option is missing in thread view

Bug 5579851
Some options depend on the number of items in the adapter. When a
query completes, invalidate the options menu.

Change-Id: Ib3c23e9b9ed4aa1a890c011b625fdf7c7f52c29d
ms/ui/ComposeMessageActivity.java
9abae049669b8525b28ec4f4adb2e14372b4d931 02-Nov-2011 Tom Taylor <tomtaylor@google.com> If an attachment fails, preserve the old attachment

Bug 5420558
If you try to replace one attachment with another, but it fails (perhaps
the new attachment is too large), then the original attachment is wiped
out. This change will now restore the original slide if the attach fails.
The code is cleaned up and simplified.

Change-Id: I7dabf91bd9d04cc08412d08f033783c68a22e240
ms/data/WorkingMessage.java
ms/ui/SlideshowEditor.java
dde05deaeef09bd3a89f2ef88e5fe90b7a26e1d0 02-Nov-2011 Tom Taylor <tomtaylor@google.com> am 60e0f6dd: Merge "Crash after capturing photo for attachment" into ics-mr1

* commit '60e0f6dd7d2631156fdaf1a2b9cf87cd3608edf0':
Crash after capturing photo for attachment
477694853685272b4ec88a7777299eed62531e9f 02-Nov-2011 Tom Taylor <tomtaylor@google.com> am 04e62d0d: Merge "Sometimes the Call icon doesn\'t show up" into ics-mr1

* commit '04e62d0d7725810ef6b1e62dc47faa3dca1eba67':
Sometimes the Call icon doesn't show up
60e0f6dd7d2631156fdaf1a2b9cf87cd3608edf0 02-Nov-2011 Tom Taylor <tomtaylor@google.com> Merge "Crash after capturing photo for attachment" into ics-mr1
fe6d47bdde300818a1f8f3cbf3db00227e86e261 01-Nov-2011 Tom Taylor <tomtaylor@google.com> am b6b2ee07: PduBodyCache.getPduBody cache not cleared

* commit 'b6b2ee07c9261504376401070fcfdf09879e7eeb':
PduBodyCache.getPduBody cache not cleared
1450f3f35f29fbf8b2701dc8e8bceda326fbfced 01-Nov-2011 Tom Taylor <tomtaylor@google.com> Crash after capturing photo for attachment

Bug 5546073
If the Mms app was killed or died while taking a picture, the call to
MmsApp.getApplication() would return null and the provider would crash.
With this change, use the context of the provider or the activity,
rather than the app's context.

Change-Id: I787ea375fefa0d94ee2c04bc023c7b115c12d70a
ms/TempFileProvider.java
ms/ui/ComposeMessageActivity.java
ms/ui/SlideEditorActivity.java
45d47b4cefba0afb4d4da5fb1505f8515b2792f0 01-Nov-2011 Tom Taylor <tomtaylor@google.com> Sometimes the Call icon doesn't show up

Bug 5545195
The Call icon is added to the menu in onPrepareOptionsMenu. That only
gets called when the activity is created and when the user taps on the
menu button. However, some of those menu items are shown on the action
bar so we have to dynamically update the menu items. Whenever we set
the conversation in the working message, update the menu bar.

Change-Id: I9fd09f851b17c05704e82d93a754541c1b3f6a00
ms/ui/ComposeMessageActivity.java
e1d4366bbd7deb4930da84f3dd9be38fa5d2bb86 31-Oct-2011 Tom Taylor <tomtaylor@google.com> am c45aa327: Merge "Monkey-found NPE" into ics-mr1

* commit 'c45aa327cfce83f5ff6a2c34c1684c0c1f3a58df':
Monkey-found NPE
b6b2ee07c9261504376401070fcfdf09879e7eeb 31-Oct-2011 Tom Taylor <tomtaylor@google.com> PduBodyCache.getPduBody cache not cleared

Bug 5526870
The PduBodyCache was never getting cleared. If you deleted a message
and then added a message and they had the same id, we'd return the old
pdu of the deleted message. It turns out that the PduBodyCache is
redundant because the pdu is already getting cached at a lower level in
the PduCache. Make sure we delete the cache entries associated with
individual messages and threads when those messages and threads are
deleted. While stepping through the change in the debugger to verify
it, I found that the new temp file names that start with '.' stripped
the filename incorrectly.

Change-Id: Ice4e453470eb1186ea69ebe6eca750bb230c5205
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
da97c56fd38b125f086ccd381c64ccd6c0618822 28-Oct-2011 Tom Taylor <tomtaylor@google.com> Monkey-found NPE

Bug 5531640
Test for null working message before deref. The monkey can click on the
edit button and then the remove button before the edit click handler
can process editing the item (which has been removed).

Change-Id: I12e34de31a1a458c3f542b7016ac2c71dc43e827
ms/ui/ComposeMessageActivity.java
2dd16597ea77c4db218202d29646066eccf12ae9 27-Oct-2011 Tom Taylor <tomtaylor@google.com> MMS attachments now load asynchronously while ui shows progress dialog

Originally a bug fix for MMS attachment progress spinner
Bug: 5473834

Loading attachments used to happen on the ui thread.
This was bad news bears for loading times > 1 second
(a specific case being Picasa photos).
Now loading attachments now happens in the background while
showing a blocking progress spinner in the ui. The
spinner only if loading takes longer than .5 seconds.
This applies for Images and Video, both for Messenger
retreiving media as well as receiving an intent.

This is a cherry-pick from master.

Change-Id: Idd927cdcf0135507bee2e8f708f14946a28d0ea1
ms/ui/ComposeMessageActivity.java
aec070ece88aecb1e65a04e1a16b07e2ab202bce 27-Oct-2011 Tom Taylor <tomtaylor@google.com> maguro] Modification for Buganizer issue No. 5509903
- Description: When sending multi-pages SMS, delivery report is received several times.
- Solution: In order to receive just one delivery report, PendingIntent for
MessageStatusReceiver is added to deliveryIntents if it is the last page.

Manual merge from partner repo

Change-Id: Ia43bd9c169cdb2c659ceaeb3d278f2d338664e51
ms/transaction/SmsSingleRecipientSender.java
af8464b051522577b508ac3438ef22ae54072b8d 26-Oct-2011 Tom Taylor <tomtaylor@google.com> am 9a45977f: am 1db5a0d5: Not showing error when message is too big

* commit '9a45977fe37e778320e29a6b116607716f94ee3b':
Not showing error when message is too big
9a45977fe37e778320e29a6b116607716f94ee3b 26-Oct-2011 Tom Taylor <tomtaylor@google.com> am 1db5a0d5: Not showing error when message is too big

* commit '1db5a0d573c462a5be6f8da636b4a7db18a7bf08':
Not showing error when message is too big
078d576afb60a230aa880e5462bf1c4a48c9499c 26-Oct-2011 Tom Taylor <tomtaylor@google.com> Send button looks the same enabled or disabled

Add new disabled send button assets and build a selector to show them
for sms. For mms, it's more complicated since we're using a TextView
and a bottom drawable. We have to make that change in code. Typing in
the subject editor needs to update the send button state.

Change-Id: If84fa711ef49ab3740b47a61aee3b296a3924045
ms/ui/ComposeMessageActivity.java
1db5a0d573c462a5be6f8da636b4a7db18a7bf08 26-Oct-2011 Tom Taylor <tomtaylor@google.com> Not showing error when message is too big

Bug 5504281
When a user adds a large video and lot of pictures, there's not enough
room to compress the pictures and the app shows the user an error
dialog. When the dialog is dismissed, the user sees the message in
the "Sending..." state (even though the message wasn't sent). The problem
was very simple, the code for setting the error in the pending_msgs table
was using the wrong key so the message wasn't marked with an error. With
this change, the user sees the message tagged with an error, they can
tap it to edit it, and remove some of the slides and resend it. Granted,
it's an edge case, but it also explains why unsent message were showing
up as "Sending...", rather than marked with an error. Also, adding a log
for message resizing, since I've needed this debugging code twice in the
last few days.

Change-Id: I9ca5d20e2e7e45953098f4098cc154b2855a4f44
ms/data/WorkingMessage.java
ms/model/SlideshowModel.java
80a1249876fe3364c4404ea13dd1472e62a8b771 26-Oct-2011 Ed Heyl <ed@google.com> am 10238391: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit '1023839190ad18c4f86008534226871e0dd6c3ef':
Turn off database log dumps
1023839190ad18c4f86008534226871e0dd6c3ef 26-Oct-2011 Ed Heyl <ed@google.com> Merge remote branch 'goog/ics-mr0' into ics-mr1
19acf4b7253f575b0e9f16c3cb4beb22cbaea6f7 25-Oct-2011 Ed Heyl <ed@google.com> Merge remote branch 'goog/ics-mr0' into ics-mr1
7a063cb79843369325645ce059ec0f4676e0ca83 25-Oct-2011 Tom Taylor <tomtaylor@google.com> Turn off database log dumps

Bug 5512341
If we run into a recipient inconsistency while sending, log it but don't
dump the user's database into the log. Use a direct method when printing
out the db. The nice LogTag functions use format and if any of the strings
have format characters, this causes a crash.

Change-Id: I597c1b7ac72b346b3b8b3b05843132c243c6fd6d
ms/LogTag.java
ms/data/Conversation.java
37b7b338d34a3f174a61c620b6713607669f2649 25-Oct-2011 Tom Taylor <tomtaylor@google.com> am 37260f1a: MMS attachment over 1.2MB

* commit '37260f1a28619edf1bde204eb1bc46e9e4a5b282':
MMS attachment over 1.2MB
37260f1a28619edf1bde204eb1bc46e9e4a5b282 25-Oct-2011 Tom Taylor <tomtaylor@google.com> MMS attachment over 1.2MB

Bug 5504281
Sometimes the Messaging app will attempt to send a mms message that is
over the size limit because the message picture attachments don't get resized.
This can happen when the code attempts to read the input stream's
length and gets back zero. A shortcut in resize sees that the len of
zero is less than the targeted size for the picture and slkips the
resize step.

Change-Id: I443ef9a537010b1c685f20760662398cfcfa8e48
ms/model/ImageModel.java
ms/model/MediaModel.java
d0c236130a1efd6025391e583330b5cd50ff1d3c 24-Oct-2011 David Mailhot <djmailhot@google.com> Merge "MMS attachments now load asynchronously while ui shows progress dialog"
be216259274d4bc041e2fb1e9fa02e210714c647 23-Oct-2011 bi4004.lee <bi4004.lee@samsung.com> am dc0014f1: Fix the error when receiving Replace Type message with more than 2 pages.

* commit 'dc0014f123be2c475bdeed2aef09566b5127e2a2':
Fix the error when receiving Replace Type message with more than 2 pages.
dc0014f123be2c475bdeed2aef09566b5127e2a2 06-Oct-2011 bi4004.lee <bi4004.lee@samsung.com> Fix the error when receiving Replace Type message with more than 2 pages.

Change-Id: I92e54c96b06c09a0f3da897d345bde7dc5693024
ms/transaction/SmsReceiverService.java
c6d957b7553e26531c23ab1359019c7c2b4cee71 18-Oct-2011 David Mailhot <djmailhot@google.com> MMS attachments now load asynchronously while ui shows progress dialog

Originally a bug fix for MMS attachment progress spinner
Bug: 5473834

Loading attachments used to happen on the ui thread.
This was bad news bears for loading times > 1 second
(a specific case being Picasa photos).
Now loading attachments now happens in the background while
showing a blocking progress spinner in the ui. The
spinner only if loading takes longer than .5 seconds.
This applies for Images and Video, both for Messenger
retreiving media as well as receiving an intent.

Change-Id: I09ac701a8cefe3dc0c3d0dc91b0a77933854872c
ms/ui/ComposeMessageActivity.java
94818b2a2f91c2adb7347ae18d14d09c86047651 21-Oct-2011 Tom Taylor <tomtaylor@google.com> am f4a44bba: Numeric shortcode need to go via SMS, not the email gateway

* commit 'f4a44bba2c6a8cdaa4dd86d9dc4560775f8e0bc0':
Numeric shortcode need to go via SMS, not the email gateway
2dc71f62f6725a480485cf250b4b23bc05d3fcb1 21-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Download attachments are not saved in correct folder on sdcard"
723191847a7438340c5a319afeab1ae8581f3e3d 21-Oct-2011 Tom Taylor <tomtaylor@google.com> Download attachments are not saved in correct folder on sdcard

Bug 5491310
When saving the content of a local slideshow (one the user sent rather
than one received), the location of videos is a temporary location
on the sdcard. Don't use that location as part of the destination
file, rather just use the leaf filename. With this change, saving
any mms (whether sent or received) saves all the parts in the standard
Download directory.

Change-Id: I3b993865298adbcd9518a446514ff687052aba81
ms/ui/ComposeMessageActivity.java
5f2b506733c3731b40a16393cd0b78050efdc9c4 21-Oct-2011 Tom Taylor <tomtaylor@google.com> am 610991f7: Merge "Incoming slideshows with sound and video will crash!" into ics-mr0

* commit '610991f76110fe7a9e37c822e8d2ce7104841f6f':
Incoming slideshows with sound and video will crash!
f4a44bba2c6a8cdaa4dd86d9dc4560775f8e0bc0 21-Oct-2011 Tom Taylor <tomtaylor@google.com> Numeric shortcode need to go via SMS, not the email gateway

Bug 5455806
Rewrite the function to identify aliases.

Change-Id: Ia3ee5440b3437ed324be0437e940d5fe26d30dd2
ms/ui/MessageUtils.java
6798ba71f8b01d382bdc83b7f40757aa89c280cd 21-Oct-2011 Todor Kalaydjiev <todor@google.com> Make sure future changes to this math don't accidentally use int division
and end up with a result of 0 to represent the fraction.
Also, remove an obsolete part of the comment.

Change-Id: Ib2ad2d9c138979b6695f09428c6549a8408e3844
ms/ui/UriImage.java
610991f76110fe7a9e37c822e8d2ce7104841f6f 21-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Incoming slideshows with sound and video will crash!" into ics-mr0
662a7c3cbff258dccad304efcfa6450a08a2fbd5 21-Oct-2011 Todor Kalaydjiev <todor@google.com> am 43ce6298: Merge "Fix resizing images when byte size is >2x the allowed limit." into ics-mr0

* commit '43ce6298f6a6f47e262a433540c6dedc599f55e9':
Fix resizing images when byte size is >2x the allowed limit.
b98717aa6a2a044d7e72c5a086cd7538fc94ad19 21-Oct-2011 Todor Kalaydjiev <todor@google.com> am 48a2beb6: Merge "Revert "Don\'t save draft with no recipients"" into ics-mr0

* commit '48a2beb69fab7cfa52f882569c55a07c7d66c95f':
Revert "Don't save draft with no recipients"
43ce6298f6a6f47e262a433540c6dedc599f55e9 21-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Fix resizing images when byte size is >2x the allowed limit." into ics-mr0
48a2beb69fab7cfa52f882569c55a07c7d66c95f 21-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Revert "Don't save draft with no recipients"" into ics-mr0
1c4ee29d168bf380054499201e6e7c262d53e4a7 20-Oct-2011 Todor Kalaydjiev <todor@google.com> Fix resizing images when byte size is >2x the allowed limit.

b/5486816 - basically we were unable to attach more than 1 image to
an MMS in most cases. Pretty bad.

Change-Id: Ic42d267258614784042e506818a7fb4ff3a3fd99
ms/ui/UriImage.java
4ae926d268bb27d260b711a2a136c07441134178 20-Oct-2011 Tom Taylor <tomtaylor@google.com> Incoming slideshows with sound and video will crash!

Bug 5419450
While investigating 5419450, a bug with multiple sounds formats and
video formats, I sent them all to my phone via an email mms gateway.
On the phone's side, we tried to build a slideshow from the attachment.
The mms code doesn't allow a video and sound to be added to the same
slideshow. The UI enforces that. However, when we receive a slideshow
with mixed sounds and videos, the code would throw an exception. With
this change, the code will ignore parts that can't be handled.

Change-Id: I298ee1722afc46593c48a95ceb825ae9c15c41b3
ms/model/SlideModel.java
67c04d1c26202049c12c13796926e412b73df83b 20-Oct-2011 Tom Taylor <tomtaylor@google.com> am bdc9abc5: Merge "NullPointerException at com.android.mms.ui.ClassZeroActivity.onCreate" into ics-mr0

* commit 'bdc9abc59daa2daf3ef20a736126fbc920f65d7f':
NullPointerException at com.android.mms.ui.ClassZeroActivity.onCreate
8589be5e42dc7b401a092c232b1bf72eceb82bae 20-Oct-2011 Todor Kalaydjiev <todor@google.com> Revert "Don't save draft with no recipients"

This reverts commit 3a453f0ee6d19940faf307163f827ce03d0ec933.

The revert is due to b/5471420. The original bug that this change
was fixing was b/5421126, but I think there was a misunderstanding
there about what the behavior should be. In any case, the crash is
worse than the old behavior, so reverting seems the right thing to do.

Change-Id: I7e462871f15737ae73f55d817dde038fa3fb4f84
ms/ui/ComposeMessageActivity.java
104d391ddcc251c4c26975c093d2df5dea9b15c1 20-Oct-2011 Tom Taylor <tomtaylor@google.com> NullPointerException at com.android.mms.ui.ClassZeroActivity.onCreate

Bug 5489822
We have to pass the new "format" parameter through to the ClassZeroActivity.
The format is required in createFromPdu(). Without that new param, the
function will return a null SmsMessage.

Change-Id: I38aa264336e2d5af2aaa2b3ae9a7e5fcec771cf2
ms/transaction/SmsReceiverService.java
2cec70f3aa1db4cf74d34569361f06847ae4f6c8 20-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5486716 Remove dialog titles in confirmations"
c587892d1ee318d6b4ffcb5f4ad1c995dbeeeaf7 20-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5486716 Remove dialog titles in confirmations

Change-Id: I3db94695a5efa996675669c750c93a55d4d3a2a4
ms/ui/ComposeMessageActivity.java
ms/ui/WarnOfStorageLimitsActivity.java
8622ce27b78a839209e4702fab3f8b42e78bc408 20-Oct-2011 Tom Taylor <tomtaylor@google.com> am 6a82abf0: Crash when mms contains unsupported content type

* commit '6a82abf08c2136488b28870710be088c62c68c1d':
Crash when mms contains unsupported content type
6a82abf08c2136488b28870710be088c62c68c1d 20-Oct-2011 Tom Taylor <tomtaylor@google.com> Crash when mms contains unsupported content type

Bug 5479474
Instead of crashing when an mms message contains an unsupported content
type, silently replace that part of the slideshow with empty text. I would
have added a string that says why that part isn't shown, but it's too late
for new strings.

Change-Id: I652c2e686d8a8518b358c3d4f56056ae5a389ce0
ms/model/MediaModelFactory.java
7e5712cfa1f19a1f326a1f403d6c6232b51f2320 19-Oct-2011 Todor Kalaydjiev <todor@google.com> am 70322de5: Tell Gallery to show only 1 image when previewing MMS attachments.

* commit '70322de51cc7ef634c4b68b08b1c35b516fede77':
Tell Gallery to show only 1 image when previewing MMS attachments.
70322de51cc7ef634c4b68b08b1c35b516fede77 19-Oct-2011 Todor Kalaydjiev <todor@google.com> Tell Gallery to show only 1 image when previewing MMS attachments.

b/5418759

Change-Id: I1cd42abd6de2487e341fc54f0464c247fe643c4a
ms/ui/MessageUtils.java
b8c57f9ad3bb3f50c9d58cb18f11eb3b57a28375 19-Oct-2011 Tom Taylor <tomtaylor@google.com> am 8eff4fa8: Messaging application crashes all the time

* commit '8eff4fa80603899bb75067039812bbb9b4a13c7d':
Messaging application crashes all the time
8eff4fa80603899bb75067039812bbb9b4a13c7d 19-Oct-2011 Tom Taylor <tomtaylor@google.com> Messaging application crashes all the time

Bug 5481530
Undo noseless-smiley. Apparently, arrays.xml doesn't get copied to other
locales the way strings.xml does. The change (before this undo) is causing
other locales to crash when launching Messaging.

Change-Id: Id5aa07bbde1f96d9096f59b28ef022269ca2628c
ms/util/SmileyParser.java
f8a3cd920a3728de438b309f6cee2d135a0323aa 19-Oct-2011 Tom Taylor <tomtaylor@google.com> am fe0faf65: Can\'t add smiley to subject

* commit 'fe0faf65c654a87d4d5de8d87713364fcf786a3f':
Can't add smiley to subject
fe0faf65c654a87d4d5de8d87713364fcf786a3f 19-Oct-2011 Tom Taylor <tomtaylor@google.com> Can't add smiley to subject

Bug 5453810. Bug 3382512
If you use the menu to add a smiley when the subject editor has the focus,
the smiley will be added to the message body instead. That's now fixed.
Smiley icons are now displayed in the ConversationList and in the
subject of messages. The nose-less smiley icon :) is now parsed as
"happy" like it is in Talk.

Change-Id: I2685fd7946881aceb89617cf54c4de0b5a17650e
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationListItem.java
ms/ui/MessageListItem.java
ms/util/SmileyParser.java
0b0266636ea96d9e95542ffb3689b6c47f7edd43 18-Oct-2011 Tom Taylor <tomtaylor@google.com> am a3a45437: Merge "Device unable to send SMS message to nicknames which contains characters and numbers" into ics-mr0

* commit 'a3a45437efd765d5e6f51da7111badf552d0a160':
Device unable to send SMS message to nicknames which contains characters and numbers
a3a45437efd765d5e6f51da7111badf552d0a160 18-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Device unable to send SMS message to nicknames which contains characters and numbers" into ics-mr0
7f91c8a2d5dc9a89a34fa9f294e53127a87d3d92 18-Oct-2011 Peter Ng <petergng@google.com> am 3df28cb8: Merge "Attachment visuals updated and piped through" into ics-mr0

* commit '3df28cb8c1e6a039d9364289142cad7d976bcf0a':
Attachment visuals updated and piped through
3df28cb8c1e6a039d9364289142cad7d976bcf0a 18-Oct-2011 Peter Ng <petergng@google.com> Merge "Attachment visuals updated and piped through" into ics-mr0
d7fddfa20e7bfe9f0bf376f9cce9188bf9bf0354 18-Oct-2011 Tom Taylor <tomtaylor@google.com> Device unable to send SMS message to nicknames which contains characters and numbers

Bug 5453853
If an address looks like an alias and aliases are enabled, then treat the
alpha-numeric address as an address, rather than stripping non-dialable
digits and turning the address into a number. I tested this change in
conjunction with addresses such as "T-Mobile" to verify that those
addresses still work.

Change-Id: Ibd1a60ffddb481c977196c76bf13c8ce0a0da912
ms/data/Contact.java
ecb91d63c31dae86e6bccf33e7379b49723a7095 18-Oct-2011 Peter Ng <petergng@google.com> Attachment visuals updated and piped through

Change-Id: Ica33d5f14dac1230e2be14910f5100e03a32f3c8
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/SlideshowEditActivity.java
e92f32d032487661919ebddee5037ae859e5370b 18-Oct-2011 Tom Taylor <tomtaylor@google.com> am b19f3b32: Texts to 911 don\'t work

* commit 'b19f3b32bd202fa9f25a45e9e3068b33c12b70c0':
Texts to 911 don't work
b19f3b32bd202fa9f25a45e9e3068b33c12b70c0 18-Oct-2011 Tom Taylor <tomtaylor@google.com> Texts to 911 don't work

Bug 5455806
The code treated 911 as a shortcut and tried to send the message via
the email gateway. With this change, 911 is recognized as a valid number.

Change-Id: I8556b86825f490ce60d97c4c46e9c3a34ba206c1
ms/ui/MessageUtils.java
3be020ad996b08eb358eecd147d26e3bed0d8e2f 18-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Insert smiley option in slide show doesn't add any smiley"
7d71c1feb0137b10317f4f04644f6e498bfd10ed 18-Oct-2011 Tom Taylor <tomtaylor@google.com> Insert smiley option in slide show doesn't add any smiley

Bug 5471993
Hide the smiley menu item when the user has attached a slideshow
because there's no message field to type into with a slideshow
attachment.

Change-Id: Ie12a6f144f952dbaba38bacbe3a9f6e302ab5bbf
ms/ui/ComposeMessageActivity.java
a794104f0733819e45066f8445c07f8cd435876a 18-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5472044 5469925 Messaging search not working from QSB"
2d869da0b1dc4bb09d204e4845ef24db48a24b52 17-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5472044 5469925 Messaging search not working from QSB

Change-Id: If59b2ee0446257c2ffc463d48b6262e9e4f27bcb
ms/SuggestionsProvider.java
284f6ab216c11f16b6b5d1f5fae6373fc485a2fc 17-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Unknown numbers are not formatted properly"
626772e1cf5dc119e127b6519c8143b6691aab4e 12-Oct-2011 Todor Kalaydjiev <todor@google.com> Keep a cached playback state for controlling the SmilPlayer. DO NOT MERGE

This avoids problems with the asychronous execution of actions by
SmilPlayer.

Fixes b/5418836.

Change-Id: Ic53ac664c4a42f247c16f4049d31698b86cedf56
ms/ui/SlideshowActivity.java
bc66495770208a068e74f9945274865f5ea96b3f 15-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Revert "Explicitly update MediaController UI state when playing slideshow.""
31211022788b79df469cb39d993e6e99ad8512eb 14-Oct-2011 David Mailhot <djmailhot@google.com> Merge "Show progress spinner when loading MMS attachments"
1a36d4be0ece8d887cce4ebdbc86e170c42c5cbb 12-Oct-2011 David Mailhot <djmailhot@google.com> Show progress spinner when loading MMS attachments

bug: 5354767
When attaching to an MMS, loading of the media is done on the UI thread.
In the case of Picasa photos, loading can take several seconds. Therefore,
this fix loads attachments in the background while a progress dialog is
displayed on the UI. The dialog blocks user input, and appears only after
.5 seconds. The fix has also been applied to video and audio attachments.

Change-Id: I30ab8b4aa3c91b4c401ab89c17e72efb84860879
ms/ui/ComposeMessageActivity.java
b764ab1119f862e033d8b616d9f87ce9a87a87e5 14-Oct-2011 Todor Kalaydjiev <todor@google.com> Revert "Explicitly update MediaController UI state when playing slideshow."

The original bug was 5418836, but this "fix" introduced an even bigger problem, so the original bug will be fixed differently.

This reverts commit f772e248e4f85d9e360dc9ec6c98a150138f5dd2
ms/dom/smil/SmilPlayer.java
ms/ui/SlideshowActivity.java
3e54d384bed81d27dbe15a2a69344d5e64a1c018 14-Oct-2011 Tom Taylor <tomtaylor@google.com> Unknown numbers are not formatted properly

Bug 5056289
When a contact is initially created, format the number based on the locale.
Just doing that will cause the number of be displayed in the UI correctly
and stored in the canonical_addresses table formatted as well.

Change-Id: I6434210034f28f3e9e031f926508d44708401e23
ms/data/Contact.java
ms/ui/RecipientsAdapter.java
53b5dd8f1ac1e8378af8487a0fe2ebc234bb6dd5 14-Oct-2011 Todor Kalaydjiev <todor@google.com> Don't crash if deleting DRM temp data fails

Fixes b/5415438

Change-Id: Ie4601ef8a44c49922db123727f1b2e98f77c1c01
ms/drm/DrmUtils.java
ecb9b99fcd7062677932c00b70ddd6e10bd7011d 13-Oct-2011 Todor Kalaydjiev <todor@google.com> am 5ed5ba05: Merge "Fix sending non-JPEG image attachments in MMS" into ics-mr0

* commit '5ed5ba05e9ba496839fa53c9e2758057f2029654':
Fix sending non-JPEG image attachments in MMS
5ed5ba05e9ba496839fa53c9e2758057f2029654 13-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Fix sending non-JPEG image attachments in MMS" into ics-mr0
c65b4f31e702aef42c071527565de74c49cf8574 13-Oct-2011 Tom Taylor <tomtaylor@google.com> am 67679623: Draft slideshow getting deleted while playing

* commit '6767962317b959aa656c61741b1c1de4f9530f99':
Draft slideshow getting deleted while playing
a5088f68bdfe0d263e14d312d9e84ec316cee6de 13-Oct-2011 Jeff Brown <jeffbrown@google.com> Merge "Remove references to ArrayListCursor which is deprecated."
bbc5b8d0076b0cdae851bfec636a854ef77bd6ce 13-Oct-2011 Todor Kalaydjiev <todor@google.com> Fix sending non-JPEG image attachments in MMS

b/5407752

Change-Id: If3b9581e825ec9e6d684787cef213b898a8de7c7
ms/model/ImageModel.java
ms/ui/UriImage.java
6767962317b959aa656c61741b1c1de4f9530f99 13-Oct-2011 Tom Taylor <tomtaylor@google.com> Draft slideshow getting deleted while playing

Bug 5447174. Bug 5455435
If the user watched a slideshow when the message had no recipients
and the thread contained no other messages, the parts of the slideshow
would get deleted in CMA's onStop.

Change-Id: I89300afec076043306b315f82939cbdb2ed6279a
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
b2f0c15fb928fa96a6a74a2495437117c90667b2 13-Oct-2011 Tom Taylor <tomtaylor@google.com> am d73504a9: Merge "Sound name on slides not getting updated" into ics-mr0

* commit 'd73504a9682033088ce0348ec2bae55ef2e67519':
Sound name on slides not getting updated
5a9381876ce766cc761c3e6ed2ea9a67e19bd716 13-Oct-2011 Tom Taylor <tomtaylor@google.com> Sound name on slides not getting updated

Bug 5446866
The name of the sound on a slide wasn't getting updated on any slide
past the first. Also, change a bunch of LogTag.debug calls back into
Log.d calls. The LogTag.debug calls were crashing when a recipient name
contained formatting characters such as & or ().

Change-Id: Icfe3703d0d84ffb4f10090a59a9fcd994bf62b52
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/SlideView.java
c6932610f10140be0781946c868624ef13cdccad 13-Oct-2011 Jeff Brown <jeffbrown@google.com> Remove references to ArrayListCursor which is deprecated.

Change-Id: Ifbc42f58a416ca256c0e2ec4b4f35bae51f478cf
ms/ui/RecipientsAdapter.java
6c780227b15fd3374d2359cc39a1802d34be8348 12-Oct-2011 Todor Kalaydjiev <todor@google.com> Keep a cached playback state for controlling the SmilPlayer. DO NOT MERGE

This avoids problems with the asychronous execution of actions by
SmilPlayer.

Fixes b/5418836.

Change-Id: Ic53ac664c4a42f247c16f4049d31698b86cedf56
ms/ui/SlideshowActivity.java
677fd73e1dad8f9ea3873e173e40e983d93b7e78 12-Oct-2011 Todor Kalaydjiev <todor@google.com> Revert "Explicitly update MediaController UI state when playing slideshow. DO NOT MERGE"

This reverts commit 1fe33c37639ae006b2a81c8da127ad8d83bc0f02

Fix was for b/5418836.
Reverting because it introduced a crashing bug.

Change-Id: I0f28fdb0b37746b9f5eec58649fe9a2f71df8090
ms/dom/smil/SmilPlayer.java
ms/ui/SlideshowActivity.java
307aea97f34a1d872470d9a584464a037cb039b2 12-Oct-2011 Tom Taylor <tomtaylor@google.com> Messaging App does not discard draft after deleting it

Bug 5376774
Discarding the working message would delete the mms draft, but not the
sms draft. Delete both now in a more consistent fashion.

Change-Id: Ie9e2786d429e3c934aebe61db272f91a6675af71
ms/data/WorkingMessage.java
1fe33c37639ae006b2a81c8da127ad8d83bc0f02 11-Oct-2011 Todor Kalaydjiev <todor@google.com> Explicitly update MediaController UI state when playing slideshow. DO NOT MERGE

Fixes b/5418836.

(cherry-picking this change from master)

Change-Id: Ia3993431fdafc0cc3c8077fc9282d077ec587e7b
ms/dom/smil/SmilPlayer.java
ms/ui/SlideshowActivity.java
8b963281e347cc5d1de9ea6a968e20abfe26389b 11-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Explicitly update MediaController UI state when playing slideshow."
f772e248e4f85d9e360dc9ec6c98a150138f5dd2 11-Oct-2011 Todor Kalaydjiev <todor@google.com> Explicitly update MediaController UI state when playing slideshow.

Fixes b/5418836.

Change-Id: Ia3993431fdafc0cc3c8077fc9282d077ec587e7b
ms/dom/smil/SmilPlayer.java
ms/ui/SlideshowActivity.java
be65237538ad1ad0c949d50c005be7d4423730cf 11-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5437891 BACK/UP behaviors when accessing a thread view from outside Messaging"
ff323fd895e6a3734464cfd2a640a85e20d612ac 10-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5437891 BACK/UP behaviors when accessing a thread view from outside Messaging

Change-Id: I2819400ab24d0339603bc9c9689918d70e4f3496
ms/ui/ComposeMessageActivity.java
0cded4278f08828220d9c5c58351c7d00c29cd43 10-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "[MMS Test Plan] DUT allows user to enter only 40 characters into subject area"
34396f17239fc1893e8e3c8e157e10c362df9e53 10-Oct-2011 Tom Taylor <tomtaylor@google.com> [MMS Test Plan] DUT allows user to enter only 40 characters into subject area

Bug 5421258
Add "maxSubjectLength" to mms_config.xml options to allow a manufacturer
to specifiy a different max length for the subject field other than the
default of 40 characters.

Change-Id: I5622e7bd7066c28b8eaea81c93718b0aff07aca7
ms/MmsConfig.java
ms/ui/ComposeMessageActivity.java
05c7aa98807b4555ac1c522267865f8200f041d1 10-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5425257 Search results are not displaying in landscape mode"
fa9be169b5a572e0e143e582079259ee074d9d5a 10-Oct-2011 Tom Taylor <tomtaylor@google.com> Crash while sending multiple picture attachments

Bug 5434302
The bitmap used during the picture resize/compression loop was getting
recycled in the middle of the loop. Recycle the bitmap as we exit.

Change-Id: I8e8a60d820e9a8c2ca7414346736a8a064fe57d3
ms/ui/UriImage.java
e131a53620fff000a08cf53d29313a3922328dc0 07-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5425257 Search results are not displaying in landscape mode

Use the standard search widget.

Change-Id: I34d71a7067ea8e70be44498a8a0eb0cdc61e1d61
ms/ui/ConversationList.java
2b04a715ca8aba549ead0bc2b45f650386962c15 28-Sep-2011 Jake Hamby <jhamby@google.com> Update Mms app to pass SMS message format to SmsMessage.createPdu().

In order to correctly decode incoming SMS PDUs on devices that support
both 3GPP and 3GPP2 formatted messages, pass the new "format" extra
from the SMS_RECEIVED_ACTION broadcast intent to the new createFromPdu()
method in SmsMessage that takes an extra format parameter.

Change-Id: If77c31cf4a6d837d2647ea65d7ff76588c3a1624
ms/transaction/MessageStatusReceiver.java
ms/ui/ClassZeroActivity.java
40421e0b0316a4bf77e3e5f9a8b734ba6478f1c7 07-Oct-2011 Tom Taylor <tomtaylor@google.com> Slide duration not reset when all time-based objects removed

Bug 5426125
If we remove all the objects that have duration, reset the slide back to its
default duration. If we don't do this, if the user replaces a 10 sec video with
a 3 sec audio, the duration will remain at 10 sec.

Change-Id: I4283514643c344a76d9fa9e973665f16fec2ce8a
ms/data/WorkingMessage.java
ms/model/SlideModel.java
f0752096c054ba3913d78df35d0037213478a9da 07-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "[MMS Test Plan] DUT cannot update the recipient field with newly saved name for previously entered number"
9ce7e5ac5a6166eb510a63d6a11df82fca476948 07-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Don't send OUTBOX messages on reboot; instead, show a failure notification."
d66803237e7bfa64fe0ce6f6b7b5d0920b905b30 07-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Selection drawing problem"
75d218c77bd806346b8328e26b06c68a0b6dedd1 07-Oct-2011 Tom Taylor <tomtaylor@google.com> Selection drawing problem

Bug 5401556
The code that was drawing the background lines around the message list
items was also drawing a background and that was hiding the selection
highlighting. We don't need to draw the background in that code.

Change-Id: I0d4c1438bab1f63921587b910031bdee13cdb7b1
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
37c369c61e24cec647d0c611d79f801034112455 07-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Increase touch area for resending a failed message to be the entire message list item. b/5383625."
7015fa3f96383fa8a34d6b9e28f61d228e234d7e 06-Oct-2011 Todor Kalaydjiev <todor@google.com> Don't send OUTBOX messages on reboot; instead, show a failure notification.

b/5172594
P.S. There will likely be a follow-up change to implement the same behavior
upon other triggers, not just reboot.

Change-Id: I0ed0f2fba2c097efd91f2d726f85b4f9559e2723
ms/transaction/MessagingNotification.java
ms/transaction/SmsReceiverService.java
8b32035e0f23916e4e94ce7b5f7a96cc31e7e875 07-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Text "play, replace, remove" buttons are cut"
44e86cc021e0656602ecdb6afa38051cfebea68d 07-Oct-2011 Todor Kalaydjiev <todor@google.com> Increase touch area for resending a failed message to be the entire
message list item. b/5383625.

Change-Id: I9333719503f133dbc8f60145360f2cb87bd1b880
ms/ui/MessageListItem.java
30cfef2c23ab0c9f28ecdfc5da49cadd415521a4 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "If replacing an attachment fails, working message left in bad state"
5ef6193d3fdce0237e95a2f298c4981fb4aeb5d8 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Don't wrap message limits"
332967fe883b88229780670bbc0beee0af46d3e6 06-Oct-2011 Tom Taylor <tomtaylor@google.com> If replacing an attachment fails, working message left in bad state

Bug 5420558
The code needs to clear the attachment type after removing all of
the attachment data. Also need to update the screen whether the
attachment succeeds or fails.

Change-Id: I963ebd462d8e9757b8d5bebc59a9f391e15c7940
ms/data/WorkingMessage.java
24f3447b5fc91b26864859caa33502b937768fdf 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Contact information cannot be added as new contact"
891b86b877f99698292c2887cff8b2c37e782c2d 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Don't wrap message limits

Bug 5417098
The default setting of the number picker is to wrap so if you enter
a number smaller than the min value, it will wrap to the largest value.
With this change, entering a number smaller than the minimum will set
the value to the minimum.

Change-Id: I459f3ca4be9c3f0699ea97247b7534d81a96f26d
ms/ui/NumberPickerDialog.java
ca6f907a83cc29602cea7c134a65d02abe70290e 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Contact information cannot be added as new contact

Bug 5386496
Restore "add contact" functionality that was removed in bug 5054233.


Change-Id: I7c177fb7ba974b4473f3f0f400bb67f09628aa09
ms/ui/ComposeMessageActivity.java
682540801e82eacf59fe809ad6ecfbab44f702e2 06-Oct-2011 Tom Taylor <tomtaylor@google.com> [MMS Test Plan] DUT cannot update the recipient field with newly saved name for previously entered number

Bug 5421255
When backing out of contacts after saving the new contact, we're getting
an activity result of canceled. Always update the contact when adding
a new contact.

Change-Id: I44eeb44d5f1d78647e342627c07690ce739305c6
ms/ui/ComposeMessageActivity.java
0355ec10ce30ca48342827dbc60aa44b272b9845 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Text "play, replace, remove" buttons are cut

Bug 5414253. Bug 5254285
When device text set to extra-large, attachment buttons text getting
clipped. Remove the custom compressed buttons we were using in
landscape mode. We've got the screen real estate now for normal buttons.

Change-Id: I7c66cb730fa57e81b011180d3c63ca49cc7da30d
ms/ui/AttachmentEditor.java
3a453f0ee6d19940faf307163f827ce03d0ec933 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Don't save draft with no recipients

Bug 5421126.
If you create a new message and type something or attach something,
but don't add a recipient and then select the notification of a new
message, we'd save the draft of the message. The draft would be saved
with no recipients. It looks bad in ConversationList. Normally when
the user backs out of CMA in this state, they're prompted with a
warning that the draft will be discarded. In this bug, however, CMA
doesn't get the opportunity to wait while the user confirms the
tossing of the draft. The solution with this change is to not
save a draft with no recipients. Tested a previous bug in this area
5127453 to verify no regression of that bug.

Change-Id: I6be813e241921af49beb497092be8f2cacb23abb
ms/ui/ComposeMessageActivity.java
47b250d5f7d25ecb1f0808f67b1933ec4fa7e16d 06-Oct-2011 Tom Taylor <tomtaylor@google.com> Merge "Delete wrong thread during multi-select"
21258595d6e3cb6fa7aade7a21eb3b2e48cf7d73 05-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Don't crash when SlideEditorActivity is started with an empty slideshow"
b04236e2977ac69e63cc0fa123399a584b606945 05-Oct-2011 Tom Taylor <tomtaylor@google.com> Delete wrong thread during multi-select

Bug 5399568.
If a new message comes in and creates a new thread while the user is
in multi-select mode, tapping delete will delete the wrong thread.
Keep track of threadIds rather than what the list thinks is selected.

Change-Id: Iafa066de9b40977bfa6b97bf320b074121ef994d
ms/data/Conversation.java
ms/ui/ConversationList.java
ms/ui/MessageUtils.java
2fddde28ed2ccb3c156d596160e3a504c83ce444 05-Oct-2011 Tom Taylor <tomtaylor@google.com> Video captured from Messaging app is left in Gallery

Bug 1659270. Bug 5410499.
Instead of capturing a video and leaving the temp video in the gallery,
pass the camera a uri to store the video data. Also fix a bug where
captured pictures weren't getting their temp files renamed to a name
that included their slide number.

Change-Id: I83c0edc506d384f789a7a9ca98bf3ad5f50b361f
ms/MmsApp.java
ms/TempFileProvider.java
ms/model/VideoModel.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
c6448572ff5c0be247cdb75467e54756f18c3051 05-Oct-2011 Tom Taylor <tomtaylor@google.com> NPE in DraftCache

Bug 5416424. Bug 5416250.
The cursor wasn't checked for null, but still closed in "finally".
This code is old, but now exposed because we rebuild the draft
cache when deleting all threads. I tried to repro the bug and stepped
through the debugger and we're simply getting back an empty (but
valid) cursor. Fixed the code to handle null cursor.

Change-Id: Iaac6dd8791cd12ad33e33fb9c03bee088d36198f
ms/util/DraftCache.java
e028faa922b4bf0eaf3834cb450677fcd3549cb5 05-Oct-2011 Todor Kalaydjiev <todor@google.com> Don't crash when SlideEditorActivity is started with an empty slideshow

b/5235929 from monkey tests. I don't have human repro steps.

Change-Id: I05088e7697ff1f2920ff3789140170eb92a07f7d
ms/ui/SlideEditorActivity.java
62723bac2451cee231087bd10aa5ad4682b84760 04-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "On resizing image, retry with smaller sampling if decoding fails due to an out-of-memory error."
946c8e09668d50bd1657a253a0220b807a4d1f28 04-Oct-2011 Todor Kalaydjiev <todor@google.com> On resizing image, retry with smaller sampling if decoding fails due
to an out-of-memory error.

Change-Id: Ibf3fefd002a0cf805abd86edd07e4a6db2f22073
ms/ui/UriImage.java
1009d4bf5ee9fd1f2523e530828de5babb78eb19 04-Oct-2011 Todor Kalaydjiev <todor@google.com> Don't resize images for MMS unless it's necessary.

This saves the decode/compress/save-to-file steps.

Change-Id: I702f71ce9f613118ec7ae1e69418d8df2fd10f35
ms/model/ImageModel.java
ms/ui/MessageUtils.java
ms/ui/UriImage.java
3356a1506f63daf7b7388d9f541045587036177a 03-Oct-2011 Tom Taylor <tomtaylor@google.com> Turn long sms messages into mms messages

Bug 5388287.
Add more comments to the code to make the use of the configurable
parameters more clear.

Change-Id: I8000cc9c8e7961b9eb8575c0b890359f2fc16caf
ms/MmsConfig.java
bbe2c67d8a13fe7cbc0aa50eae93e02ba41d34ba 03-Oct-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5342861 The search result highlighted result is not seen on the screen for MMS"
50418816cc108dd7ad48fcd75d51672a7827f090 01-Oct-2011 James Dong <jdong@google.com> Merge "Reset state variables when audio source is reset"
dbf631fb6a6e2ae9dbdc0b3e70c7dcd4659d5091 01-Oct-2011 James Dong <jdong@google.com> Reset state variables when audio source is reset

Change-Id: Ia7e7dd93a029014a7d4d6c75b57f1545850cf407
related-to-bug: 5393096
ms/ui/SlideView.java
ccc7cd9bf95ad0585cabc31ad98c2bcbe0d6b065 01-Oct-2011 Todor Kalaydjiev <todor@google.com> Merge "Fix memory leaks in SMS/MMS list items: b/5393957"
c6ec8c45d3c414aca13a0298ccc5bfa6ee871aa1 01-Oct-2011 Mark Wagner <mxw@google.com> bugfix 5342861 The search result highlighted result is not seen on the screen for MMS

Part 1 of 2 part change to fix this bug. This changes the suggestions provider
to show word matches rather than whole result matches. Clicking on a suggestion
then takes you to the normal search result page which lists specific messages.
Clicking on that takes you to the chat with the appropriate highlighting and
positioning.

Change-Id: Ic3f4a2c5609c165f30024d5697f4e52571abb565
ms/SuggestionsProvider.java
9a0457146d9caa476ca8c44c950dce741ede8143 01-Oct-2011 Todor Kalaydjiev <todor@google.com> Fix memory leaks in SMS/MMS list items: b/5393957

The main leak was from the fact that recycled and released views
were still being kept in mAddressToMessageListItems, and each view
could store references to a message item with attachments. It turns
out that that map is actually never used because no one calls
notifyImageLoaded. So I'm removing the map and the method.

Change-Id: Ie1fd787c9dee6b6d803d1e778a615665b2299bfd
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
446d8ebde11adccc0a0709cbc07f48fb76f829d5 01-Oct-2011 Tom Taylor <tomtaylor@google.com> No avatars on MESSAGE_TYPE_NOTIFICATION_IND messages

Bug 5374235

Change-Id: Id1d202da028a6ac17da1a70e405d7b6036ee1934
ms/ui/MessageListItem.java
209ac103a11f5fb7aa3ebd266cf4ec74af42aa97 30-Sep-2011 Tom Taylor <tomtaylor@google.com> Messaging App does not discard draft after deleting it

Bug 5376774.
It was tempting to remove this block of code since the provider is no longer
automatically deleting empty threads. However, the comment is correct.
When the conversation has no messages, the user can still add recipients
and that would change the threadId. The solution is to delete the draft here.
We'll create a new one in onStop if necessary.

Change-Id: I3f79cb6c07ca67ba7280e2f78be9793581b87f84
ms/data/WorkingMessage.java
8b4d5f1c72f25160c16f2c41ebb6febe5fb8873f 30-Sep-2011 David Mailhot <djmailhot@google.com> Merge "MMS Service and uaProfUrl config attribute late binding check"
68e246906f9c02a52edf383440c379201b626306 30-Sep-2011 David Mailhot <djmailhot@google.com> MMS Service and uaProfUrl config attribute late binding check

bug: 5373677
When the uaProfUrl config attribute is missing from mms_config.xml,
we want to allow SMS but crash MMS. Therefore, MMS should crash as
late as possible. We will warn with log messages if the uaProfUrl
is missing, and only crash with a runtime exception if the user
tries to send an MMS with an absent uaProfUrl.
Change-Id: I960e752538e3c3ee7d474327b89522c745a8a0c0
ms/MmsConfig.java
ms/data/WorkingMessage.java
05d9ded093b1a13fd36a645fb43caea03ad7c511 30-Sep-2011 Tom Taylor <tomtaylor@google.com> Merge "My photo isn't displayed next to messages that I sent"
4f1871e8e85598c94d5f09d508c690c41fdcce16 30-Sep-2011 Tom Taylor <tomtaylor@google.com> My photo isn't displayed next to messages that I sent

Bug 5361233. Bug 5226635. Bug 5383721.
Add the concept of a "Me" contact to our contacts. It has the correct
uri of the profile so fastrack works. Also, it will load the profile
regardless of the state of the user's phone number. Tapping on your
own quick contact badge will show the profile.

Change-Id: Ib6ea288c9596a001f167a151aaeec6fe2c7c8e2c
ms/data/Contact.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
9aeb4e9e6aebe9d99cf817cedbdeb0bb0ae5a024 29-Sep-2011 Mark Wagner <mxw@google.com> bugfix 5381702 MMS app puts temporary files on sdcard in wrong location

Part B of a two part checkin to fix this to use the system provided location
for temp/cache files.

Change-Id: I03764c25d5d1f8bbdc1b30ef5168128922bf0792
ms/MmsApp.java
ms/TempFileProvider.java
ms/ui/ComposeMessageActivity.java
ms/ui/SlideEditorActivity.java
ms/ui/UriImage.java
edf2ce120afd84ee25fc4b0dd7c26d9d7efcb839 29-Sep-2011 Tom Taylor <tomtaylor@google.com> Subject field disappearing

Bug 5374452

Change-Id: I2fb9dbdefd0219e0a2f36f27118ce4d71450bbe6
ms/ui/ComposeMessageActivity.java
7268272e8d1099b00172d379628a33ca341025c9 29-Sep-2011 Tom Taylor <tomtaylor@google.com> verifySingleAddress is too early in sending an mms

Verify after the threadId has been created. Bug 5388908

Change-Id: I3a69a2bb9d475b9add43fc5fc508536c05fa51c0
ms/data/WorkingMessage.java
9ab32be08949d7d434d23511e71a226e1cbcb3ed 29-Sep-2011 Tom Taylor <tomtaylor@google.com> Allow messages with just a subject to be sent

Bug 5374045

Change-Id: I11d21adeae0d9ce1b5e196aa03cd6bd0a23d8f12
ms/ui/ComposeMessageActivity.java
8c86a52a2c13083a25761256ab0dfc416260c162 29-Sep-2011 Tom Taylor <tomtaylor@google.com> Handset resizes image to a small size

Handle portrait images better. Don't resize so aggressively. Resize
by 75% at a time, rather than by half. Bug 5249464

Change-Id: Icc4bc30a56f15de635ba0386c454c49924470eb1
ms/ui/MessageUtils.java
ms/ui/UriImage.java
b736686638eca62aa89cb15184711ef38413cb3e 28-Sep-2011 Tom Taylor <tomtaylor@google.com> SMS messages being delivered to wrong contact

Bug 5319828
Last ditch escape hatch at detecting an sms being sent to a wrong
contact. From what we've seen of a database where sending to the wrong
contact had taken place, the in-memory Conversation cache had the
correct threadId, but the wrong recipient. With this change, we do
two checks to verify that the recipients for a particular thread match
the recipients associated with the thread in the database.

Change-Id: I8f7c194243e6da093461c1aaae4119f05390582d
ms/LogTag.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/transaction/SmsSingleRecipientSender.java
2ddc2c0585fec6fca59acc115e26dc51f69aacc5 28-Sep-2011 Tom Taylor <tomtaylor@google.com> Weird phone number stored in canonical_address table

Bug 5375782.
Very tricky bug. In the recipient editor, we always leave a trailing
comma to make it easy for users to add additional recipients. When a
user types (or chooses from the dropdown) a new contact Mms has never
seen before, the contact gets the correct trailing comma. But when the
contact gets added to the mms's contacts table, contacts sends out an
onUpdate to CMA. CMA would recompute the recipients and since the
recipient editor was still visible, call mRecipientsEditor.populate(recipients).
This would replace the recipient that had a comma with a recipient
without a comma. When a user manually added a new comma to add another
recipient, this would eliminate the span inside the text. The span contains the
number part of "Fred Flinstone <123-1231>". Hence, the whole
"Fred Flinstone <123-1231>" would be considered the number of
the first recipient and get entered into the canonical_addresses table.
The fix is very easy. All recipients have commas. There's also a change
to rebuild the contacts cache when we delete a thread. We do that because
the provider is now deleting stale contacts when threads are deleted.

Change-Id: I8fdde2ba64e934c9b539fa0fae433ef23fd254bc
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/RecipientsEditor.java
a713f75b8d9f7158d7d89e5f7f7f024db3a0ab13 27-Sep-2011 Tom Taylor <tomtaylor@google.com> MMS audio doesn't stop

Bug 5373840
We need to pause the player in onPause.

Change-Id: I221e95fe19a98bd5717aa622b107639041f8e075
ms/ui/SlideshowActivity.java
6a54eeb5e65fc7bd0b5ed93d512ed27d7cdfdf3b 27-Sep-2011 Tom Taylor <tomtaylor@google.com> Merge "java.lang.IllegalStateException: save() called after discard()"
3877692b0f782ca321ce3a857b4168f771cf2ab6 27-Sep-2011 Tom Taylor <tomtaylor@google.com> java.lang.IllegalStateException: save() called after discard()

Bug 5372845
How can the monkey find this? Well, it can click on the menu "Delete thread"
and then click on anything else that'll cause saveMms to be called before
the onDeleteComplete callback gets executed. We've had this intentionally
thrown exception in the code for years and we're confident that we're
not trying to save deleted messages. With this change, we now do what we
do in saveDraft and that is bail out when the working message has been
discarded.

Change-Id: I262b7c153add3ebbed1044f4c51fe6899b963cd8
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
a97817067e4d3c46c71c5c14a6f42f7f8ab670c4 27-Sep-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5100213 Messaging App scrolls to bottom when receiving new SMS"
6148dea29ff0b39b6247323425299ba83f14d20d 27-Sep-2011 Mark Wagner <mxw@google.com> bugfix 5100213 Messaging App scrolls to bottom when receiving new SMS

Change-Id: I72563205c77f913c42ad4a8a4812d4fc41cee336
ms/ui/MessageListAdapter.java
68be4f572123274aa67e13544482ca4d99e7b235 26-Sep-2011 Tom Taylor <tomtaylor@google.com> Always log an error

When sending an sms and the smsmanager reports an error, log the
error. Bug 5368219

Change-Id: I55fa1389c996b3eaf68a606583542b172752a709
ms/transaction/SmsReceiverService.java
257690a737bec08d4dc445c92075e0ff84a66bc7 24-Sep-2011 Tom Taylor <tomtaylor@google.com> Not able to fast forward the playback forward the playback for Audio files attached in MMS

While playing back an audio, tapping on the screen brings up a control
that looks like it should control the audio. Unfortunately, that control
is the control for the slideshow -- jumping to the next slide, pausing,
etc. When there's only a single slide, such as a sound attachment, we
now hide the slideshow controller to avoid the confusion. Bug 5360885

Change-Id: I69d6c2c65105b2b9fd6b25868359da74764f9e45
ms/ui/SlideshowActivity.java
867b50f32a3035ac38178eebd827f0c8012781c2 24-Sep-2011 Tom Taylor <tomtaylor@google.com> Slide editor is missing "Capture video" option

Bug 5366755

Change-Id: I4817b8f76178deb0c8215e68a1345c081de15061
ms/ui/SlideEditorActivity.java
2ec2bbe0535821d79161dc3bcbf4438f5ef1c56e 23-Sep-2011 Tom Taylor <tomtaylor@google.com> Duration of the recorded audio played in the Mms application is always set to a audio captured in an earlier session

Great bug -- had to dive deep into the SMIL to figure out what was going
on. Fortunately, the fix is super simple. When replacing an attachment,
the code needs to reset the slide's duration to zero. Bug 5361657

Change-Id: I04eb7d4ab89c99ddf332bd2e81c5062df671485e
ms/data/WorkingMessage.java
a7705b4ff996a9faa3b9f452262532c516f66c71 23-Sep-2011 Mark Wagner <mxw@google.com> Merge "bugfix 5361613 "Up" from a mms/sms reached from search results should return to search results"
1d44c746de1c0fbe8907cda781463874aa4986a0 23-Sep-2011 Mark Wagner <mxw@google.com> bugfix 5361613 "Up" from a mms/sms reached from search results should return to search results

Change-Id: I8db5cadafd581330a78f7ad83955edcc01ea9142
ms/ui/ComposeMessageActivity.java
6ac26ca62ba1e4252bf93672abd370966d3fb7c3 23-Sep-2011 Tom Taylor <tomtaylor@google.com> All SMS messages from non-contacts are grouped even if the numbers are different

Non-email and non-phone number addresses (such as T-Mobile) would end up
creating a contact with no name and number. Subsequently, all messages
from addresses like that would get appended to a single thread.
Bug 5331430

Change-Id: I54719f681446b7340b2b9c000b1e4e382046fa0c
ms/data/Contact.java
ms/transaction/SmsReceiverService.java
8d54acc063c03b42c9b10dbd013a1552ebbe2d9f 23-Sep-2011 Tom Taylor <tomtaylor@google.com> My photo isn't displayed next to messages that I sent

Use the new profile uri to get the photo of "me". Bug 5226635

Change-Id: Ie133a2fd1c778d16c4cd693bbd92b48b9882da36
ms/data/Contact.java
5fd2543851375fc764495584ddd319f5e7d13cb9 22-Sep-2011 Tom Taylor <tomtaylor@google.com> A cleaner fix for draft saving

Eliminate the window of vulernability where a thread can get deleted
while saving a draft.

Change-Id: Idb5bf9860f39c59d9391176fd2f6c081086d0d76
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/util/DraftCache.java
ef3eb49cde359d36f9536dbaffe5c16f3639c1f2 22-Sep-2011 Tom Taylor <tomtaylor@google.com> Fix a number of draft-related bugs

This CL contains a number of draft-related fixes. One is timing related.
While we're building the PDU for a draft, particularly a big PDU that
involves image resizing, the thread gets created first, before the PDU.
Meanwhile, ConversationList can finish its first query and delete any
empty threads. We guard against that several ways, but even still I
see cases where the thread gets deleted while the PDU is saving. When
that happens, pdu persister creates a new thread. Our working message's
conversation would still point to the old thread id. With this change,
we get the possibly new conversation after updating the pdu. Note that
all of these cases occur when this is a draft or the first message
in a thread. Also, there's a better fix for the zombie draft bug. We were
initiating deleting drafts when we cleared the conversation between message
sends. This sometimes caused us to delete the draft we were in the process
of sending. Now draft deletion only occurs at the end of sending. There's
still a small timing window where the draft can get deleted. That'll be
fixed in an upcoming CL.
Bug 5340360. Bug 5343360. Bug 5299114. Bug 5353623. Bug 5354900

Change-Id: I0f661959aed38d59daf5fa27b1f006953e15b80a
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
04db56904da453ac04f9f9d05fe1c2ce7a3d952f 21-Sep-2011 Tom Taylor <tomtaylor@google.com> Received SMS from "Jan 1, 2000"

If the system clock is reporting a weird time, use the timestamp
of the received message as the received time. Bug 5315874

Change-Id: I98e215078065169d94dcd8dab88109e00c3600b1
ms/transaction/SmsReceiverService.java
6123aca7090daa1c22a2172d8737e7e7e2d873d1 20-Sep-2011 Peter Ng <petergng@google.com> Merge "Pressed states updated and hairline added to compose box and rearrangement of textcounter"
166dba309da89b5b94e32415ef9529fb2cd7cfed 20-Sep-2011 Peter Ng <petergng@google.com> Pressed states updated and hairline added to compose box and rearrangement of textcounter

Bug: 5056106
Change-Id: I85619bd368e97c1c7c8ae4c07e6b7a7faa4952bf
ms/ui/ConversationListItem.java
ad5cd4c952745600c8b5a0ca06455f5bae0dacdd 20-Sep-2011 Tom Taylor <tomtaylor@google.com> Viewing MMS thread goes into crazy "updateContact" loop

Trying to get the contact info for self (contact id 0) resulted in
an odd contact update loop when the contact info was empty. Detect
the empty case and don't notify the UI of the change in order to
break the loop. Bug 5075183

Change-Id: Ibda3335500ad7fb811ebd3ab4f0182640314d5e0
ms/data/Contact.java
101f5420c636294446cbe9c92fc598d8f5a4c937 20-Sep-2011 Tom Taylor <tomtaylor@google.com> am 9935944b: Need to turn off warning dialog in Factory ROM build

* commit '9935944b16d3651f5e95a67a1884f0a14acf1d6c':
Need to turn off warning dialog in Factory ROM build
9935944b16d3651f5e95a67a1884f0a14acf1d6c 20-Sep-2011 Tom Taylor <tomtaylor@google.com> Need to turn off warning dialog in Factory ROM build

Bug 5343269

Change-Id: I0e71d73a950837821908fa3dbdd324ea4dfbe83e
ms/LogTag.java
2c935b601f693396cb1cccdb96cfc4599daa9be0 20-Sep-2011 Tom Taylor <tomtaylor@google.com> Draft message thread is not seen in thread view

The empty thread was getting deleted before the draft could be saved.
Bug 5333371

Change-Id: I49c694e5650bb137c046aa330e1b182974f5ea6e
ms/ui/ConversationList.java
75c138df5db38cdd9fd88e8030038fe8ece142c0 20-Sep-2011 Tom Taylor <tomtaylor@google.com> Send button highlighting looks wrong

Use two different buttons; one for sms and one for mms.
Bug 5056106

Change-Id: I29ce96aa8573a65c458e986e795f7b52db43a18d
ms/ui/ComposeMessageActivity.java
77d01940e831865a05921cca0c6645904b55f891 19-Sep-2011 Tom Taylor <tomtaylor@google.com> Hide action bar while in search mode

Bug 5239304w

Change-Id: I69a36137927582827188b0a99643ca422fe4bd01
ms/ui/ConversationList.java
a275278b66b40e719573293587062e16ad00b090 19-Sep-2011 Tom Taylor <tomtaylor@google.com> Add titles to actionbar items

Bug 4979142. Bug 4979040

Change-Id: I256d8fffc5e825a78d523c65bf20614d79cfb3ef
ms/ui/ComposeMessageActivity.java
8826110c4a48ef53ffa9175b485fc1540b31777f 18-Sep-2011 Tom Taylor <tomtaylor@google.com> Don't allow non-local videos to be attached

Bug 5319344

Change-Id: I01c9b84f79849804f35a8b3ed6fff924175a16eb
ms/model/VideoModel.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
c1342c003f027f564b44b4f4f93d6a6e780aa1c7 18-Sep-2011 Tom Taylor <tomtaylor@google.com> SMS messages being delivered to wrong contact

When we observe the conversation cache is out-of-date, update
the conversation in the cache. Also, fix a bug removing an attachment.
The old pdu wasn't getting deleted. Bug 5319828

Change-Id: I46dbc698a76d4f8bc8fe2a93a967df410a4f557a
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
df041b7b2d335c21947c7264b304b4b8d5a17080 17-Sep-2011 Tom Taylor <tomtaylor@google.com> First sent message doesn't show up

When we're clearing the conversation between message sends, don't
reset the threadId to zero if there are no messages -- that's the state
we're in when we send the first message. Bug 5334855

Change-Id: Iafd3f77cbad55a5cd4a45074339c4e41c3d742e4
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
097848db6d22419f83e8ecd40d528fcc4f5fc1e0 17-Sep-2011 Tom Taylor <tomtaylor@google.com> Merge "Don't allow non-local videos to be attached"
02277c6b787e8e29ee22b1df745eb8549d3ff023 17-Sep-2011 Tom Taylor <tomtaylor@google.com> Don't allow non-local videos to be attached

Bug 5319344

Change-Id: If440de4a67860a656e37fa62a2a8b6899adae77d
ms/model/VideoModel.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
ebb3227c391ec7fd4686aadd3cb18d5f427fc17b 17-Sep-2011 Tom Taylor <tomtaylor@google.com> Add text to indicate when conversation list is empty

Might have to wait to check this in until it's ok to add strings.
Bug 5313899

Change-Id: If7c96f8d1f69ca9e195ae83dadb4220c62a02452
ms/ui/ConversationList.java
5e01ff805c814582f7d48bf388038d7b5a00bbd4 15-Sep-2011 Tom Taylor <tomtaylor@google.com> Handset shall display SUBJECT text field after rotating handset

Bug 5313491

Change-Id: I686069eb61e2e1ba9a84d5796a22b042a6347064
ms/ui/ComposeMessageActivity.java
dd374f47c61f4fed8e6702c1f9d3f33ac5b77d02 15-Sep-2011 Tom Taylor <tomtaylor@google.com> maguro:mms: Patch for getting MMS from chuncked packets.

- Description
Orange FR sends MMS as chunked packets.
Chunked packets mean that each packet didn't have its own size field within message header.
But android allocates buffer for message body by size that is within message header.
So, in case of Orange FR, MMS apk cannot get correct message body even though MMS is retreived on device because MMS apk doesn't know the real size of message.

- Solution
MMS retrieved is kept on http stack as dummy packet.
MMS is checked if it is chunked or not before reading body size.
If it is chunked, temporary buffer for message body is allocated as maxium size.
And then, read the packet and fill that buffer until packet size is -1. (-1 means end of packet)
Finaly, copy temporary buffer to MMS body as loaded size.

Manually merge this change from yongsuk.kwon@samsung.com from
the partner repo to master. Bug 5257517

Change-Id: Ic48259729cc7090b8afdc113ec3c6b47edff0ed9
ms/transaction/HttpUtils.java
b0664c5822ee07642617a73c932b02a2636a2223 15-Sep-2011 Tom Taylor <tomtaylor@google.com> Handset resizes image to a small size

Capturing pictures in a slideshow is different than capturing in
ComposeMessageActivity. We need to pass a temp file uri to the camera
to store the image, otherwise the camera will return a thumbnail size
image. Keep a temp file for each slide. Bug 5249464

Change-Id: Ic6987781fe4a318c00b89f76c1b3e8722ed855c6
ms/ui/SlideEditorActivity.java
ms/ui/UriImage.java
27b0cfdf86bb10862ff19647fb91eadb53991f7b 15-Sep-2011 Tom Taylor <tomtaylor@google.com> Handset resizes image to a small size

Capturing pictures in a slideshow is different than capturing in
ComposeMessageActivity. We need to pass a temp file uri to the camera
to store the image, otherwise the camera will return a thumbnail size
image. Keep a temp file for each slide. Bug 5249464

Change-Id: I9b1efeca404fa54d08b39e6da71fe77ea2492740
ms/ui/SlideEditorActivity.java
ms/ui/UriImage.java
dbb58454542a3f2a1da5379b889d0e3776881ae2 15-Sep-2011 Tom Taylor <tomtaylor@google.com> Zombie draft can't be killed

The Mms draft wasn't getting deleted in WorkingMessage.clearConversation.
Bug 5313637

Change-Id: Iea14cc6d16922060b9791943548fb6dd8dbff99d
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
fcca7b38fcc90a781f1507a0a135a64e3ae8f6d8 14-Sep-2011 Tom Taylor <tomtaylor@google.com> Attached picture is not saved in drafts when a received message is opened from notification bar

Our mConversation.sameRecipient() code didn't work on uri's from
notifications that contained a threadId instead of a number. Therefore,
an incoming message never matched a new draft that had a threadId of
zero, even when the recipients matched. When we decided a conversation
matched, the code didn't update itself or the working message with the
updated conversation that has a valid threadId. Bug 5250265

Change-Id: I6c97d5c53cf75d97b652b7635020c2cb30855761
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
18d29eb95b2e692974b53655d4953accb6968570 13-Sep-2011 Tom Taylor <tomtaylor@google.com> Delete dialog icon is white-on-white

Bug 5265096

Change-Id: Ib80e7e909d3573899945c3983c227aa98590963c
ms/ui/ConversationList.java
a0bda6a838d0c9bff996aa39d4f9750faa00adda 12-Sep-2011 Tom Taylor <tomtaylor@google.com> Add some debug code for double send

On reboot, one particular user reports that an old message gets resent.
Add debug logging code to print out when a message gets sent and when
the successful send confirmation comes back (where we move the message
from the outbox to the sent box). This code also gets triggered by
onBootCompleted, where the bug seems to manifest itself. Bug 5172594

Change-Id: Ic42fa877418c438a83186e249463566358a3e825
ms/LogTag.java
ms/transaction/SmsReceiverService.java
a5c3b877c5b51f8486852bbb1528e04fa9a93c7b 03-Sep-2011 Tom Taylor <tomtaylor@google.com> Not displaying an image on slide show

There's a bug in the code for managing text visibility on slides.
The view was never made invisible. Also, when a SMIL element is
specified with a start and end time of zero, always display that element.
Bug 5245647

Change-Id: I02e02ded1db7aedd6aaa536f3563aec4ebce208f
ms/dom/smil/ElementTimeImpl.java
ms/ui/SlideView.java
84e6aaee7d3721b0c36e9adc67e72248cf3cbadf 02-Sep-2011 Tom Taylor <tomtaylor@google.com> Missing “text” region value on SMIL when sending multi-slide mms

Two slide-related variables needed to be reset on each slide while
building the smil. A side-effect of the previous use would cause them
to toggle from false to true and every other iteration. Bug 5245925

Change-Id: Iaa9714a720e3990db9caa91a4aed01dc994f9c52
ms/model/SmilHelper.java
75700460faacb007748da20042f5c79a0cd234dc 02-Sep-2011 Tom Taylor <tomtaylor@google.com> Merge "Fix various Samsung-reported MMS error conditions"
836c85f29abef77ebca6185cd5f537c166074b35 02-Sep-2011 Tom Taylor <tomtaylor@google.com> NPE at com.android.mms.data.Conversation.cacheAllThreads

NPE in printing an error message in an unusual situation. Bug 5249850

Change-Id: I15fc275bcf336838018dd21b3a1a2a9e95c5e7d9
ms/data/Conversation.java
9995f7fda121bbd84a2a8a3c5edfd9d2d60870e8 02-Sep-2011 Tom Taylor <tomtaylor@google.com> App name is missing from the action bar in the conversation list

The custom actionbar was covering the title. Bug 5248658

Change-Id: Ia0569a8c70eb760ef6b0b8cdfee9af96e5f24f16
ms/ui/ConversationList.java
406292d188e17345c4d9373ce9c2e96fd1e6b017 01-Sep-2011 Tom Taylor <tomtaylor@google.com> Fix various Samsung-reported MMS error conditions

Bug 5246103. Bug 5246202

Change-Id: I541e75d0fe820a95218ead27bed22e8e91e3ad14
ms/transaction/RetryScheduler.java
ms/util/DownloadManager.java
8b24ad098ba6f02552cc9ba04959197182c796d4 01-Sep-2011 Tom Taylor <tomtaylor@google.com> "Draft" appears on every conversation

Bug 5247427

Change-Id: I9f58066b074cf9158ae69b53a6f7e67a80d59c81
ms/ui/ComposeMessageActivity.java
5289897ed1023b386dad6c4184595bb491fc6428 01-Sep-2011 Tom Taylor <tomtaylor@google.com> Merge "In Talk search set field context to "Search""
b31f9b5666f424d4fe8551696f480be0c1f51926 01-Sep-2011 Tom Taylor <tomtaylor@google.com> In Talk search set field context to "Search"

Set the IME option on the search view so we get the search icon as
the action on the keyboard, rather than the label "Go". Convert
ConversationList to load its menus from an xml file rather than
building the menus in code. Bug 5235495

Change-Id: I465711fb4959d1e54534ab594d5d04658d4082a1
ms/ui/ConversationList.java
d5153a297b77f1c1e002098d668acc490bc4bd72 01-Sep-2011 Tom Taylor <tomtaylor@google.com> Able to create a draft without a recipient

Don't save a draft with no recipients. Bug 5233173

Change-Id: I4fdde75e313a4e4029a69e34bec4df6691ea7597
ms/ui/ComposeMessageActivity.java
e10b7f693dab31808de46840e8ff0bc57a8fed44 31-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Failed to initialize the slide-list on selecting slide show attachment"
41a3cc53153bb50493688d4ae8a2a799b968c320 31-Aug-2011 Tom Taylor <tomtaylor@google.com> Add margin buffer to bottom of message list

Bug 5151145

Change-Id: Id5674ecdc06b23793c79c574977ebea6346720d2
ms/ui/ComposeMessageActivity.java
1103723f29ea5e530940cee6cb04c355d3da4e34 31-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Lots of visual tweaks to ConversationList"
10ca1d3969305df50fb07a17f5d23b0ed59f7868 31-Aug-2011 Tom Taylor <tomtaylor@google.com> Lots of visual tweaks to ConversationList

Draw vertical rules around items. Move attachments to the bottom of
the message. Use new divot from Talk. Bug 5151145

Change-Id: Ib04ff0105990baab990137cd72eabf3d4399aebf
ms/MmsConfig.java
ms/data/Conversation.java
ms/ui/Divot.java
ms/ui/ImageViewDivot.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/QuickContactDivot.java
ebbce7d444da4973769756d86a3f9b9f00277844 31-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Conversation list/roster message count should remove parentheses and be colored #66333333"
a1bc3d0cb872052b52e070ac12da809fee018658 31-Aug-2011 Tom Taylor <tomtaylor@google.com> Conversation list/roster message count should remove parentheses and be colored #66333333

Bug 5238224

Change-Id: I582c2b1e1d26ed7bc7d8fab449c7623663427be2
ms/ui/ConversationListItem.java
f89f24a7595ded1355da36d3c1229450a6157a0b 30-Aug-2011 Tom Taylor <tomtaylor@google.com> Failed to initialize the slide-list on selecting slide show attachment

The key to this bug is to add an empty subject and then add a slideshow.
Because the subject is empty and onStop on ComposeMessageActivity
is getting called when the slideshow editor is displayed, CMA is saving
the draft. Since the subject is now empty, the draft gets downgraded to
an sms and the mms draft gets deleted behind the slideshow editor's back.
The safest solution is to not be so eager to remove an empty subject.
For this edge case, an empty subject will be removed when the user hits
send and the message will be sent as an sms if possible. Bug 5181255

Change-Id: I9c08f744928211af0a336f67eb32b258f58f4622
ms/data/WorkingMessage.java
1e3af2fe548e2eed18c48048b2db54865f879966 30-Aug-2011 Peter Ng <petergng@google.com> Visual tweaks to mms and ic updates

-fixed erroneous space
-list item send now has a 1px divider now also

-Draft is now pointing to color red and using a single space unicode space
-compose box is now 48dp min height
-hr bar is now 1px not 1dp and text)harline is ccc
-paperclip, phone,
-added assets for avatar overlays
-font sizes go down to 16sp in message recv and send and compose activity

Change-Id: I28b90b5aea53335df945c3999d304a3233fa9921
ms/ui/ConversationListItem.java
e7cee115c2e0deada90627fd265139c22fdc32d4 27-Aug-2011 Tom Taylor <tomtaylor@google.com> Crash in MMS while attaching a picture from Picasa

Tested with local pictures, pictures from picasa, and captured pictures
from camera. Bug 5027908

Change-Id: Ieff7a876c8d48d800b74de893e6cac47f6bddd24
ms/ui/UriImage.java
602025862f535f493bb348dc2a6cc9a1fe150fb1 25-Aug-2011 Tom Taylor <tomtaylor@google.com> Move settings from system's config.xml to mms_config.xml

This is part of the fix for bug 5212269

Change-Id: Ic1e2af748215e19490d3f96d25f02c41bd82caa5
ms/MmsConfig.java
ms/ui/MessagingPreferenceActivity.java
2918e4c31f5bbee8fccff1a675c33af5d7e3daa9 25-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Messaging search should follow new search patterns"
136fe3767b8cb5dc0575992f2f6951c8451ee5e2 25-Aug-2011 Tom Taylor <tomtaylor@google.com> Messaging search should follow new search patterns

Show home as up on search results. Remove search menu item when
in search mode. Bug 5080823

Change-Id: I4734f87e6893c6ed942f92f0b16dbbffde64fb3b
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/SearchActivity.java
adb8015394c49958fb6374f030aa9ddafb271a4f 25-Aug-2011 Tom Taylor <tomtaylor@google.com> Fix message size

An earlier fix to keep a mms message's size up-to-date interfered
with attachments that can be resized. The fix is to keep two sizes:
one is the total size of the message including all attachments, the
other is the size of the message excluding any resizeable attachments.

Bug 5186387

Change-Id: I5af37ea16a6fe2eb59e2cba5ee05f8531e0a732e
ms/model/SlideshowModel.java
ms/ui/MessageItem.java
0cecf31167cca53eb471f6c280725afb60002201 24-Aug-2011 Tom Taylor <tomtaylor@google.com> Mms message shows incorrect size in message details

Bug 5186387

Change-Id: I11bed55c77d07dab31536941f6fda22ba400cdd7
ms/model/SlideshowModel.java
7d128943d1b6377fdbe399eb919970ab9544867e 23-Aug-2011 Tom Taylor <tomtaylor@google.com> 5198894 Remove saveInstanceState

ComposeMessageActivity has code in onSaveInstanceState to save
the working message, the recipients, and uri to the bundle.
In onCreate, this bundle was used to restore the conversation
and working message, regardless of the current intent. Since
the code is already saving and restoring the draft, let's
remove the saveInstanceState code. Bug 5198894

Change-Id: I038269020e4f02e1390b3a62a13278cfd72303ac
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
f5794fa906b4fe388ce9596174a7791e3601ff74 23-Aug-2011 Tom Taylor <tomtaylor@google.com> Add poker face emoticon

Bug 5174867

Change-Id: I99617948060a0beb97487491dc9979bfc46375bb
ms/util/SmileyParser.java
d4e997a8f0e03688143d1a50b381c6f363a204ca 22-Aug-2011 Tom Taylor <tomtaylor@google.com> Tweak debug code

Direct users to send bug reports to buganizer. Only dump 8 chars of
the message. Only dump the last 20 messages.

Change-Id: I65c9d632c50397f39050ab1e3f53eda4ac304186
ms/data/Conversation.java
3c4edf4c2b63078cb7aae9806b7ed7b2faa50d9e 22-Aug-2011 Tom Taylor <tomtaylor@google.com> Settings action bar should support "Up"

Bug 5178060

Change-Id: Ieb7237f6cfc0e4f59f41710079cdb2e7cb682e37
ms/ui/MessagingPreferenceActivity.java
75fcca92ed0db874d4fb7b7d6bfbffe90e1c96b9 19-Aug-2011 Tom Taylor <tomtaylor@google.com> Use new emoticon assets

After merging the new assets, I noticed there are three new emoticons:
heart, mad, and smirk. I added them to smiley parser. Bug 5174867

Change-Id: Ic2bbbf6df201317fd6c6ea13c55e949c32d8bab5
ms/util/SmileyParser.java
ca1f651ece39b2b415519ca49b9bb5275b6a64bf 19-Aug-2011 Tom Taylor <tomtaylor@google.com> Chat history list should look like gtalk's implementation

The message list items need to expose the ListView's background to
make each conversation item look like a bubble. Previously, the code
would programatically move the list items pieces around to make left
and right items, corresponding to incoming and outgoing messages. This
became too unweildly and now we've got separate list items for incoming
and outgoing messages. Bug 5151145

Change-Id: Ib0e6aac7de8b9bb5b05be9185a42c9d83b09fdd3
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
cb723a3a9b43a2f22e4c8ad2b8599c130783404c 18-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Unable to send MMS"
472cecc82e384f0c81d2a7885ade3db702213d82 18-Aug-2011 Tom Taylor <tomtaylor@google.com> Unable to send MMS

This doesn't fix the bug, but adds debugging that can be turned on
without a recompilation to make tracking down this kind of bug
easier the next time. Bug 5182797

Change-Id: Ia601afd6868b5dc4db202c849c35d17123ad833b
ms/transaction/HttpUtils.java
ms/transaction/SendTransaction.java
17cf9ceaadf0208c86543e1be47cdcae4a9b29a3 18-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "In multi-select mode, show a custom background"
7e6adccb88b19c52a4eb495da4ce35e5cb22a3fa 18-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Remove FULLSCREEN mode"
f9d706cfd0c46a74ba3d79e5543f13a225328d30 18-Aug-2011 Tom Taylor <tomtaylor@google.com> In multi-select mode, show a custom background

Harder than it seems! Only the ListView knows which items are
checked. The adapter doesn't know anything about list items.
The common bridge is the Conversation. Also, get rid of a useless
class of indirection, the ConversationListItemData. Bug 5151185

Change-Id: If263c95a32ddb9ac565355aac3fc58ad5e3ddacd
ms/data/Conversation.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/ConversationListItem.java
ms/ui/ConversationListItemData.java
64df78ef24894abac6d3123a2d9edfd283ac991e 18-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Message app: Inconsistent state"
90068e6d9d2a9303377f6bd34ef8eb3537070e47 18-Aug-2011 Tom Taylor <tomtaylor@google.com> Remove FULLSCREEN mode

The bug now says to hold off on FULLSCREEN mode. Bug 5121936

Change-Id: Ifd59033c3b9ba9af6b88d536ffd815e20711a79a
ms/ui/ComposeMessageActivity.java
d1c99d27494cac726cd6566238f0a1c576c4e759 17-Aug-2011 Tom Taylor <tomtaylor@google.com> Message app: Inconsistent state

The messaging app died and was restarted by selecting a mms notification.
The app was restarted with a saveInstanceState which loaded conversation A.
Then the app was handed the new intent from the notification for
conversation B. Meanwhile, conversation A's query finished, but the threadId
no longer matched that of conversation B. When the code starts a new
query, it tries to cancel any pending queries, but the docs says that's
not a guarantee. We now detect this state and restart the query to match
the current conversation. Bug 5179301

Change-Id: I04df8dc90c2ee152d255ba42a1a699106e03a2a4
ms/ui/ComposeMessageActivity.java
039f56906f434d766bad6c7c5305c08381f16bec 17-Aug-2011 Tom Taylor <tomtaylor@google.com> In landscape, use full-screen

In ComposeMessageActivity, go fullscreen when in landscape. Always
turn off extract mode. Bug 5121936

Change-Id: Ib9b5c9b67bc9fd73ae03c8239feb5200b4ec2e99
ms/ui/ComposeMessageActivity.java
1c99c8f732b7449347a54d744cb8d3d41c1f796a 17-Aug-2011 Tom Taylor <tomtaylor@google.com> Cleanup "Message options" dialog

More shuffling. Bug 5139850

Change-Id: Ic7a896cc6a5362d40ff0f8e27e83183471411022
ms/ui/ComposeMessageActivity.java
ea83ed100ad1d90d63bfde46669148f36da70527 16-Aug-2011 Daisuke Miyakawa <dmiyakawa@google.com> Merge "Stop escaping twice"
43f66a57ba57f2540c95a30a222e74d033938ddf 16-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Merge debugging messages and tools to master"
e2afd15427a53f63ba4636e15812de9fdfce369d 16-Aug-2011 Tom Taylor <tomtaylor@google.com> Cleanup "Message options" dialog

Bug 5139850

Change-Id: I3e89eef297f6c53649cdc891ad00a59a9cbb9c5d
ms/ui/ComposeMessageActivity.java
b3217a6ddcd9455968de7078bfbc0a901b4ff705 16-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge debugging messages and tools to master

Merge the newly added debugging messages and database dump tools from
gingerbread into master. Bug 5133439

Change-Id: I191960a79c7dc60f7e5f731ab952f06c5c9383c4
ms/LogTag.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageUtils.java
2b70bdd3ff232c972ff6275afd8aeef2cda403d3 16-Aug-2011 Daisuke Miyakawa <dmiyakawa@google.com> Stop escaping twice

Uri#appendPath() escapes a given String, so we don't need to call
Uri#escape() again.

Bug: 4999868
Change-Id: I6963c9ec91a1dd104ddfb8a33ecbbc573dace487
ms/ui/RecipientsAdapter.java
0856dec418d9838e09b1609439279e248355e0c4 16-Aug-2011 Tom Taylor <tomtaylor@google.com> Turn off send sms debugging

Add a simple debug function at the choke point so the next time
the telephony layer reports an error from the RIL, we'll print out
the error. Bug 5164371

Change-Id: Idb4b588e3e956248f429311361795b49ec2c9b70
ms/LogTag.java
ms/transaction/SmsReceiverService.java
6d38b19aa9aef46afa855187f23e44d4c06f8878 11-Aug-2011 Tom Taylor <tomtaylor@google.com> Add new send sms intent

Add a new intent to send an sms message without any UI interaction.
Presently, the Messaging app can already respond to intents with
the android.intent.action.SENDTO action, but this brings up the
ComposeMessageActivity primed with a destination and message. It's up
to the user to review the message and hit send. This new intent will
send the message to the user without the user seeing the compose screen
and having to hit send. Apps could already send sms's by talking
directly to the SmsManager. Using this new intent, however, has the
benefit of adding the outgoing message to a thread so the user will
be able to see what was sent. In addition, sending a message via the
Messaging app compare to the SmsManager will add automatica retry when
there's no connection, etc. This new feature could be used by the phone
app so the user could easily respond to an incoming phone call by sending a canned sms that
reads, "I'm busy, but I'll call you right back." A caller of this new
intent must have android.permission.SEND_SMS_NO_CONFIRMATION. An
accompanying CL adds the private permission to the framework.
An included test app tests the feature. Bug 4563486

Change-Id: I9292ea6d52e135cdabcfe68091d4d24d15524c97
Signed-off-by: Tom Taylor <tomtaylor@google.com>
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
ms/ui/NoConfirmationSendService.java
69a363ed65b1d8b9948f20f499d124bd31e0c941 12-Aug-2011 Tom Taylor <tomtaylor@google.com> Image in message stream needs touch feedback

Copy the private image from the framework into mms. Make a small
tweak to a debug message. Bug 5139681

Change-Id: I98bf6f58e44a388f63cb3eea8b1a7be868f0b6c4
ms/MmsConfig.java
b75327a438d01fb7c0fff79536a307d9b7f81393 12-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Add more debug log code for message not sent"
0d2c0042be90f42635e3bc301f2a2e37460e6344 12-Aug-2011 Tom Taylor <tomtaylor@google.com> Add more debug log code for message not sent

Turning on for a day or two to capture some log info. Now printing out
the error code returned in the intent from the SmsManager. Bug 5144439

Change-Id: I687b030810dfff9d42a47f8908a8173fa43af8e9
ms/transaction/SmsReceiverService.java
ms/transaction/SmsSingleRecipientSender.java
b85cfae9dc792a11296edd3c58747c1e140f6852 12-Aug-2011 Tom Taylor <tomtaylor@google.com> Unable to remove slideshow from chat view

Add a remove button to the slideshow editor. Bug 5139743

Change-Id: I3cebc4ae17722b74c5169c31661297c3a235819d
ms/data/WorkingMessage.java
ms/ui/AttachmentEditor.java
ca3566ba48b687129fbf7bc92a3946e9b5ca5305 11-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Alignment of (outgoing) messages is wrong"
71c9a4bf0f8ccad02eef901ed487e67ebe8326d8 11-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Messaging Settings cleanup: spinners using Froyo style controls"
c33ee154b6fd872439fd24a073f947339bbe4d22 11-Aug-2011 Tom Taylor <tomtaylor@google.com> Add debug log code for message not sent

Turning on for a day or two to capture some log info.
Bug 5144439

Change-Id: Icbbf8a4a0e485fb1ed49d7977220e7258b886a14
ms/LogTag.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiverService.java
ms/transaction/SmsSingleRecipientSender.java
602c2d23651b9ff764cfca62cc8df922587c328e 10-Aug-2011 Tom Taylor <tomtaylor@google.com> Alignment of (outgoing) messages is wrong

Bug 5139421

Change-Id: I3dba2be77b07d78fbd781dd517d4da343fb444d7
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
7c2ec6959f436a1b8dece400b6618fcc6ad6110f 09-Aug-2011 Tom Taylor <tomtaylor@google.com> Messaging Settings cleanup: spinners using Froyo style controls

Big change for little bug. Use the framework NumberPicker rather than
our own. Bug 5140004

Change-Id: Id729a6732adc17b994f6427885fecf9e5ce4bf62
ms/ui/NumberPicker.java
ms/ui/NumberPickerButton.java
ms/ui/NumberPickerDialog.java
680031f4eeca1a96e9c0ced17c5923deaf377c43 09-Aug-2011 Tom Taylor <tomtaylor@google.com> Merge "Discarded message with picture is displayed in drafts"
5996cd3d64fcb93c437874848705297783ee2eab 09-Aug-2011 Tom Taylor <tomtaylor@google.com> "Message details" dialog shouldn't have OK button

The new UI convention is to dismiss via a tap outside (or BACK.)
Bug 5137196

Change-Id: I7ca40201039928a74be5eda88d68a765ca88e4c0
ms/ui/ComposeMessageActivity.java
3d22f559d76a8697a472ad1e1f5a44d339dc7f46 09-Aug-2011 Tom Taylor <tomtaylor@google.com> Discarded message with picture is displayed in drafts

Bug 5137014

Change-Id: Iafbf78ec1da33b8cd3bb8cb0d841c33da4382290
ms/data/WorkingMessage.java
b500b0c4e563954bf2f8b61841041628be5784ed 05-Aug-2011 Tom Taylor <tomtaylor@google.com> Don't discard new conversations

If the recipients editor is open, don't discard the message and close
ComposeMessageActivity. Bug 5127453

Change-Id: I05193739a7d34b9a145560c0e599fc2c2f85c572
ms/ui/ComposeMessageActivity.java
f5ee09517257bdf130b88d3ae14cf322bf96cd9d 04-Aug-2011 Tom Taylor <tomtaylor@google.com> Fix java.lang.IndexOutOfBoundsException

Don't try to dial when there isn't a recipient. This is a very
unusual case found by the monkey. The code that puts up the menu
checks for recipients, but by the time the monkey hits the menu,
the recipients list is empty. Bug 2556294

Change-Id: I78d4a0e92902bbcf41941cb6b537d49ff48a5109
ms/ui/ComposeMessageActivity.java
c06913a292eba0dc9c17ca312f837f009b8e46f5 03-Aug-2011 Tom Taylor <tomtaylor@google.com> Blank messaging thread is displayed after locking/unlocking the screen

The conversation was getting wiped out because the message count
in the conv was 0. Bug 5088276

Change-Id: Id1af5e862eb7679bfc0328134d61c1949fe08f3c
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
15c2190d6910032fa01fa9245159f0ce8e78729b 27-Jul-2011 Tom Taylor <tomtaylor@google.com> Don't use deprecated NetworkConnectivityListener

Bug 5079243

Change-Id: I95142e59ef81354d8321376b0f0f8b9e3783bcb8
ms/transaction/TransactionService.java
f1dad79a1bd939e06bae97e9d6ef83a1b1369529 27-Jul-2011 Tom Taylor <tomtaylor@google.com> CMA menu reorganization and simplification

Bug 5054233

Change-Id: I08b9f08e804cb95018e113d74558d032aee7a557
ms/ui/ComposeMessageActivity.java
59a2cda3d5d4f3a28eee528addf7b195d2f50e6d 26-Jul-2011 Tom Taylor <tomtaylor@google.com> Merge "Message limit dialogs still have the GB theme"
fe9a5231eaad8616c9797dca8db6ea412d511f36 26-Jul-2011 Tom Taylor <tomtaylor@google.com> Message limit dialogs still have the GB theme

Bug 5055958

Change-Id: Ie8c6fac030a5787a9fbe4b353181e869a343fcf4
ms/ui/NumberPickerDialog.java
5681f6193a7368a39ec1b9a617357a02a242e02c 26-Jul-2011 Tom Taylor <tomtaylor@google.com> Name and phone number should be on separate lines in the action bar

Bug 5052457

Change-Id: I0da473006b3f2d57d54450cfbfc268b25e3859a2
ms/ui/ComposeMessageActivity.java
5431c6ca43c455d438c7cfa7cce6485f9314621d 21-Jul-2011 Tom Taylor <tomtaylor@google.com> Merge "White triangle is drawn on both sides of the avatar"
591608700cb459abc34e64c27ecf5377e8a1d785 21-Jul-2011 Tom Taylor <tomtaylor@google.com> White triangle is drawn on both sides of the avatar

Path needed to be cleared. Bug 5052415

Change-Id: I05a6918ff532367480ed27ef7fdf9be379f2cc34
ms/ui/ImageViewDivot.java
ms/ui/MessageListItem.java
8718d3d672175f47b24cf82107943fa80232d80d 20-Jul-2011 Tom Taylor <tomtaylor@google.com> Increase the default max number of messages per conversation

Bug 5052500

Change-Id: Iff7e639dde9f53120e0c5973cf04ac716f14610f
ms/MmsConfig.java
c64cdf971fcc804d0d486f9e41a778ce1c9ac96c 20-Jul-2011 Tom Taylor <tomtaylor@google.com> Need to tap twice on send button to send an edited draft message

Use a TextView instead of an EditText item. Bug 4983449

Change-Id: Ib812f01e59e6240fa83025a2fa7fa4f75e4a7da4
ms/ui/ComposeMessageActivity.java
313d09ee558e6ac94ab28a205357885dc830cd0d 18-Jul-2011 Tom Taylor <tomtaylor@google.com> SMS messages sent from me do not show my picture

Remove an old avatar cache used for MessageListItems and use the
avatar found in Contacts. This is the same used by the Conversation.
Bug 3324364

Change-Id: Ie9235ae2efb0817f90346217aecc663d665e8b77
ms/data/Contact.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
22c80259e32726d07236f03b5cd05be37b3b5281 19-Jul-2011 Tom Taylor <tomtaylor@google.com> Display an error message

Vzw FR Request to Display "Error Network Problem" when there
is an error during transmission. Bug 2494479

Change-Id: Iea289a96db611c566a8c9e0aeca9666663c3b736
ms/transaction/RetryScheduler.java
b616c955e2f513efb5f78e37882bac5f15f0a768 19-Jul-2011 Tom Taylor <tomtaylor@google.com> Align text consistently

Always left align text for now. Use talk's new ImageViewDivot to
draw the divot over the avatar. Bug 5022393

Change-Id: I519b2235cbfc959a1a794ae47a83c761104b70a1
ms/ui/DivitDrawable.java
ms/ui/ImageViewDivot.java
ms/ui/MessageListItem.java
a0377e035f30fc91a54989b3d7f94faee0a0a616 14-Jul-2011 Conley Owens <cco3@android.com> am b05aeb28: am 0ccc488a: am fc942ff9: Merge "Set local time as timestamp when MMS has been downloaded"

* commit 'b05aeb28da6d357c013ebb296e76175f9cb04478':
Set local time as timestamp when MMS has been downloaded
a9882813f9e128619eed3e7b5157d02c336c2575 14-Jul-2011 Conley Owens <cco3@android.com> am ba99ee45: am df0e0f19: am ad144f68: Merge "Added check for input parameters in sendPdu"

* commit 'ba99ee4512dc40100b69a4a4cefa832c4e59d95e':
Added check for input parameters in sendPdu
b05aeb28da6d357c013ebb296e76175f9cb04478 14-Jul-2011 Conley Owens <cco3@android.com> am 0ccc488a: am fc942ff9: Merge "Set local time as timestamp when MMS has been downloaded"

* commit '0ccc488a98ad71c69da449afbd4492751ba12006':
Set local time as timestamp when MMS has been downloaded
ba99ee4512dc40100b69a4a4cefa832c4e59d95e 14-Jul-2011 Conley Owens <cco3@android.com> am df0e0f19: am ad144f68: Merge "Added check for input parameters in sendPdu"

* commit 'df0e0f191993e999f582b2e952ca221c0b69205f':
Added check for input parameters in sendPdu
0ccc488a98ad71c69da449afbd4492751ba12006 14-Jul-2011 Conley Owens <cco3@android.com> am fc942ff9: Merge "Set local time as timestamp when MMS has been downloaded"

* commit 'fc942ff93a56e9c10ada33193b74516add8050c0':
Set local time as timestamp when MMS has been downloaded
df0e0f191993e999f582b2e952ca221c0b69205f 13-Jul-2011 Conley Owens <cco3@android.com> am ad144f68: Merge "Added check for input parameters in sendPdu"

* commit 'ad144f688e72f03416a9e7496e63bd9a3b766f3d':
Added check for input parameters in sendPdu
fc942ff93a56e9c10ada33193b74516add8050c0 13-Jul-2011 Conley Owens <cco3@android.com> Merge "Set local time as timestamp when MMS has been downloaded"
8429b927ffb65c52b00da410fd60b2b1790c1026 08-Jul-2011 Tom Taylor <tomtaylor@google.com> ComposeMessageActivity UI work

Add a little triangle over the avatar. Let the background show through
in places. Adjust spacing. Other tweaks.

Change-Id: I459debf4c51bfb72b5eb0563a3dbfb08961c067c
ms/ui/DivitDrawable.java
ms/ui/MessageListItem.java
3fb271abe0c478d0ea8432830589774182079c86 30-Jun-2011 Tom Taylor <tomtaylor@google.com> New UI look for Messaging

Changes include left and right avatars for sender/recipient in
message items, an icon (instead of text) for the send button.

Change-Id: I4a112ee656a38476a5238d680b59bf6c52dfa2ca
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationListItem.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
dca923722b6eb0bb3cd8ca1d4d7b478c2fa4352b 24-Jun-2011 Tom Taylor <tomtaylor@google.com> Fix NPE

If parsing a sms fails, it silently fails by internally catching an
exception and setting the internal SmsMessage guts to null. Catch
that situation. Bug 3236638

Change-Id: I71767bd5f2b2713840e9aa7e72d7073cccb98a75
ms/transaction/SmsReceiverService.java
b8f05c322ed3253eee1d47d36ab56783562e418c 24-Jun-2011 Tom Taylor <tomtaylor@google.com> Dismiss notifications for same thread

If you're in ComposeMessageActivity and you receive a message for that
conversation, selecting the notification wouldn't appear to do anything and the
notification remained. Now when the notification is selected, we
mark any new messages for that thread as seen and dismiss the notification.
Bug 3321269

Change-Id: I6ae83b652ff0a9b11ed866fa927e080b600fbe24
ms/ui/ComposeMessageActivity.java
22289d1ebef38aa93d1592d82414aa2d50ed18cb 23-Jun-2011 Tom Taylor <tomtaylor@google.com> Fix mms send on NexusS Sprint

Also, move a couple of log statements out of their surrounding if's so
we can easily debug these common "can't send mms" cases. Bug 4344383

Change-Id: Ieadfccf20eaa8cadd22267c241a1cebe7c04a97f
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
7a71ae40edcfcfda9bbc07ef00562af86a277174 22-Jun-2011 Tom Taylor <tomtaylor@google.com> Handle mmsc error when message not found or expired

Show a toast like we do with other similar errors. Bug 2494489

Change-Id: I6f417af9e67ca856153066758e297bcb71f511e5
ms/transaction/RetryScheduler.java
5e1c97e1f90901c48bfde61a1ddb5fbc7e0a0c39 21-Jun-2011 Tom Taylor <tomtaylor@google.com> Use per-method ranking.

- send feedback to ContactsProvider
- use per-method sort order

Change-Id: I8d0c154d83a09050456a697e09c8a4532d3f1611
ms/data/WorkingMessage.java
ms/ui/RecipientsAdapter.java
01b383fd51fdb3787ba5cd730b47495ff9c8c079 17-Jun-2011 Tom Taylor <tomtaylor@google.com> Handle Error-service-denied from mmsc

Show a toast like we do for other similar errors.
Bug 2494484

Change-Id: Ie35215b7391e6e34ea71118884a587e602c1bd08
ms/transaction/RetryScheduler.java
a6df87e6fc6c67ee04e38b1d1f1c35f8a4dd4dee 09-Jun-2011 Soojung Shin <sj46.shin@samsung.com> am c087f20d: am 84e63165: am 038817ff: Fix force-close when attaching a video too large for MMS

* commit 'c087f20de7f651db6b073b2c91e8db8990455a69':
Fix force-close when attaching a video too large for MMS
c087f20de7f651db6b073b2c91e8db8990455a69 08-Jun-2011 Soojung Shin <sj46.shin@samsung.com> am 84e63165: am 038817ff: Fix force-close when attaching a video too large for MMS

* commit '84e6316529924d1b91eeb3c1f07121cfdfa1382d':
Fix force-close when attaching a video too large for MMS
84e6316529924d1b91eeb3c1f07121cfdfa1382d 08-Jun-2011 Soojung Shin <sj46.shin@samsung.com> am 038817ff: Fix force-close when attaching a video too large for MMS

* commit '038817fffb2fb8045393443cab7392e6114dfc3d':
Fix force-close when attaching a video too large for MMS
038817fffb2fb8045393443cab7392e6114dfc3d 25-May-2011 Soojung Shin <sj46.shin@samsung.com> Fix force-close when attaching a video too large for MMS

Attaching images and small video is OK but the force-close
popup is showing up instead of "message size limit reached"
popup when attaching a large video.

Change-Id: I1b4885760aec5fb9f44c69524fe8cab18af2b9e8
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
ms/data/WorkingMessage.java
85d5c5d852355248b98c43305bd950b432754755 03-Jun-2011 Ben Dodson <bjdodson@google.com> am 4f28ef33: am 59249b63: am 1149674a: Improved support for rfc 5724

* commit '4f28ef33ca021f8560b50e90427e0c3b67a05c9a':
Improved support for rfc 5724
69481afff1b27e1d8b31e1450430aeb8bc6a2d07 14-Oct-2010 Matthias Thomae <matthias.thomae@teleca.com> Set local time as timestamp when MMS has been downloaded

Previously, the timestamp of notifications was the current local time,
but as soon as the MMS was downloaded it got the timestamp from the
PDU. This could cause problems if timezones weren't set correctly etc.
Now a downloaded MMS will always get the current local time as its
timestamp, regardless of when it was first received.
ms/transaction/NotificationTransaction.java
ms/transaction/RetrieveTransaction.java
7c7932099588fb27503c4406e3cd19021ab73267 29-Oct-2010 Matthias Thomae <matthias.thomae@teleca.com> Added check for input parameters in sendPdu

This change is part of change "I8a677afe: Return error code when
composing PDU fails", see https://review.source.android.com/17721
ms/transaction/Transaction.java
4f28ef33ca021f8560b50e90427e0c3b67a05c9a 29-May-2011 Ben Dodson <bjdodson@google.com> am 59249b63: am 1149674a: Improved support for rfc 5724

* commit '59249b634c93d275af78b4b9a3546a08ef872117':
Improved support for rfc 5724
7a0d891850d3a57c6358f1a2c8798f4f84a47e7c 27-May-2011 Tom Taylor <tomtaylor@google.com> Fix NPE

When the CamcorderProfile returns null, the max video size is now zero.
Bug 4501609

Change-Id: I3a8d06bb6af76a7ee27dab52d08af4f7b6f3f661
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
d019225935f492f67dc189d9199bb61eeb7f02d5 27-May-2011 Tom Taylor <tomtaylor@google.com> Numbers are not displayed in link chooser

The country code was not set and as a result, the phone number
parser would return null when formatting a number. The code now
uses the default locale as a backup. Bug 4349950

Change-Id: Ia01ee403dee18c7b3f70c601769f5ceb5143d998
ms/MmsApp.java
ms/ui/MessageListItem.java
59249b634c93d275af78b4b9a3546a08ef872117 24-May-2011 Ben Dodson <bjdodson@google.com> am 1149674a: Improved support for rfc 5724

* commit '1149674a2a3c13c7b3b41e5057880e011a45b4b4':
Improved support for rfc 5724
1149674a2a3c13c7b3b41e5057880e011a45b4b4 19-May-2011 Ben Dodson <bjdodson@google.com> Improved support for rfc 5724

Change-Id: I0b8a07de4af64173ef431ade3bf2dca6c4fb9ba6
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
eebe87d4b8c5789429d0e1bc4392fd251a4eeb4c 18-May-2011 Tom Taylor <tomtaylor@google.com> Fix multiselection to work with read/unread backgrounds

The multiselection background needs to be combined with
the ConversationListItem custom backgrounds we use to show
read/unread threads.

Change-Id: Id6a2bf8003813ec094193877b08073360034c24a
ms/ui/ConversationListItem.java
7020f6b8fa387935ac2580c636360c2bbc39bffc 16-May-2011 Tom Taylor <tomtaylor@google.com> UI tweaks to match latest spec

Change-Id: I056215ec9d9ce0e1ab21d1cba81408647660ed1a
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
b51ea8318ca2e4019b666d938e3e7efdf6e643b3 13-May-2011 Tom Taylor <tomtaylor@google.com> Multi-select conversation delete

Change-Id: I78748c9881733caea18239e4bd807e7a0c2ae4bf
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListItem.java
ms/ui/MessageUtils.java
05924c096264840a88518c7d55ec0ace6b528a58 11-May-2011 Tom Taylor <tomtaylor@google.com> Add "Add attachment" to CMA's action bar

Make text of attachment panes visible.

Change-Id: I3f9ec45cfaaf4069da90a43768d75146274f036a
ms/ui/ComposeMessageActivity.java
2426db8887f7f1c0c93dbab5a10663cb22575ccd 11-May-2011 Tom Taylor <tomtaylor@google.com> Add actionbar to ConversationList

Add the number of unread conversations in the action bar of the
ConversationList. Remove the static "New message" item from the list.
"New message" is now in the actionbar.

Change-Id: If417964118146bdef6d807cce71213674d809c44
ms/data/Conversation.java
ms/ui/ConversationList.java
e2986af492c30ad92c96bcb7adf8092d4d948565 27-Apr-2011 Tom Taylor <tomtaylor@google.com> Add a test case for creating thousands of conversations

The test case found a bug. The conversation cache's delete function wasn't
synchronized and resulted in a ConcurrentModificationException while
looking up an existing thread.

Change-Id: I668361e457df3ab4ca4bdc527c4872b014bb370d
ms/data/Conversation.java
43f187ff75506f9c233730f2e3d3323a59db5a23 12-Apr-2011 Tom Taylor <tomtaylor@google.com> Merge "Fix crash typing a recipient"
368cefca7f9b1c3049cdc5d804dc5f10bce91607 12-Apr-2011 Tom Taylor <tomtaylor@google.com> Fix crash typing a recipient

In the adapter when adding the number item, the code was failing to add
a new field and the cursor was crashing when looking up that field. Also,
update a logging message with additional info.

Change-Id: Id4d988cd21fdaaf17823652a580ec385689fad23
ms/transaction/NotificationTransaction.java
ms/ui/RecipientsAdapter.java
f0c82f5a71f3edacc722abcb45bdc14f512122d7 12-Apr-2011 Tom Taylor <tomtaylor@google.com> am eaefafcd: am 999ab340: am a7f93880: Fix NPE at com.android.internal.telephony.cdma.sms.BearerData.countAsciiSeptets

* commit 'eaefafcdfe6165ed14a72583223a21b31c0b816c':
Fix NPE at com.android.internal.telephony.cdma.sms.BearerData.countAsciiSeptets
eaefafcdfe6165ed14a72583223a21b31c0b816c 12-Apr-2011 Tom Taylor <tomtaylor@google.com> am 999ab340: am a7f93880: Fix NPE at com.android.internal.telephony.cdma.sms.BearerData.countAsciiSeptets

* commit '999ab340d80eece5313920b80b29603fff978f2c':
Fix NPE at com.android.internal.telephony.cdma.sms.BearerData.countAsciiSeptets
e11f7ebf8ec01d7af063781d5bf9ab9ff92f8b7e 11-Apr-2011 Soojung Shin <sj46.shin@samsung.com> am 0b3d94dd: am 99ffe3fc: am 5751c241: Allow the SMS message length to be set via mms_config.xml

* commit '0b3d94dd0347414f65416c692046ef643c227c0e':
Allow the SMS message length to be set via mms_config.xml
0b3d94dd0347414f65416c692046ef643c227c0e 11-Apr-2011 Soojung Shin <sj46.shin@samsung.com> am 99ffe3fc: am 5751c241: Allow the SMS message length to be set via mms_config.xml

* commit '99ffe3fc4f486c3249376f943cc2dd3d3fb6873e':
Allow the SMS message length to be set via mms_config.xml
999ab340d80eece5313920b80b29603fff978f2c 11-Apr-2011 Tom Taylor <tomtaylor@google.com> am a7f93880: Fix NPE at com.android.internal.telephony.cdma.sms.BearerData.countAsciiSeptets

* commit 'a7f93880871894d2f6721ae07052e713613b4bf1':
Fix NPE at com.android.internal.telephony.cdma.sms.BearerData.countAsciiSeptets
a7f93880871894d2f6721ae07052e713613b4bf1 11-Apr-2011 Tom Taylor <tomtaylor@google.com> Fix NPE at com.android.internal.telephony.cdma.sms.BearerData.countAsciiSeptets

Check for empty text. Bug 4268602

Change-Id: I08dd567ad79a96ec92d4c418dd8e0f294ee66f4e
ms/data/WorkingMessage.java
150c4179995cc0a75f934ef194372f9295957ca2 08-Apr-2011 Joe Onorato <joeo@google.com> Remove the deprecated things from Config.java. These havent been working since before 1.0.

Change-Id: I7b60931012a68116b516acc8af8a7a8fdeab97c3
ms/MmsConfig.java
ms/dom/smil/SmilMediaElementImpl.java
ms/dom/smil/SmilPlayer.java
ms/dom/smil/SmilRegionElementImpl.java
ms/dom/smil/parser/SmilContentHandler.java
ms/drm/DrmWrapper.java
ms/layout/HVGALayoutParameters.java
ms/layout/LayoutManager.java
ms/model/AudioModel.java
ms/model/ImageModel.java
ms/model/LayoutModel.java
ms/model/SlideModel.java
ms/model/SmilHelper.java
ms/model/VideoModel.java
ms/transaction/DefaultRetryScheme.java
ms/transaction/HttpUtils.java
ms/transaction/NotificationTransaction.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/TransactionSettings.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConfirmRateLimitActivity.java
ms/ui/EditSlideDurationActivity.java
ms/ui/MessageListAdapter.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideView.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowPresenter.java
ms/ui/UriImage.java
ms/util/DownloadManager.java
ms/util/RateController.java
ms/util/SendingProgressTokenManager.java
99ffe3fc4f486c3249376f943cc2dd3d3fb6873e 04-Apr-2011 Soojung Shin <sj46.shin@samsung.com> am 5751c241: Allow the SMS message length to be set via mms_config.xml

* commit '5751c241c4a9cb19668788e2ae83ca6e8287375c':
Allow the SMS message length to be set via mms_config.xml
5751c241c4a9cb19668788e2ae83ca6e8287375c 31-Mar-2011 Soojung Shin <sj46.shin@samsung.com> Allow the SMS message length to be set via mms_config.xml

Change-Id: I8941fcc9f352805635c638aa2e2bae513b71db8f
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
ms/MmsConfig.java
ms/ui/ComposeMessageActivity.java
ms/ui/SlideEditorActivity.java
2e08c899acabe7aeb26dd0a3bee3d08d17e641c4 01-Apr-2011 Soojung Shin <sj46.shin@samsung.com> am ddf0f54f: am 058f58cf: am d9161cf8: Use FILL_FREEZE when mmsc doesn\'t support slide duration

* commit 'ddf0f54fdbf785329d8c0056f8a8ff3c871aa0ac':
Use FILL_FREEZE when mmsc doesn't support slide duration
ddf0f54fdbf785329d8c0056f8a8ff3c871aa0ac 01-Apr-2011 Soojung Shin <sj46.shin@samsung.com> am 058f58cf: am d9161cf8: Use FILL_FREEZE when mmsc doesn\'t support slide duration

* commit '058f58cfa9d1630347daff2a5ccc014dbc6ef77e':
Use FILL_FREEZE when mmsc doesn't support slide duration
058f58cfa9d1630347daff2a5ccc014dbc6ef77e 01-Apr-2011 Soojung Shin <sj46.shin@samsung.com> am d9161cf8: Use FILL_FREEZE when mmsc doesn\'t support slide duration

* commit 'd9161cf8b10d48ee99b4b8473e0278a87ad68d87':
Use FILL_FREEZE when mmsc doesn't support slide duration
76f28b55374db5fd385aca2dfa97ef79cd08b334 30-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am 1d145e32: am 8d173b4c: am c8859ed1: Keep MMS mode with >160 characters after removing attachment

* commit '1d145e32fc5502037a0f9fe000b4127f62fc0f92':
Keep MMS mode with >160 characters after removing attachment
1d145e32fc5502037a0f9fe000b4127f62fc0f92 29-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am 8d173b4c: am c8859ed1: Keep MMS mode with >160 characters after removing attachment

* commit '8d173b4cbca1bbdf571034ad6585f07bc973dcd7':
Keep MMS mode with >160 characters after removing attachment
d9161cf8b10d48ee99b4b8473e0278a87ad68d87 28-Mar-2011 Soojung Shin <sj46.shin@samsung.com> Use FILL_FREEZE when mmsc doesn't support slide duration

If the mmsc does not support slide duration, set the fill type
to FILL_FREEZE, otherwise the media will disappear when
rotating the screen in the slide show play view.

Signed-off-by: Soojung Shin <sj46.shin@samsung.com>

Change-Id: I501953908eb01707fbccf23a1a2b6153dbb859fc
ms/model/MediaModelFactory.java
8d173b4cbca1bbdf571034ad6585f07bc973dcd7 25-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am c8859ed1: Keep MMS mode with >160 characters after removing attachment

* commit 'c8859ed1e7b47996762dcb34f160521f276dccdf':
Keep MMS mode with >160 characters after removing attachment
c8859ed1e7b47996762dcb34f160521f276dccdf 24-Mar-2011 Soojung Shin <sj46.shin@samsung.com> Keep MMS mode with >160 characters after removing attachment

1. Compose SMS with <=160 characters.
2. Add an attachment.
3. Add some characters to make >160.
4. Remove the attachment.

Result:
Message mode is switched to SMS.

Expected result:
Message mode should not be switched.

Change-Id: Ie71a74bdb6037b6fefe2166c1ea2972d8fc67c1c
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
0e6ae5265245a13e1bef96c6aad1e3f2c1c7236e 18-Mar-2011 Fredrik Roubert <roubert@google.com> Add a label "Received:" and use it for received messages.

Change-Id: I063d4277c09fe5df6125a221c89d91df83baedac
ms/ui/MessageItem.java
588e4e49e8f8027314219530af2fce74399a0439 18-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am a47eb9f7: am 2c4537cb: am 9aed641d: Allow choice between multi-part SMS and MMS

* commit 'a47eb9f7bfec0a4a07b80c6123abed80d74e12ab':
Allow choice between multi-part SMS and MMS
a47eb9f7bfec0a4a07b80c6123abed80d74e12ab 18-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am 2c4537cb: am 9aed641d: Allow choice between multi-part SMS and MMS

* commit '2c4537cbed9aa5069e86d456aabdc1030a62d0d3':
Allow choice between multi-part SMS and MMS
2c4537cbed9aa5069e86d456aabdc1030a62d0d3 18-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am 9aed641d: Allow choice between multi-part SMS and MMS

* commit '9aed641d68fafdec88f83d9c4f949ca9ab6fdb0e':
Allow choice between multi-part SMS and MMS
9aed641d68fafdec88f83d9c4f949ca9ab6fdb0e 16-Mar-2011 Soojung Shin <sj46.shin@samsung.com> Allow choice between multi-part SMS and MMS

- Messages with over 160 characters can be sent via MMS or
multi-part SMS.

- Deal with slide durations that the MMSC does not
support.

Change-Id: I35ad6d2e7ca23edfb49b6790f8f57053bf1c5bca
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/model/SlideshowModel.java
ms/ui/ComposeMessageActivity.java
7357a9d7431c841319e5a3beba9cec93fbace264 18-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am 52a0b6bd: am c862fa11: am eed03972: Show correct message limits when settings restored

* commit '52a0b6bd3cdc6f24209bf0dc94589527d0db8175':
Show correct message limits when settings restored
52a0b6bd3cdc6f24209bf0dc94589527d0db8175 18-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am c862fa11: am eed03972: Show correct message limits when settings restored

* commit 'c862fa117efee996c55efe31ec988e4444a5fd5a':
Show correct message limits when settings restored
c862fa117efee996c55efe31ec988e4444a5fd5a 18-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am eed03972: Show correct message limits when settings restored

* commit 'eed03972e3893b0e00d951173b3421057f7638e2':
Show correct message limits when settings restored
36cb4bcc16e6d395e03d365a066bcad78e9d25c4 17-Mar-2011 Tom Taylor <tomtaylor@google.com> Add more Mms debugging

These statements were useful in tracking down the most recent mms problem.

Change-Id: I890da50efb65b37064691ba1cd3a137f19d8d7ad
ms/transaction/TransactionBundle.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
eed03972e3893b0e00d951173b3421057f7638e2 13-Mar-2011 Soojung Shin <sj46.shin@samsung.com> Show correct message limits when settings restored

Fix the behaviour of "Restore default settings" in the
MMS app so that the message limit numbers are correctly
displayed afterwards.

Change-Id: Ie9024f33d175c8563774143ce1aa0dc5b370f864
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
ms/ui/MessagingPreferenceActivity.java
6c2eab03c67b9d9c124e8942f040128c0d05611a 16-Mar-2011 Wei Huang <weih@google.com> Merge "Add the field date_sent to keep track of the date a message was sent."
e790513a9e73205bf7e9e6b6124d9f828c0b4da2 07-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am bc435ebe: am 7c96b425: am b264ea0a: Added to modify message settings.

* commit 'bc435ebe925f602bbabf51dcb95f81961cd8be2f':
Added to modify message settings.
bc435ebe925f602bbabf51dcb95f81961cd8be2f 07-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am 7c96b425: am b264ea0a: Added to modify message settings.

* commit '7c96b42552bf73235471ae8bbd0921fc1791d071':
Added to modify message settings.
54711acb7191269e0a4723320bd74f29dd2c9223 18-Nov-2010 Fredrik Roubert <roubert@google.com> Add the field date_sent to keep track of the date a message was sent.

Change-Id: I848511952589af86b57fc24d4a001958017887ec
ms/transaction/SmsReceiverService.java
ms/ui/MessageListAdapter.java
ms/ui/MessageUtils.java
7c96b42552bf73235471ae8bbd0921fc1791d071 05-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am b264ea0a: Added to modify message settings.

* commit 'b264ea0a6b212e90b4736d0a8ffde69c15293ee3':
Added to modify message settings.
b264ea0a6b212e90b4736d0a8ffde69c15293ee3 25-Feb-2011 Soojung Shin <sj46.shin@samsung.com> Added to modify message settings.

Change-Id: I60540545b8a921ae35e7f81f5cf328b29d7c6f57
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
ms/ui/MessagingPreferenceActivity.java
a09cb112aa037fb0b71a8602fcbb12a1559470e0 02-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Better handling of getNetworkInfo.

It may return null - don't assume it won't.

Change-Id: Id2f83b30ca5a3c5ff90880a528a06d37bfbf0261
ms/transaction/RetryScheduler.java
ms/transaction/TransactionService.java
e9f32256c438d3560a986ae5695e25da748587be 10-Feb-2011 Jesse Wilson <jessewilson@google.com> Adopt LruCache in MMS.

Change-Id: I644e0928f9e93d885713c037a5beef067cf5c2d3
http://b/3184897
ms/ui/MessageListAdapter.java
7816653a6c69645822a99bc059c0666c527e62f9 04-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 5687398b: am 3ff35cd3: Merge from open-source gingerbread

* commit '5687398bd91ad3a1f579fe9ae66bffc717652b14':
Support video/mp4 content type
5687398bd91ad3a1f579fe9ae66bffc717652b14 04-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 3ff35cd3: Merge from open-source gingerbread

* commit '3ff35cd38d8af06cad9f5e4c5c2777aee6fe75aa':
Support video/mp4 content type
3ff35cd38d8af06cad9f5e4c5c2777aee6fe75aa 04-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: I66ae374b23c11a7e56f9ac13d9072c324264f544
06aafe32af600bc6d9bed46f22ff8b6972d8da09 04-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Support video/mp4 content type" into gingerbread
6d5cda648d614d4e8f2c5b061668a2468f1791ea 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 5a6282ff: am 4eb7fcbb: Merge branch \'gingerbread\' of ssh://review.source.android.com:29418/platform/packages/apps/Mms into HEAD

* commit '5a6282ffaae7d796af5aab6d8bf13f1abc3693ec':
Fix the delivery report error
817d4638f2dcd1ae3d95ce00bb2b91cb1f80a6c4 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am c46f117c: am b48902c3: Merge from open-source gingerbread

* commit 'c46f117c845848d19e43eeecbed124b9e5882c00':
The problem is that attached files(ex. Image, Movie) on MMS are not displayed among other devices.
5a6282ffaae7d796af5aab6d8bf13f1abc3693ec 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 4eb7fcbb: Merge branch \'gingerbread\' of ssh://review.source.android.com:29418/platform/packages/apps/Mms into HEAD

* commit '4eb7fcbbb35872d722028fe904b6112ef37714a5':
Fix the delivery report error
c46f117c845848d19e43eeecbed124b9e5882c00 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am b48902c3: Merge from open-source gingerbread

* commit 'b48902c3b2bd35c189f50ea44a61718c2d3c5d80':
The problem is that attached files(ex. Image, Movie) on MMS are not displayed among other devices.
4eb7fcbbb35872d722028fe904b6112ef37714a5 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge branch 'gingerbread' of ssh://review.source.android.com:29418/platform/packages/apps/Mms into HEAD
b0121087b9eeb045b8d085b55626b45189fb8112 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Fix the delivery report error" into gingerbread
b48902c3b2bd35c189f50ea44a61718c2d3c5d80 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: Ia574c3da7273fea835eadfa0f48cde5392ab10e7
f5759e1d99ed8c31b73c53d9e43b7bc8a1be173a 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge "The problem is that attached files(ex. Image, Movie) on MMS are not displayed among other devices." into gingerbread
faa17561a2f8d7e0e1693770f90e78e7b9bf5c7b 02-Feb-2011 Sang-Jun Park <sj2202.park@samsung.com> Fix the delivery report error

Although TP-status is PENDING or FAILED, delivery report is displayed.
Only in case of SUCCESS, it should be displayed to users.

Change-Id: I00eeed61f8797ff1d468c0bf23a7f3431ed02fae
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
ms/transaction/MessageStatusReceiver.java
c1edca92206708d49fc9a14da9eb5cc7e60e4a1d 31-Jan-2011 Sang-Jun Park <sj2202.park@samsung.com> Support video/mp4 content type

Change-Id: I388e6066b05872993c3f15167d2250d7732c6d8f
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
ms/model/VideoModel.java
b2b40738c2a0c60077e6bc530e91041889fdf675 31-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am 1cd7f1a7: am 0fefd94a: Merge from open-source gingerbread

* commit '1cd7f1a7dea650e4131e499d08bde559105f628e':
fix mms crash when large video file is sent
1cd7f1a7dea650e4131e499d08bde559105f628e 31-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am 0fefd94a: Merge from open-source gingerbread

* commit '0fefd94aa88d4a5b456ddc9775d9deeb3048c696':
fix mms crash when large video file is sent
0fefd94aa88d4a5b456ddc9775d9deeb3048c696 31-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: I9c91c58901533a01df03ff62c1a08b6271a3f26c
b02d890bd31dbf4c91390652a35282babec3b889 31-Jan-2011 Sang-Jun Park <sj2202.park@samsung.com> The problem is that attached files(ex. Image, Movie) on MMS are not displayed among other devices.

- Symptom
1. Attached Movie, Image files are not displayed
2. Attached MP4 file is not displayed : NexusS to NexusOne
3. Attached 3GP files can't be played : NexusS to A877/A797
4. Attached JPG file is not shown : NexusS to A877
5. Attached JPG file is not shown : Iphone to NexusS

Change-Id: I443bbcca6b6a678cd816a3d0c2bf72f544d8fd56
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
ms/model/ImageModel.java
ms/ui/UriImage.java
c975a8acc0afd1bb716a59e1e555a533c6aa8c43 26-Jan-2011 Ritu Srivastava <rsrivast@sta.samsung.com> fix mms crash when large video file is sent

If we try to attach a video with size more than allowed by
CarrierContentRestriction in the Messaging application
(ComposeMessageActivity), the app crashes since it tries to delete a
message from database with improper URI (null value). Prevent the
deletion of message with null URI in correctAttachmentSize()

Change-Id: Icc08419accc23f13e80376b2078b2494815ee87f

Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
ms/data/WorkingMessage.java
218036fc07c12573940c6fee6165840d399b8db7 26-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> am 096bddf4: am 5f0ee1fe: Merge "Focus is set to SMS messages list view when "Manage SIM messages" is selected"

* commit '096bddf49d14005e767cee718325bb6a65170168':
Focus is set to SMS messages list view when "Manage SIM messages" is selected
b225917835e281b1da093ac3b40bcda8328b8949 26-Jan-2011 Tom Taylor <tomtaylor@google.com> am 5cc636e7: am b8d46228: Fix crash in WorkingMessage.saveAsMms

* commit '5cc636e7ea43a3a9c764ba73d60697dc66838597':
Fix crash in WorkingMessage.saveAsMms
096bddf49d14005e767cee718325bb6a65170168 26-Jan-2011 Brad Fitzpatrick <bradfitz@android.com> am 5f0ee1fe: Merge "Focus is set to SMS messages list view when "Manage SIM messages" is selected"

* commit '5f0ee1fec002a91a4dbd7591cdd4d85363af6447':
Focus is set to SMS messages list view when "Manage SIM messages" is selected
5cc636e7ea43a3a9c764ba73d60697dc66838597 25-Jan-2011 Tom Taylor <tomtaylor@google.com> am b8d46228: Fix crash in WorkingMessage.saveAsMms

* commit 'b8d4622886695d60f30dbbbd7146321e2da0cb31':
Fix crash in WorkingMessage.saveAsMms
b8d4622886695d60f30dbbbd7146321e2da0cb31 25-Jan-2011 Tom Taylor <tomtaylor@google.com> Fix crash in WorkingMessage.saveAsMms

A set of steps will correctly cause the working message to get marked
as discarded. However, when restarting, the discarded working message
was not replaced with a good working message. Bug 1866477

Change-Id: I4b42402e3d539df2792b20fa5c3a2f4567085f08
ms/ui/ComposeMessageActivity.java
507ace2ef4dd5cd30801b03778c95864ea45835a 16-Sep-2010 Pawan Kumar Nimmagadda <pawan@codeaurora.org> Focus is set to SMS messages list view when "Manage SIM messages" is selected

This change sets the focus to SMS list view after the SMS messages are
retrieved from SIM card.

Change-Id: I11b686c56aa9e181c5532095613f788d737fb87d
ms/ui/ManageSimMessages.java
9434245e8e0c649b7799463629e1af6551dcd06e 19-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge from gingerbread - do not merge

Change-Id: I3771b536f1767093c8551895ab698379f22d94aa
eae4b7e0cfff6b835736f5c35becb9afc229cf17 05-Jan-2011 Tom Taylor <tomtaylor@google.com> Sms sent to wrong recipient

Remove the empty conversation from the conversation cache.
Bug 3057952

Change-Id: I5b208f5d071dac89af0ac9bd5af43b0286bbf60f
ms/data/WorkingMessage.java
1cb1e68d2fbc1fa2b180bc9eb855c9b748466e7f 04-Jan-2011 Tom Taylor <tomtaylor@google.com> Notification goes to conv list

Selecting sms notification often goes to conversation list instead
of the individual conversation. Bug 3322081

Change-Id: I67382208daea657b46593d82b23c6d2461414331
ms/ui/ComposeMessageActivity.java
ea1313a9dbf098f59eea7c4358f71ae060a7fd2f 04-Jan-2011 Wei Huang <weih@google.com> bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

- the code in ConversationList.onListItemClicked() was extracting the conversation data
from the ConversationListItem view passed in. However, ListItem views can be recycled
when rebound, so the view we got could now be reassigned to a different list position
and contain different data.

Intead of depend on ConversationListItem to store the conversation data, always load
the cursor at the position clicked, and get the conversation data from the cursor.

Change-Id: I4ce80a323771a3f0f91f2f62da17af9cc02a5084
ms/ui/ConversationList.java
38e295b8350dd15fd5e7b9a1414d7f608b0185ed 15-Jan-2011 James Dong <jdong@google.com> am e8e0d271: Squash commits of the following patchs cherry-picked from other branch - do not merge.

* commit 'e8e0d2714a53fa942ef95f5e7b89f2d3cc3a69b8':
Squash commits of the following patchs cherry-picked from other branch - do not merge.
9784f61b60dffc1c6c83c062a16be9c6cabb334a 13-Jan-2011 Tom Taylor <tomtaylor@google.com> am 475c9b2b: am 8fedfa14: Fix java.lang.IllegalStateException: attempt to re-open an already-closed object

* commit '475c9b2be706487b2d725228530ef68c6f92e631':
Fix java.lang.IllegalStateException: attempt to re-open an already-closed object
1b402c8b33c6004011dbcff82ca83cdf4839c893 13-Jan-2011 Tom Taylor <tomtaylor@google.com> am 18965cdb: am 0ca1428f: OOM at com.android.mms.ui.UriImage.getResizedImageData

* commit '18965cdbabee1381546b674efee00a756667a9f8':
OOM at com.android.mms.ui.UriImage.getResizedImageData
e8e0d2714a53fa942ef95f5e7b89f2d3cc3a69b8 04-Dec-2010 James Dong <jdong@google.com> Squash commits of the following patchs cherry-picked from other branch - do not merge.

o Replace call to MediaMetadataRetriever.captureFrame() with MediaMetadataRetriver.getFrameAtTime()
as part of the preparation for publishing MediaMetadataRetriever java API

o Don't call MediaMetadataRetriever.setMode(), which is going to be removed.

bug - 3309041

Change-Id: Ic9b33a0dad21e5bc96b21b2717de2e1c41f6c479
ms/model/MediaModel.java
ms/ui/VideoAttachmentView.java
9fc15ab6ccea3fcb6f9a2efa83d739e112259b72 12-Jan-2011 James Dong <jdong@google.com> am e19a5047: Don\'t call MediaMetadataRetriever.setMode(), which is going to be removed.

* commit 'e19a50478c80a27d94694ee4af251e0206914b87':
Don't call MediaMetadataRetriever.setMode(), which is going to be removed.
c796df2dcadf7d6f39b9b687c4308a77094e8b2c 11-Jan-2011 Tom Taylor <tomtaylor@google.com> am 9bb7fdfb: am 33bfa9ef: Merge "Fix recycler NPE" into gingerbread

* commit '9bb7fdfb2a6af499fb3262c2aa9b2b0e003e220c':
Fix recycler NPE
475c9b2be706487b2d725228530ef68c6f92e631 11-Jan-2011 Tom Taylor <tomtaylor@google.com> am 8fedfa14: Fix java.lang.IllegalStateException: attempt to re-open an already-closed object

* commit '8fedfa146fe3704cafcade6f050bf30ee42699cb':
Fix java.lang.IllegalStateException: attempt to re-open an already-closed object
18965cdbabee1381546b674efee00a756667a9f8 11-Jan-2011 Tom Taylor <tomtaylor@google.com> am 0ca1428f: OOM at com.android.mms.ui.UriImage.getResizedImageData

* commit '0ca1428f36dce56a402e19d6b6c04c4c1cc1e69a':
OOM at com.android.mms.ui.UriImage.getResizedImageData
8fedfa146fe3704cafcade6f050bf30ee42699cb 11-Jan-2011 Tom Taylor <tomtaylor@google.com> Fix java.lang.IllegalStateException: attempt to re-open an already-closed object

Wrong cursor getting closed. Bug 3338157

Change-Id: I13d7233a0aafa4a363766b64a8a3bf5aa7990f8c
ms/util/Recycler.java
0ca1428f36dce56a402e19d6b6c04c4c1cc1e69a 06-Jan-2011 Tom Taylor <tomtaylor@google.com> OOM at com.android.mms.ui.UriImage.getResizedImageData

Recycle the bitmap each time through the loop and catch OOM when we
try and convert the bitmap to a byte array. Bug 3263587

Change-Id: I83dde7ed10f18ad6a6f81ca34babe4e455a5ec42
ms/ui/UriImage.java
e19a50478c80a27d94694ee4af251e0206914b87 07-Jan-2011 James Dong <jdong@google.com> Don't call MediaMetadataRetriever.setMode(), which is going to be removed.

bug - 2433195

Change-Id: Ia85bcfbce95d183061ba5dee76fe1ded4d1680ed
ms/model/MediaModel.java
ms/ui/VideoAttachmentView.java
9bb7fdfb2a6af499fb3262c2aa9b2b0e003e220c 07-Jan-2011 Tom Taylor <tomtaylor@google.com> am 33bfa9ef: Merge "Fix recycler NPE" into gingerbread

* commit '33bfa9ef9648ab090c1913a8debac5bb49a84d31':
Fix recycler NPE
cd3e6c33df50eafedb9a8b765770ffe49b138fe1 06-Jan-2011 Tom Taylor <tomtaylor@google.com> Fix recycler NPE

It's caused by getting back a null cursor from a query. There are other
places in the code where we could get null cursors. Fixed 'em. Also,
the cursor wasn't getting closed. Fixed that too. Bug 3315962

Change-Id: Ifff2b35cf25627847376131a16686d3420a21946
ms/util/Recycler.java
72ab3ecfa3556866ee51b822f8ce5b1f2f117545 05-Jan-2011 Tom Taylor <tomtaylor@google.com> Merge changes from gingerbread

Manually merge some of the gingerbread changes that didn't get auto-merged
back into master.

Change-Id: Ibfea8d1317f16717e5cb3f2ea1ec6c16a9ab9b83
ms/LogTag.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
63e1e43eba8a1c47bf6895055046bc126e70c38b 05-Jan-2011 Wei Huang <weih@google.com> am 048de832: am 94263ffe: bug #3057952: remove and turn off verbose logging done for this bug.

* commit '048de8327650c65e9e0df591f13a9d4870528fd8':
bug #3057952: remove and turn off verbose logging done for this bug.
048de8327650c65e9e0df591f13a9d4870528fd8 05-Jan-2011 Wei Huang <weih@google.com> am 94263ffe: bug #3057952: remove and turn off verbose logging done for this bug.

* commit '94263ffe93fedcbd2ce3a8fffe44e36a3b0acebd':
bug #3057952: remove and turn off verbose logging done for this bug.
94263ffe93fedcbd2ce3a8fffe44e36a3b0acebd 05-Jan-2011 Wei Huang <weih@google.com> bug #3057952: remove and turn off verbose logging done for this bug.

Change-Id: I85c14abfccb35d3d4f9c80cba14642f5cb2fb1fc
ms/LogTag.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationListAdapter.java
de129d0282be10ff51d3a0fd8b56d3dd89b5e871 05-Jan-2011 Tom Taylor <tomtaylor@google.com> am 7628dd31: am 8c9d1ba7: Sms sent to wrong recipient

* commit '7628dd31687c3490924076b51d67fa432c96b95a':
Sms sent to wrong recipient
7628dd31687c3490924076b51d67fa432c96b95a 05-Jan-2011 Tom Taylor <tomtaylor@google.com> am 8c9d1ba7: Sms sent to wrong recipient

* commit '8c9d1ba7193db210cf3930f8814b4a320f2d6188':
Sms sent to wrong recipient
8c9d1ba7193db210cf3930f8814b4a320f2d6188 05-Jan-2011 Tom Taylor <tomtaylor@google.com> Sms sent to wrong recipient

Remove the empty conversation from the conversation cache.
Bug 3057952

Change-Id: I5b208f5d071dac89af0ac9bd5af43b0286bbf60f
ms/data/WorkingMessage.java
907335c0dc5b187de4b1123be4c5150e7582b1e5 04-Jan-2011 Tom Taylor <tomtaylor@google.com> am 2fa88786: am d2ff1f81: Notification goes to conv list

* commit '2fa88786d3b0ddf0c2af1b4f8664800060880833':
Notification goes to conv list
2fa88786d3b0ddf0c2af1b4f8664800060880833 04-Jan-2011 Tom Taylor <tomtaylor@google.com> am d2ff1f81: Notification goes to conv list

* commit 'd2ff1f81a3f68f99a8d62fc61256e6bc94ae45a7':
Notification goes to conv list
d2ff1f81a3f68f99a8d62fc61256e6bc94ae45a7 04-Jan-2011 Tom Taylor <tomtaylor@google.com> Notification goes to conv list

Selecting sms notification often goes to conversation list instead
of the individual conversation. Bug 3322081

Change-Id: I67382208daea657b46593d82b23c6d2461414331
ms/ui/ComposeMessageActivity.java
47fc9c9d5c3931bc6445dd758202413dd8c3f1be 04-Jan-2011 Wei Huang <weih@google.com> am af6a1ffd: am a7ce913d: bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

* commit 'af6a1ffd92a645e01ba3f6f82a65ef1a2e6ddfec':
bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.
af6a1ffd92a645e01ba3f6f82a65ef1a2e6ddfec 04-Jan-2011 Wei Huang <weih@google.com> am a7ce913d: bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

* commit 'a7ce913d3b55de6e5808e8b29e50e186a2d4e96a':
bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.
a7ce913d3b55de6e5808e8b29e50e186a2d4e96a 04-Jan-2011 Wei Huang <weih@google.com> bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

- the code in ConversationList.onListItemClicked() was extracting the conversation data
from the ConversationListItem view passed in. However, ListItem views can be recycled
when rebound, so the view we got could now be reassigned to a different list position
and contain different data.

Intead of depend on ConversationListItem to store the conversation data, always load
the cursor at the position clicked, and get the conversation data from the cursor.

Change-Id: I4ce80a323771a3f0f91f2f62da17af9cc02a5084
ms/ui/ConversationList.java
9337760339d7d3a1cace8a2acfc2df7e50219a89 03-Jan-2011 Wei Huang <weih@google.com> Merge commit 'f9466d4b' into manualmerge

Conflicts:
src/com/android/mms/data/WorkingMessage.java
src/com/android/mms/ui/ComposeMessageActivity.java

Change-Id: If66a2c8d1573c09fc47b94c56915c916720a607c
f9466d4b6ab819f0a501598365ae2189efed0b60 03-Jan-2011 Wei Huang <weih@google.com> am 858d59e9: bug #3057952: add bunch more debugging info to catch this bug.

* commit '858d59e9f4b0839ee014e52e0744ea910d9830ff':
bug #3057952: add bunch more debugging info to catch this bug.
858d59e9f4b0839ee014e52e0744ea910d9830ff 03-Jan-2011 Wei Huang <weih@google.com> bug #3057952: add bunch more debugging info to catch this bug.

Change-Id: I3ea9bd19adcf177697536cc56ab079957f863463
ms/LogTag.java
ms/data/WorkingMessage.java
ms/transaction/SmsReceiverService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
965b6659aa2d779c924d7c2e76fcd7af8c7ba4b8 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 9d60978e: am 0a693130: Merge "Corrected message size calculation when replacing resizable media"

* commit '9d60978eb50ec13bd6f5c1297fca32441b36c4d7':
Corrected message size calculation when replacing resizable media
9d60978eb50ec13bd6f5c1297fca32441b36c4d7 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 0a693130: Merge "Corrected message size calculation when replacing resizable media"

* commit '0a6931302edb9c3b1997f0d7b87ac712fcfbad81':
Corrected message size calculation when replacing resizable media
0a6931302edb9c3b1997f0d7b87ac712fcfbad81 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Corrected message size calculation when replacing resizable media"
4dbb2b9b7786d168b36f6af101456315dcb75039 16-Dec-2010 Tom Taylor <tomtaylor@google.com> Need to trim mmsc and apn url

Tested by duplicating the Italian situation by adding a leading
space to the APN used on my phone. Bug 3261633

Change-Id: I0dd527b0bb7e68ddf7c7233d0963f020519c4d11
ms/MmsConfig.java
4799c671cd7925c7d8098bc3a743c0e83701bb34 15-Dec-2010 Matthias Thomae <matthias.thomae@teleca.com> Corrected message size calculation when replacing resizable media

Replacing resizable media in Slideshow will yield in an incorrect
message size. An exception will be thrown when validating the size and
the application will crash. This change fixes this problem.
ms/model/SlideModel.java
a8b5cd4b01702c42f14fe9606e5f0e440878d89a 11-Dec-2010 Tom Taylor <tomtaylor@google.com> am 96b12710: am 1d925f76: Merge "Need to trim mmsc and apn url" into gingerbread

* commit '96b127108b20806fbfe657b69d66cf7fe2bbc2e4':
Need to trim mmsc and apn url
96b127108b20806fbfe657b69d66cf7fe2bbc2e4 11-Dec-2010 Tom Taylor <tomtaylor@google.com> am 1d925f76: Merge "Need to trim mmsc and apn url" into gingerbread

* commit '1d925f76e876f7c53230970a5eb0b40bb3d511ce':
Need to trim mmsc and apn url
42d0a22c3cc61db207f760e4b250372ef21da58b 11-Dec-2010 Tom Taylor <tomtaylor@google.com> Need to trim mmsc and apn url

Tested by duplicating the Italian situation by adding a leading
space to the APN used on my phone. Bug 3261633

Change-Id: Ia5a546a330bd055464b9100d04755d2729d9d3d5
ms/transaction/TransactionSettings.java
5d312358976593f032f6e4383bb8e923d68dab96 04-Dec-2010 James Dong <jdong@google.com> Replace call to MediaMetadataRetriever.captureFrame() with MediaMetadataRetriver.getFrameAtTime()

as part of the preparation for publishing MediaMetadataRetriever java API

bug - 2433195

Change-Id: I99f278045fb9e4064ee4c572b6d249bd472e057a
ms/ui/VideoAttachmentView.java
be53d0c18809a324f9f69d8a3c9a408d841eb964 03-Nov-2010 Brad Fitzpatrick <bradfitz@android.com> am 4ef1d3e8: am 754b6b13: Merge "Add support for chunked encoding when downloading MMS PDUs"

* commit '4ef1d3e87830995cb6973879622fc8aef8572105':
Add support for chunked encoding when downloading MMS PDUs
60cbbe405bffddf13ed723b6d2181d7b93e71fe1 02-Nov-2010 Jeff Brown <jeffbrown@google.com> Add plumbing for new volume mute key.

Making behavior consistent with other volume keys that the
application explicitly ignores.

Bug: 2912307
Change-Id: Ie11c09af38530c9522144ad8699668a2165c7419
ms/ui/SlideshowActivity.java
4ef1d3e87830995cb6973879622fc8aef8572105 02-Nov-2010 Brad Fitzpatrick <bradfitz@android.com> am 754b6b13: Merge "Add support for chunked encoding when downloading MMS PDUs"

* commit '754b6b1317b1fa3a3fad69c1cbbecd22a2e99a06':
Add support for chunked encoding when downloading MMS PDUs
208b7834ee01388a5fecacf00a9c1e1b8ffc5240 06-Oct-2010 Matthias Thomae <matthias.thomae@teleca.com> Add support for chunked encoding when downloading MMS PDUs

Some networks use chunked encoding for MMS delivery, meaning that
the content length is not known beforehand. The Android MMS
application did not support chunked encoding, so downloading MMS
on these networks would simply fail.

The change adds chunked encoding functionality by reading data
from the stream until EOF, instead of relying on the Content-Length
HTTP header.
ms/transaction/HttpUtils.java
56ee740f49cde993ef8de79c30b4da7c14dc76ad 23-Oct-2010 Jason Chen <jasonchen@google.com> resolved conflicts for merge of 77dc8fc2 to master

Change-Id: I11ea6cc31d316f200ac1ea3bec8247176fd5ff28
77dc8fc2c1dd7d7dfc0961673a2d65715b9195a5 23-Oct-2010 Tom Taylor <tomtaylor@google.com> am 006a8435: Merge "Turn off messaging app\'s SEVERE_WARNING" into gingerbread

Merge commit '006a84356e055204e3756632b03697d2a661694c' into gingerbread-plus-aosp

* commit '006a84356e055204e3756632b03697d2a661694c':
Turn off messaging app's SEVERE_WARNING
8543b9ffab4a6fba08af8ece77573c7ec5dc6974 23-Oct-2010 Tom Taylor <tomtaylor@google.com> Turn off messaging app's SEVERE_WARNING

Bug 3062274

Change-Id: I100914f4f31bf74c2cc79e784f38cd0fc33143d1
ms/LogTag.java
e91fc33da1df4a8e8600988ba4b577595d14890e 19-Oct-2010 Tom Taylor <tomtaylor@google.com> am 4d72768e: Prepare for turning off extensive logging

Merge commit '4d72768e5f149a6bcd40604d1e2741795cc86ebf' into gingerbread-plus-aosp

* commit '4d72768e5f149a6bcd40604d1e2741795cc86ebf':
Prepare for turning off extensive logging
4d72768e5f149a6bcd40604d1e2741795cc86ebf 18-Oct-2010 Tom Taylor <tomtaylor@google.com> Prepare for turning off extensive logging

Bug 3062274

Change-Id: I02dbc06b6502d8f50ba7bb2dca367623364adc40
ms/LogTag.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
64f30b7a225d4cdc2b11d1855b589e0b6b1519ff 16-Oct-2010 Tom Taylor <tomtaylor@google.com> am 06e1b2ae: am 9b9f5da8: Fix crash logging exception

Merge commit '06e1b2aec57cea234775054abfec862792547088'

* commit '06e1b2aec57cea234775054abfec862792547088':
Fix crash logging exception
06e1b2aec57cea234775054abfec862792547088 15-Oct-2010 Tom Taylor <tomtaylor@google.com> am 9b9f5da8: Fix crash logging exception

Merge commit '9b9f5da86e17db206e0581704f41383ee0805049' into gingerbread-plus-aosp

* commit '9b9f5da86e17db206e0581704f41383ee0805049':
Fix crash logging exception
9b9f5da86e17db206e0581704f41383ee0805049 15-Oct-2010 Tom Taylor <tomtaylor@google.com> Fix crash logging exception

Bug 3099377. The rest of the code is full of lines like this:
Log.e(TAG, e.getMessage(), e);
I tested code like that and when getMessage() is null it
will log (but not crash):
E/MessageListAdapter( 2210): null
E/MessageListAdapter( 2210): com.google.android.mms.MmsException
E/MessageListAdapter( 2210): at com.android.mms.ui.MessageListAdapter.newView(MessageListAdapter.java:255)
E/MessageListAdapter( 2210): at android.widget.CursorAdapter.getView(CursorAdapter.java:182)

Change-Id: I728e20cc5f0d8e986d67d2964d04682645a550d4
ms/ui/MessageListAdapter.java
745eb44f8c34ec1c25867dd6af896f403589ac52 14-Oct-2010 Wink Saville <wink@google.com> Resolve merge conflicts for merge of f9037fd0 to master.

Change-Id: Ic28da12e1729d311a67fc7971951cfd9a9a6e8d7
f9037fd05d3782f14909fc481a4b90b8b8154b1e 12-Oct-2010 Wink Saville <wink@google.com> am ef1e257c: Remove some PII.

Merge commit 'ef1e257cbaa7f7085eda3a9b075eca79075aab89' into gingerbread-plus-aosp

* commit 'ef1e257cbaa7f7085eda3a9b075eca79075aab89':
Remove some PII.
ef1e257cbaa7f7085eda3a9b075eca79075aab89 12-Oct-2010 Wink Saville <wink@google.com> Remove some PII.

Change-Id: I846866881d79b985ea0bc6fa647f8e7a38e63a9b
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ec1a03a528fecd27e2f151ab6ff91ca7ce775059 11-Oct-2010 Tom Taylor <tomtaylor@google.com> am d667c0d2: Tighten recipient check

Merge commit 'd667c0d20a33ef48802048516098523df62553cb' into gingerbread-plus-aosp

* commit 'd667c0d20a33ef48802048516098523df62553cb':
Tighten recipient check
d667c0d20a33ef48802048516098523df62553cb 11-Oct-2010 Tom Taylor <tomtaylor@google.com> Tighten recipient check

When we send a message, the recips in the UI can be empty when the
user manually types in a number and hits send. prepareForSave() then
turns those working numbers into real recips. Add an extra test
for that situation before complaining of different recips.
Bug 3066322

Change-Id: I4aaa86138bc9aa817848b24cc5aac1c7718fe735
ms/data/WorkingMessage.java
e236714b6858b0df19ba285243399f7da1fa2655 11-Oct-2010 Channagoud Kadabi <ckadabi@codeaurora.org> am a068c7df: am 78d66fda: Apps/MMS: Fix memory leak due to excessive Jni global references

Merge commit 'a068c7dfe0491b6e6476d6ae9694598ce261c706'

* commit 'a068c7dfe0491b6e6476d6ae9694598ce261c706':
Apps/MMS: Fix memory leak due to excessive Jni global references
61f7564d146f338dbcc05340a6800446f892b121 11-Oct-2010 Tom Taylor <tomtaylor@google.com> am 68b0fa23: am 5408cfe5: Merge "Call dialog.dismiss()" into gingerbread

Merge commit '68b0fa23f7ecd5e4d8775d8cb2d5e7bb9bba17cf'

* commit '68b0fa23f7ecd5e4d8775d8cb2d5e7bb9bba17cf':
Call dialog.dismiss()
a068c7dfe0491b6e6476d6ae9694598ce261c706 10-Oct-2010 Channagoud Kadabi <ckadabi@codeaurora.org> am 78d66fda: Apps/MMS: Fix memory leak due to excessive Jni global references

Merge commit '78d66fda7935a5af739d76eccee667d63e260137' into gingerbread-plus-aosp

* commit '78d66fda7935a5af739d76eccee667d63e260137':
Apps/MMS: Fix memory leak due to excessive Jni global references
68b0fa23f7ecd5e4d8775d8cb2d5e7bb9bba17cf 09-Oct-2010 Tom Taylor <tomtaylor@google.com> am 5408cfe5: Merge "Call dialog.dismiss()" into gingerbread

Merge commit '5408cfe51d74a80897875841f1554a3ca6117547' into gingerbread-plus-aosp

* commit '5408cfe51d74a80897875841f1554a3ca6117547':
Call dialog.dismiss()
5408cfe51d74a80897875841f1554a3ca6117547 09-Oct-2010 Tom Taylor <tomtaylor@google.com> Merge "Call dialog.dismiss()" into gingerbread
db2510144e38af991b424584e6dc42766b9e1a1a 09-Oct-2010 Tom Taylor <tomtaylor@google.com> am ca8c3f60: Fix too strict scary message

Merge commit 'ca8c3f609566ac750fdbd2b01d8983b299faf5d6' into gingerbread-plus-aosp

* commit 'ca8c3f609566ac750fdbd2b01d8983b299faf5d6':
Fix too strict scary message
ca8c3f609566ac750fdbd2b01d8983b299faf5d6 09-Oct-2010 Tom Taylor <tomtaylor@google.com> Fix too strict scary message

Don't check threadIds in syncWorkingRecipients. Instead, check recipients
across a call to prepareForSave in send. Bug 3076599

Change-Id: I26f12370bfb7e42196194edd1374ca2b89997595
ms/data/WorkingMessage.java
c4a34a0ccd414e2bba937e8abd105a0383afff35 09-Oct-2010 Tom Taylor <tomtaylor@google.com> Call dialog.dismiss()

In many of the click handlers, we neglected to dismiss the dialog.
Bug 3072307

Change-Id: Ie461492394c9f29ce2a7bb6e7f00a93068ea2bf8
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ManageSimMessages.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/NumberPickerDialog.java
ms/ui/SlideEditorActivity.java
ms/ui/WarnOfStorageLimitsActivity.java
4759133e3c935e751815bf4f997d029caa64d889 29-Sep-2010 Bai Tao <michaelbai@google.com> Applied the new phone number formatting and caller id lookup method

Change-Id: I8caa7138e7ef58849530904cb371c0801b47883d
ms/MmsApp.java
ms/data/Contact.java
ms/ui/MessageListItem.java
ms/ui/RecipientsAdapter.java
68e89f9fa27ccb67c11537887357f57bc821305d 06-Oct-2010 Tom Taylor <tomtaylor@google.com> am e28d2fe9: Loosen recipients check

Merge commit 'e28d2fe95c2ef64be593b75dcc61d41caf8d2f51' into gingerbread-plus-aosp

* commit 'e28d2fe95c2ef64be593b75dcc61d41caf8d2f51':
Loosen recipients check
e28d2fe95c2ef64be593b75dcc61d41caf8d2f51 06-Oct-2010 Tom Taylor <tomtaylor@google.com> Loosen recipients check

A valid sending scenario was found where we were complaining the
recipients didn't match. Bug 3066322

Change-Id: I53da6a9a9d063d09826ce7f955a2dfaaf0633b38
ms/data/WorkingMessage.java
7fc7167953c8fa18e7b32558df37316df146536f 05-Oct-2010 Tom Taylor <tomtaylor@google.com> am b03467f0: Merge "Add debugging code" into gingerbread

Merge commit 'b03467f0b1a94deb2ad3bf0e2b6fde8522f62f5b' into gingerbread-plus-aosp

* commit 'b03467f0b1a94deb2ad3bf0e2b6fde8522f62f5b':
Add debugging code
b6e4518a7b3740e48fd03f3803cc8696f15bbcc7 05-Oct-2010 Tom Taylor <tomtaylor@google.com> Add debugging code

Add a number of tests to try and track down the situation that causes
a message to be sent to the wrong recipient. Bug 3057952

Change-Id: I2da3e91dcb039e87c3222e48026b859d1644793e
ms/LogTag.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
78d66fda7935a5af739d76eccee667d63e260137 29-Sep-2010 Channagoud Kadabi <ckadabi@codeaurora.org> Apps/MMS: Fix memory leak due to excessive Jni global references

When the ComposeMessageActivity is destroyed, the cursor for
RecipientsAdapter is not getting closed. This leads to increase in
number of Jni references each time the ComposeMessageActivity is
opened. Thus closing the cursor for RecipientsAdapter accordingly
to avoid cursor leaks.

Change-Id: I98f33e9681ceca7fb5485e277fe3c6a529163c28
ms/ui/ComposeMessageActivity.java
18bbda062345d62c9094a501e1efad8c1aa2f0c7 17-Sep-2010 Tom Taylor <tomtaylor@google.com> am 61d72c1a: am 93b7a8bf: Dismiss dialog

Merge commit '61d72c1acfa50dfa610e838ff43e45cbb6897c0a'

* commit '61d72c1acfa50dfa610e838ff43e45cbb6897c0a':
Dismiss dialog
4734e1c003d520777a150e66b1c3ba592751de7a 17-Sep-2010 Tom Taylor <tomtaylor@google.com> am 577fb121: am 3b13ad40: Fix multi-image attachment

Merge commit '577fb12193a633a59177588145a0ac5e5dd81d99'

* commit '577fb12193a633a59177588145a0ac5e5dd81d99':
Fix multi-image attachment
61d72c1acfa50dfa610e838ff43e45cbb6897c0a 17-Sep-2010 Tom Taylor <tomtaylor@google.com> am 93b7a8bf: Dismiss dialog

Merge commit '93b7a8bfa72a932843ecc7de4c9f9baec4ee2087' into gingerbread-plus-aosp

* commit '93b7a8bfa72a932843ecc7de4c9f9baec4ee2087':
Dismiss dialog
577fb12193a633a59177588145a0ac5e5dd81d99 17-Sep-2010 Tom Taylor <tomtaylor@google.com> am 3b13ad40: Fix multi-image attachment

Merge commit '3b13ad40393f44e16bc65c8df5abc76f1c6fc754' into gingerbread-plus-aosp

* commit '3b13ad40393f44e16bc65c8df5abc76f1c6fc754':
Fix multi-image attachment
93b7a8bfa72a932843ecc7de4c9f9baec4ee2087 17-Sep-2010 Tom Taylor <tomtaylor@google.com> Dismiss dialog

Dismiss the dialog and don't leak the window.
Bug 2675689

Change-Id: Iacaff5e6463c7cbef41ab09c80b6512d50aa5b35
ms/ui/MessageUtils.java
3b13ad40393f44e16bc65c8df5abc76f1c6fc754 17-Sep-2010 Tom Taylor <tomtaylor@google.com> Fix multi-image attachment

Handle the case where building a PDU part returns null. Tested by
forcing this code path to occur. The user sees a toast and the Mms message
is put into the error state (with visible error icon).
Bug 2938634

Change-Id: I8043fce21080f3b8073aed03b7f194406acf4768
ms/model/ImageModel.java
7b9797e295d2c29bd92c602f1977bbf7e5bc713f 16-Sep-2010 Tom Taylor <tomtaylor@google.com> am 0659dce5: am 5a3151ad: Handle OutOfMemory when decoding images

Merge commit '0659dce52637221486f545778f741655370a8015'

* commit '0659dce52637221486f545778f741655370a8015':
Handle OutOfMemory when decoding images
0659dce52637221486f545778f741655370a8015 16-Sep-2010 Tom Taylor <tomtaylor@google.com> am 5a3151ad: Handle OutOfMemory when decoding images

Merge commit '5a3151adedd991252dd529c75e85a3374970dfb0' into gingerbread-plus-aosp

* commit '5a3151adedd991252dd529c75e85a3374970dfb0':
Handle OutOfMemory when decoding images
5a3151adedd991252dd529c75e85a3374970dfb0 16-Sep-2010 Tom Taylor <tomtaylor@google.com> Handle OutOfMemory when decoding images

Decoding images and videos in the messaging app appears to be a
vulnerable point for running out of memory. Catch those exceptions,
log an error, and continue on without loading the image. Most of these
"catches" are around situations where there's been a problem decoding
the original image in the first place, and now we're simply trying
to decode a small missing stand-in image. However, since BitmapFactory.decodeResource
seems to be in an inordinate number of bug reports, I want to log every
use in the code in case of failure.
Handles the 2nd part of bug 2994057.

Change-Id: Iaa8035f6ef28385b353d31507b9753934881d3e8
ms/ui/BasicSlideEditorView.java
ms/ui/ImageAttachmentView.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/UriImage.java
ms/ui/VideoAttachmentView.java
db55e919fd703e09b314ed949b994c910776f88d 16-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am b9a10410: am 415dc85e: Don\'t do disk writes on the UI thread when updating cache.

Merge commit 'b9a1041030f13a990d6313314a4d39f569cb3b21'

* commit 'b9a1041030f13a990d6313314a4d39f569cb3b21':
Don't do disk writes on the UI thread when updating cache.
b9a1041030f13a990d6313314a4d39f569cb3b21 15-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 415dc85e: Don\'t do disk writes on the UI thread when updating cache.

Merge commit '415dc85e9a69638b69c097cc3f263a48712be3d9' into gingerbread-plus-aosp

* commit '415dc85e9a69638b69c097cc3f263a48712be3d9':
Don't do disk writes on the UI thread when updating cache.
415dc85e9a69638b69c097cc3f263a48712be3d9 15-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> Don't do disk writes on the UI thread when updating cache.

Fixes some of the more common StrictMode violations.

Change-Id: Ica4373ec20a6040642cee035f1e7eafdcdc2af67
ms/data/RecipientIdCache.java
61bb6e23aeeea4ccad1c772b61bc50b740da5635 11-Sep-2010 Tom Taylor <tomtaylor@google.com> am 7f2c0cbd: am 1e59e424: Thread call start

Merge commit '7f2c0cbda8fbe92fc26ca7069a20728ecf24a4ef'

* commit '7f2c0cbda8fbe92fc26ca7069a20728ecf24a4ef':
Thread call start
7f2c0cbda8fbe92fc26ca7069a20728ecf24a4ef 11-Sep-2010 Tom Taylor <tomtaylor@google.com> am 1e59e424: Thread call start

Merge commit '1e59e424b57c0b63125415c720a7e815f2802caa' into gingerbread-plus-aosp

* commit '1e59e424b57c0b63125415c720a7e815f2802caa':
Thread call start
1e59e424b57c0b63125415c720a7e815f2802caa 10-Sep-2010 Tom Taylor <tomtaylor@google.com> Thread call start

A thread was calling run() instead of start(). Add names to the
threads in this file. Gingerbread bug 2991885.

Change-Id: I20f144b53c96227f977340d4a69bc68311403ed5
ms/ui/ComposeMessageActivity.java
d1543152f704c8a2f9d5347b7cb507da5beed0f8 31-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> am b291345c: am d4ab73b7: Use new apply() instead of commit().

Merge commit 'b291345cb96dc54bd61c9553f70589cfe56ce8f0'

* commit 'b291345cb96dc54bd61c9553f70589cfe56ce8f0':
Use new apply() instead of commit().
b291345cb96dc54bd61c9553f70589cfe56ce8f0 31-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> am d4ab73b7: Use new apply() instead of commit().

Merge commit 'd4ab73b7483ba8a92a96235474070fbf5c10244c' into gingerbread-plus-aosp

* commit 'd4ab73b7483ba8a92a96235474070fbf5c10244c':
Use new apply() instead of commit().
d4ab73b7483ba8a92a96235474070fbf5c10244c 27-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> Use new apply() instead of commit().

apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I126fa7cb5d02a2c30721eb702ecf5bd9d9376b17
ms/ui/ConversationList.java
ms/ui/MessagingPreferenceActivity.java
ms/util/Recycler.java
08de94733d5c2137b2129e46b959d07b875f3349 24-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 6533731c: am a2baaf62: Merge "Mms: Delivery report should display recent message details."

Merge commit '6533731c757765f43e6a70bc1b62825c868de790'

* commit '6533731c757765f43e6a70bc1b62825c868de790':
Mms: Delivery report should display recent message details.
ace7f65e4473b2ca62a6e9e80c7bf25d517da826 24-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> am 9594c0b5: am 3234c38f: Mms: Fix for sending long SMS to multiple recipients

Merge commit '9594c0b5c33773280ed0c90b9ba70ca8e66fc1bf'

* commit '9594c0b5c33773280ed0c90b9ba70ca8e66fc1bf':
Mms: Fix for sending long SMS to multiple recipients
6533731c757765f43e6a70bc1b62825c868de790 23-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am a2baaf62: Merge "Mms: Delivery report should display recent message details."

Merge commit 'a2baaf62985329697a3fbcc5c4e5c073c91c465a' into gingerbread-plus-aosp

* commit 'a2baaf62985329697a3fbcc5c4e5c073c91c465a':
Mms: Delivery report should display recent message details.
a2baaf62985329697a3fbcc5c4e5c073c91c465a 23-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Mms: Delivery report should display recent message details."
9594c0b5c33773280ed0c90b9ba70ca8e66fc1bf 21-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> am 3234c38f: Mms: Fix for sending long SMS to multiple recipients

Merge commit '3234c38f1f1cc34324edaab2b2308ab2fffd08dc' into gingerbread-plus-aosp

* commit '3234c38f1f1cc34324edaab2b2308ab2fffd08dc':
Mms: Fix for sending long SMS to multiple recipients
3234c38f1f1cc34324edaab2b2308ab2fffd08dc 26-Jul-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> Mms: Fix for sending long SMS to multiple recipients

When a long SMS is sent to multiple recipients, it is sent only to the first
recipient. MMS app checks extra EXTRA_MESSAGE_SENT_SEND_NEXT for true before
sending SMS to other recipients. Since same pending intent is used for all
fragments, this is never true. Fixed this issue by using differnet pending
intent for last fragment with extra EXTRA_MESSAGE_SENT_SEND_NEXT set to true.

Change-Id: I9f61274e0f20698544090419a85e0e6b8daff3e0
ms/transaction/SmsSingleRecipientSender.java
d2d14e8398a01d035f2703f4309c766f4acf2aa4 10-Aug-2010 Tom Taylor <tomtaylor@google.com> am a5c677a3: am 444f4d20: Merge "Move failed message to failed state" into gingerbread

Merge commit 'a5c677a390386d580a5077fdc920cc7f03d28b6d'

* commit 'a5c677a390386d580a5077fdc920cc7f03d28b6d':
Move failed message to failed state
6a9c779f0c0dc6cf3ae942ff70fb6c806aa166dc 04-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> Mms: Delivery report should display recent message details.

On sending SMS to multiple recipients with delivery reports enabled,
the delivery reports for all the recipients display the details of first
recipient since the time stamps are same. To fix this, need to query in
the ascending order and display the details of last message which is the
most recent message.

Change-Id: I9917a7a3fd56daceccdc9fdc5f3cf1294c22c320
ms/transaction/MessagingNotification.java
13848bd88f29a358d13c2ce49f5c90c5858296f2 03-Aug-2010 Tom Taylor <tomtaylor@google.com> Move failed message to failed state

When we try and send a message and the telephony layer throws an
exception, move that message to the failed state. Otherwise, it
perpetually remains in the outbox and shows as "Sending..." to the
user. Bug 2885780.

Change-Id: Ic2ba789c24a9ed0842c51102c2e424ce1a2d9905
ms/transaction/SmsReceiverService.java
c8d1dbb68fbd6214a3160114b63a3a48bf2f074b 24-Jun-2010 Tom Taylor <tomtaylor@google.com> am 2b7da074: Fix mismash message

Merge commit '2b7da074e10ceb0e04cc205efe721092781f2712' into froyo-plus-aosp

* commit '2b7da074e10ceb0e04cc205efe721092781f2712':
Fix mismash message
2b7da074e10ceb0e04cc205efe721092781f2712 24-Jun-2010 Tom Taylor <tomtaylor@google.com> Fix mismash message

DO NOT MERGE
A particular set of repo steps involving creating a draft, then deleting
the draft and then receiving a new message can lead to a situation where
a new incoming message gets the old thread id of the discarded
draft. The compose activity can end up displaying the recipients of the
old message with the contents of the new message. Recognize this dangerous
situation and bail out to the ConversationList where the user can
enter the compose activity in a clean manner.
Bug 2793874

Change-Id: I04727de3908e3c50d4687cb6e2a9cc6589daed9c
ms/ui/ComposeMessageActivity.java
10bfaebfa14563131d16296016c7333931c768e7 24-Jun-2010 Tom Taylor <tomtaylor@google.com> am 3efee808: am 9c4ff11d: Fix mismash message

Merge commit '3efee8088bc65ff5e926b333498ae93820682c15'

* commit '3efee8088bc65ff5e926b333498ae93820682c15':
Fix mismash message
9c4ff11dd546f48b68216d931b3bf7c1176657c4 24-Jun-2010 Tom Taylor <tomtaylor@google.com> Fix mismash message

A particular set of repo steps involving creating a draft, then deleting
the draft and then receiving a new message can lead to a situation where
a new incoming message gets the old thread id of the discarded
draft. The compose activity can end up displaying the recipients of the
old message with the contents of the new message. Recognize this dangerous
situation and bail out to the ConversationList where the user can
enter the compose activity in a clean manner.
Bug 2793874

Change-Id: I795ed6e1d95d9c1a2d1093a2491ca8c449ff2609
ms/ui/ComposeMessageActivity.java
fcee445de78ac2ddb9aafdff0a5967afca1e5d93 19-Jun-2010 Wei Huang <weih@google.com> am 3ed67ccc: am 0d4f90a1: am 7bb3d8cf: bug #2780967: fix SMS sending message to the wrong person.

Merge commit '3ed67cccdb386075cf3e07569c45ee49d4691174'

* commit '3ed67cccdb386075cf3e07569c45ee49d4691174':
bug #2780967: fix SMS sending message to the wrong person.
b30f28b141cfaee956c10baadafb0a782c82a848 19-Jun-2010 Wei Huang <weih@google.com> am 7bb3d8cf: bug #2780967: fix SMS sending message to the wrong person.

Merge commit '7bb3d8cf74ec1e4ae18cb814c17e12a00816f105' into froyo-plus-aosp

* commit '7bb3d8cf74ec1e4ae18cb814c17e12a00816f105':
bug #2780967: fix SMS sending message to the wrong person.
0d4f90a1d56d978184002f1aba70ee93b71c3602 19-Jun-2010 Wei Huang <weih@google.com> am 7bb3d8cf: bug #2780967: fix SMS sending message to the wrong person.

Merge commit '7bb3d8cf74ec1e4ae18cb814c17e12a00816f105' into gingerbread

* commit '7bb3d8cf74ec1e4ae18cb814c17e12a00816f105':
bug #2780967: fix SMS sending message to the wrong person.
7bb3d8cf74ec1e4ae18cb814c17e12a00816f105 19-Jun-2010 Wei Huang <weih@google.com> bug #2780967: fix SMS sending message to the wrong person.

- there is an edge case where an old draft message (but w/ only recipient entered, no draft message) would confuse Compose activity to think it's the same
thread_id as a new message (coming into onNewIntent() from status notification). In that case, we don't re-initialize mConversation, which retained the old draft recipient

When the user sends a new message in that state, the message would be addressed to the old draft recipient instead of what's appearing in the UI.

Change-Id: Ic78c4343dc1d9a1639f586dcc8ac861adf73f44f
ms/ui/ComposeMessageActivity.java
02c982b20c915fe8488d6a78946523a42a705170 18-May-2010 Vasu Nori <vnori@google.com> add API to Cursor to get column value type

Change-Id: I1f34264ff6dc6bda1ab67b279d4c6e8cdede1ca8
ms/SuggestionsProvider.java
35a94aa64ae532264097086ffcfce5b364b3cc87 26-May-2010 Mark Wagner <mxw@google.com> am 6b535547: move synchronization fix over from master

Merge commit '6b535547dbd34d2a45ca66e08c22a79243451ebd' into froyo-plus-aosp

* commit '6b535547dbd34d2a45ca66e08c22a79243451ebd':
move synchronization fix over from master
6b535547dbd34d2a45ca66e08c22a79243451ebd 26-May-2010 Mark Wagner <mxw@google.com> move synchronization fix over from master

Bugfix 2622197. Move this change over from master.

Change-Id: Ia965a457db575cbb990e8c6edd9b771b45b75cfd
ms/data/Contact.java
574c33bcccbb888d8126d444da330dc57ea7fc2b 22-May-2010 Tom Taylor <tomtaylor@google.com> Fix ANR

Move debug function of writing out hprof data under a debug flag.
Bug 2683746.

Change-Id: I6a313484b66801913be1236f1e7eae5fe15b3c91
ms/model/ImageModel.java
9be3e96a1f268d9cb81c59925b406565f7ed9aa4 19-May-2010 Mark Wagner <mxw@google.com> Merge "get this synchronization right"
c1e681e5952e6261a7ebce0a083aa8d4e1b03e88 19-May-2010 Tom Taylor <tomtaylor@google.com> am b451a522: am 9653d43d: bug #2641505: when the SIM card doesn\'t have the MSISDN, sending MMS fails.
b45f4f5d4a97f9adb4d9562026caf8b2cbfd7309 19-May-2010 Wei Huang <weih@google.com> am 8f84adfa: am d669a2b2: bug #2694518: remove Google Voice private API in MMS app per discussion with team.
b451a522b2847834b9063d92c4af7291849d551e 19-May-2010 Tom Taylor <tomtaylor@google.com> am 9653d43d: bug #2641505: when the SIM card doesn\'t have the MSISDN, sending MMS fails.

Merge commit '9653d43dfe3713df14ef3567b124c5729543c5f2' into froyo-plus-aosp

* commit '9653d43dfe3713df14ef3567b124c5729543c5f2':
bug #2641505: when the SIM card doesn't have the MSISDN, sending MMS fails.
9653d43dfe3713df14ef3567b124c5729543c5f2 18-May-2010 Tom Taylor <tomtaylor@google.com> bug #2641505: when the SIM card doesn't have the MSISDN, sending MMS fails.

(merge baa290bb62ab5517a8501a90790b7a13ea41306c from Eclair)
Don't insert an empty or null number in the send request for MMS transaction. We'd get a NPE and fail to send the MMS message.

Change-Id: I04b0aafef1c73fec4d16be5411006b9576615f5c
ms/transaction/SendTransaction.java
8f84adfa4f31dca4160c50b86359bbf37ac3efa3 19-May-2010 Wei Huang <weih@google.com> am d669a2b2: bug #2694518: remove Google Voice private API in MMS app per discussion with team.

Merge commit 'd669a2b2fcde0f588944af6caaca814a1bd4e92d' into froyo-plus-aosp

* commit 'd669a2b2fcde0f588944af6caaca814a1bd4e92d':
bug #2694518: remove Google Voice private API in MMS app per discussion with team.
d669a2b2fcde0f588944af6caaca814a1bd4e92d 18-May-2010 Wei Huang <weih@google.com> bug #2694518: remove Google Voice private API in MMS app per discussion with team.

- we decided that we cannot have Google specific code in a platform application like MMS. Will revisit this feature in Gingerbread.

Change-Id: I5cf030a759be54ab32032a95141472a4fd89b5da
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
3487a66797bbf5339c59750c0d3d7fb703626730 18-May-2010 Mark Wagner <mxw@google.com> get this synchronization right

Bugfix 2680266. Finally get this right. We ended up synchronized in
one place on the Contact class object and in another place on the
ContactCache class object. Now, for simplicity, we just use the
list of listeners object to synchronize on.

Change-Id: I556cca4e992062211f88dd7e3b6247a44120ba01
ms/data/Contact.java
e14f5f2b09376537f17da2fdbbcf00cac378b824 18-May-2010 The Android Open Source Project <initial-contribution@android.com> am 2d51bcf4: merge from open-source master
2d51bcf4c1c06cc803907a8041922cce90739833 18-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I10ce97874fcb4d8217bade5b5aab0d80ddff61ca
8e68e071e5fb90c873e7aa32027676707d0d0f4d 17-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "removed calls to deprecated APIs"
60161290654b704c0e9da25ed34250fd86305a72 17-May-2010 Christian Mehlmauer <FireFart@gmail.com> removed calls to deprecated APIs

Change-Id: Iaaee3e770bf65d4f041b0786d0cf6c683feebea6
ms/ui/NumberPickerDialog.java
f725654f44ad56db2212a6318d89c8b50bf2d0dc 17-May-2010 Christian Mehlmauer <FireFart@gmail.com> Removed calls to Deprected APIs and unused Imports

Change-Id: I5e7778a4312cbe2ab6938a5bcd6b893418079c27
ms/ui/WarnOfStorageLimitsActivity.java
ccc3a9219b3e1d1cff5dde3c13ecea1bb06226c3 14-May-2010 Brad Fitzpatrick <bradfitz@android.com> Use JSR-305 thread annotations, and fix a missing lock.

Change-Id: I74ef136c117b8cdcbca0cab0194f65e5fe1b401c
ms/data/RecipientIdCache.java
04a2774fae58a497037537df6c130895bd60e288 14-May-2010 Brad Fitzpatrick <bradfitz@android.com> Merge "Revert I896a975d03a3607c6fa948e948796fe547cbb959 to fix build."
e86abc71912704dd67664a44a33e84d5847ca64b 14-May-2010 Brad Fitzpatrick <bradfitz@android.com> Revert I896a975d03a3607c6fa948e948796fe547cbb959 to fix build.

Will re-submit later.

Change-Id: Id9386211d5d54e123db5bb43ed3aca58af8cae4f
ms/data/RecipientIdCache.java
2c11db49552a6739f6016b602322ad7b3d677bf1 14-May-2010 Brad Fitzpatrick <bradfitz@android.com> Merge "Use JSR-305 thread annotations, and fix a missing lock."
51657105f57a38764c5673d193c86d3baf62beb1 14-May-2010 Brad Fitzpatrick <bradfitz@android.com> Use JSR-305 thread annotations, and fix a missing lock.

Change-Id: I896a975d03a3607c6fa948e948796fe547cbb959
ms/data/RecipientIdCache.java
ff4e19642322a4e6eb04e9537a1c08de1cc916c6 13-May-2010 Jeff Hamilton <jham@android.com> Stop using private APIs that are going away.

Change-Id: I0aa9b361a03e3e3dcc25c7768fdc5a79a0e89e06
ms/SuggestionsProvider.java
159cc76b6fa80c9f20549d8168216a5226fd0a4a 13-May-2010 The Android Open Source Project <initial-contribution@android.com> am 3c6eacd7: merge from open-source master
3c6eacd7f75aef4109f6ba8f1fbf2c957bd58ae2 13-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Id75aa0c9ba9ad95cb8bbd5cf98d417b075de876a
a1b621e8a0ed7e4b9d11f3423056e4467b8117ad 11-May-2010 Mark Wagner <mxw@google.com> Merge "search work."
f97cdd928bbc1953d422466d62807f07ae66119e 29-Mar-2010 Naveen Kalla <nkalla@codeaurora.org> Display message when operation fails since FDN being enabled

The terminal disallows SMS operations for numbers which are not in the Fixed
Dialing Number (FDN) list when the FDN service is enabled. FDN_CHECK_FAILURE
error is sent from by RIL when this happens. Display a message to the user.

Change-Id: I0c271db743997a24f12ef96f0162a62462f52569
ms/transaction/SmsReceiverService.java
c27b5dc04d496dc4176bea034498bec4e68045fa 28-Apr-2010 Mark Wagner <mxw@google.com> search work.

Modify search suggest to show complete messages rather than single words.

Change-Id: I93a9bbe507ddb2245826026566108371503aa679
ms/SuggestionsProvider.java
ms/ui/SearchActivity.java
7c4d1a499c2d836a56d516a71b0b282de3f17391 10-May-2010 Tom Taylor <tomtaylor@google.com> am 5857c040: am b142ea00: Handle anonymous sender
5857c040d95e13a260cb19df1454c4f02681e730 10-May-2010 Tom Taylor <tomtaylor@google.com> am b142ea00: Handle anonymous sender

Merge commit 'b142ea00f24f4b838e6b4d0f2761eedd0f14f625' into froyo-plus-aosp

* commit 'b142ea00f24f4b838e6b4d0f2761eedd0f14f625':
Handle anonymous sender
b142ea00f24f4b838e6b4d0f2761eedd0f14f625 07-May-2010 Tom Taylor <tomtaylor@google.com> Handle anonymous sender

In some places (such as Korea), it's possible to receive
a message without the sender's address. In this case,
all such anonymous messages will get added to the same
thread. Bug 2665039

Change-Id: Ic6bf7a7bfadfd3162d21ef4a59788b8886679872
ms/data/Contact.java
ca60f7c204613c660ed11c1fb2f4d45d82995456 06-May-2010 The Android Open Source Project <initial-contribution@android.com> am 82d2b433: merge from open-source master
82d2b433ed97042e131d362ed2252d6b8a5dea1f 06-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia4ff7a14539989ccd9347d132da2cae5cd521520
e4d7b04e712b8629d7e6217a622d25c9655e6ae0 30-Apr-2010 takuo <kitame@gmail.com> Should unescapeXML(src) before getPartBy*()

Change-Id: Icc5cb8ed8a4e6e3e08308d0ba8aac8e8e2b17dc5
ms/model/MediaModelFactory.java
969ad9b1bcb95cad82ae99f9a1f4dc77986bab2e 28-Apr-2010 Tom Taylor <tomtaylor@google.com> am 82776223: am e89e8008: Merge "Fix cursor null-refs" into froyo
82776223d904a6164ae6c278940964e2e65a208a 28-Apr-2010 Tom Taylor <tomtaylor@google.com> am e89e8008: Merge "Fix cursor null-refs" into froyo

Merge commit 'e89e8008b86939bbb3bd5693b87f708a1d7e3913' into froyo-plus-aosp

* commit 'e89e8008b86939bbb3bd5693b87f708a1d7e3913':
Fix cursor null-refs
e89e8008b86939bbb3bd5693b87f708a1d7e3913 28-Apr-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix cursor null-refs" into froyo
b89b165c9966550383857e7db87d60a3ae6ff239 28-Apr-2010 Mark Wagner <mxw@google.com> am 23f763b0: am f49fc5b9: Merge "missing synchronization fix" into froyo
23f763b06b6bef1bd3cc22a945dbe52413eea7d1 28-Apr-2010 Mark Wagner <mxw@google.com> am f49fc5b9: Merge "missing synchronization fix" into froyo

Merge commit 'f49fc5b9e665006684c9a87ba809374be14b4b86' into froyo-plus-aosp

* commit 'f49fc5b9e665006684c9a87ba809374be14b4b86':
missing synchronization fix
f899bce945a70990c9511ce4d26f856d8adf1e04 28-Apr-2010 Tom Taylor <tomtaylor@google.com> Fix cursor null-refs

Found by the devious and relentless monkey. Bug 2631640

Change-Id: If45ce4f5e42b25b2b0e69cedfd03f1b4c359c2b5
ms/ui/ConversationList.java
5e1e9052ebe2da73d3030676096c2bf12b2d06f7 28-Apr-2010 Mark Wagner <mxw@google.com> missing synchronization fix

Bugfix 2622197.

Modification of the static mListeners (hashmap) is synchronized on the ContactsCache
class object. This was missing, however, when we clone the hashmap in order to
send out updates. Cloning is done in case the callback modifies the list of listeners.

Change-Id: Ic09aaee91e448c4a7d610b6f72ad8122fefef7da
ms/data/Contact.java
aa25a08ba0cef570e5c2d2b3819eb4ee3d778ba8 26-Apr-2010 Tom Taylor <tomtaylor@google.com> Merge "Deprecated language codes leaked in HTTP_ACCEPT_LANGUAGE header"
c122ca5ebd2ccac240002425a567718a9577568c 23-Apr-2010 Tom Taylor <tomtaylor@google.com> Deprecated language codes leaked in HTTP_ACCEPT_LANGUAGE header

Some old language codes, such as Hebrew (iw), were inserted in the
HTTP_ACCEPT_LANGUAGE header. Fix the problem using the same strategy
as in the browser code: replace deprecated language codes with the
new ones. Added a unit test that tests for standard behavior and tests
one of the deprecated languages. Bug 2600706.

Change-Id: I5ac29618c9c7f5cbbafdb24c43367c983647eaa8
ms/transaction/HttpUtils.java
107a1d8d791120d55d6610201d50313cef67273e 23-Apr-2010 Tom Taylor <tomtaylor@google.com> am 95569f54: am 6bbfd941: Fix unread notifications
95569f5452ba96217a1e1a74f623697c3e57b3a5 23-Apr-2010 Tom Taylor <tomtaylor@google.com> am 6bbfd941: Fix unread notifications

Merge commit '6bbfd941885c588cc5d94e345d2cfc4197134a19' into froyo-plus-aosp

* commit '6bbfd941885c588cc5d94e345d2cfc4197134a19':
Fix unread notifications
6bbfd941885c588cc5d94e345d2cfc4197134a19 23-Apr-2010 Tom Taylor <tomtaylor@google.com> Fix unread notifications

Reading one thread would mark all messages read. The expression
read=0 OR seen=0 was getting combined with the thread_id in the
provider like this: read=0 OR seen=0 AND thread_id=N, which was evaluated
as read=0 OR (seen=0 AND thread_id=N). The expression needs parens
so it will get evaluated correctly. Bug 2615680

Change-Id: Ib495a74e41346b835a576a8d6d53e809b839f93d
ms/data/Conversation.java
ae000a474883f89e4529e2d1b8e3cbd862bc820e 22-Apr-2010 Tom Taylor <tomtaylor@google.com> am ac551c10: Fix MMS to work with GoogleVoice

Merge commit 'ac551c101b12f905707ad9321bbe94c908ef85fd' into froyo-plus-aosp

* commit 'ac551c101b12f905707ad9321bbe94c908ef85fd':
Fix MMS to work with GoogleVoice
ac551c101b12f905707ad9321bbe94c908ef85fd 22-Apr-2010 Tom Taylor <tomtaylor@google.com> Fix MMS to work with GoogleVoice

Look for a GV BroadcastReceiver rather than an activity.
Tested with sample app. Bug 2614752

Change-Id: Ic52e18ab40ec4813856db3f75dc8722e309a47ff
ms/data/WorkingMessage.java
d67c8ab99c0355a70b4fb4b0a7aba8e6c6dfc04c 22-Apr-2010 Tom Taylor <tomtaylor@google.com> Fix MMS to work with GoogleVoice

Look for a GV BroadcastReceiver rather than an activity.
Tested with sample app. Bug 2614752

Change-Id: I487e47c47ef07524cf5b6f8460a3e77d97a9117b
ms/data/WorkingMessage.java
15057746d75afb5fec583f30064b382c18403608 21-Apr-2010 Tom Taylor <tomtaylor@google.com> Specify sound recording limit

When recording a sound for a MMS attachment, specify a limit so the
user can't record a message that would exceed the MMS max size.
Bug 1339600

Change-Id: Idb882aaf379fed45170eb24e14d779bbd42c76c6
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
c2f641cd6716e9e8ee8848811a21f51138f7d451 21-Apr-2010 Tom Taylor <tomtaylor@google.com> Fix messaging updating

ComposeMessageActivity stopped updating its list of messages
when a message was sent or received. A recent change (Ic18f0307) to not
automatically register the ContentObserver when creating the CursorAdapter
broke the messaging app. Fixed by passing in the flag to request the
ContentObserver.

Change-Id: Ic55e67d7ecd1e33f59d19755752054b430402bbd
ms/ui/MessageListAdapter.java
f3306bb129f1caade42dac3ad771c372ed5cddfd 15-Apr-2010 Tom Taylor <tomtaylor@google.com> Fix hidden selection

When a users uses the trackpad to scroll around ComposeMessageActivity,
the selection would disappear when it would select a scrollview containing
the hidden attachment editor. Keep the visibility of the wrapping
scrollview in sync with the attachment editor. Bug 2595843

Change-Id: I5baf83814546ea705b0658acf44cd717c09e7670
ms/ui/AttachmentEditor.java
ms/ui/ComposeMessageActivity.java
beb7834e73f6bc94938cb448522df19edb60d8c8 19-Apr-2010 Tom Taylor <tomtaylor@google.com> Replace formfeeds

According to the spec, formfeeds should be replaced by linefeeds.
Add a unit test. Bug 2561999.

Change-Id: I40762bdf210baefe858e84e76fa50354f73715f7
ms/transaction/SmsReceiverService.java
a4dac6047229de8344a6a3ec2fc00e6c158e9318 13-Apr-2010 Tom Taylor <tomtaylor@google.com> Check for valid cursor

We already do a similar check in a similar situation building a
context menu. Need to do the same check here.

Change-Id: Ie7d0abbfb7443d9c8dd637fee3cf576168120183
ms/ui/ComposeMessageActivity.java
88483de6dd48baeaf3f628870e60cf2a01961a65 15-Apr-2010 Evan Millar <emillar@google.com> Merge "Use the new QuickContact#setImageToDefault API instead of setting it to null"
d1082ee8d8d5dff4c5e136f91abfa5e5c060b67e 15-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am bd2a8f5b: merge from open-source master
4914dad6d38d05f1de31042c8ff51f980bcfc2f1 15-Apr-2010 Brad Fitzpatrick <bradfitz@android.com> am db8958a3: Fix Cursor NPE when closing.
8ce105c3e9cc48e9b80d4811eec6d2068f611988 14-Apr-2010 Evan Millar <emillar@google.com> Use the new QuickContact#setImageToDefault API instead of setting it to null

Change-Id: I25b89f140fe723290ec267950fac1d0348b8f188
ms/ui/MessageListItem.java
bd2a8f5bd39ce46a43b5bcc759432ebea4f68369 15-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib54a62360d01c059a4fc2ade5968e79009a4b201
db8958a358ad2aa4766027893f3d324007ab976c 14-Apr-2010 Brad Fitzpatrick <bradfitz@android.com> Fix Cursor NPE when closing.

BUG=2595862

Change-Id: I81d432417cb02d785cd98ac24007728f0ada4644
ms/data/RecipientIdCache.java
ec78572cd93c531881906ee6cd62456c8fccdc16 14-Apr-2010 Tom Taylor <tomastaylor@gmail.com> Merge "Fix memory leaks and corner cases in MMS app"
6a7ba7cf4d775dbb29f3cafbee67d823149da5f1 08-Apr-2010 Naveen Kalla <nkalla@codeaurora.org> Fix memory leaks and corner cases in MMS app

The following problems will be fixed with these changes
1) IndexOutOfBounds exception when viewing a slide show. mCurrentElement should
not exceed the size of all entries. This caused IndexOutOfBounds exception
2) Redundant call for registerSimChangeObserver causes OOM issues.
SimChangeObserver is registered in onResume function. So the call in
onQueryComplete can be removed.
3) Check for empty sender address before trying to get associated contact number
when an SMS is received
4) Fix Cursor leak while receiving sms
ms/dom/smil/SmilPlayer.java
ms/transaction/SmsReceiverService.java
ms/ui/ManageSimMessages.java
ms/util/Recycler.java
a6dd14dc0963aa8f30e625aa88e925e3fa0744f0 25-Jan-2010 Bai Tao <michaelbai@google.com> Provides a way to let user select the recipients from a list of phone numbers.
a. Add a buttion beside to recipients box.
b. The multiple phones picker which is implemented in Contacts is launched when user touch the button. The existent recpients are selected by default.
c. The user's selection will be populated to recipient's box when being back from multiple phones picker.

Also fix the related issue that the draft message is left once the recipient is changed.

Change-Id: I036b65dd1a651aae2fbb2e58a4b2b9e126ca4e74
ms/data/Contact.java
ms/data/ContactList.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
104bef8cd882d0bb32444494ea628d272feb7a51 09-Apr-2010 Evan Millar <emillar@google.com> Merge "Use the default avatar until we have something better to replace it with." into froyo
1bd48ffa3d061d9537425fa7ab40b24ffd8833e7 09-Apr-2010 Evan Millar <emillar@google.com> Use the default avatar until we have something better to replace it with.

Fixes bug http://b/issue?id=2584852

Change-Id: Ia7efaf4210037f9408c2e87ef2dbc56db45b05e0
ms/ui/MessageListAdapter.java
e14b79584cca1bf7ba60c53bd7e3d6386adbfc59 09-Apr-2010 Wei Huang <weih@google.com> bug #2582343: attempt to fix the sticky notification bug.

- when going to the compose screen, we query to see if there are unread messages, and if so, update both read and seen columns to 1. So in the chance that read=1 and seen=0 (not sure how that can happen), we wouldn't update seen to 1.

change the query to check for (read=0 OR seen=0) instead of just (read=0).

- add selective verbose logging in case this isn't the real fix.

Change-Id: I978ba3a83be227cd924d0c4c85d090bf42be1c8d
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
09a75ac1d3710e60dbe78ead3dee6863ffb380ca 08-Apr-2010 Wei Huang <weih@google.com> bug #2438230: more logging for Conversation and Recipient cache.

- add more logging to try to catch the mismatching contact/thread bug.
- add selective checking to make sure thread id and recipients are not compromised.

Change-Id: I038dca4f7b32bf822ef68e344c7a6eaf8990e328
ms/LogTag.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/ui/ComposeMessageActivity.java
d12d6808584a4f8ef2c589618013dd9e4d4e3f23 02-Apr-2010 Mark Wagner <mxw@google.com> don't crash trying to show the delivery report if it doesn't exist

Apparently you can click on the error icon to go back into compose
message activity with the original text and original address
prepopulated -- so you can fix it up. But for reasons that aren't
clear (it's not clear if it's even intentional) we continue to also
show the failed message item with the failure icon. If you long
press on that item we include a menu item for showing the delivery
report. Clicking on that fails to find the item in the sms or mms
table and we crash.

This change makes it so that we're more resilient to this state.
In other words we don't crash. The dialog which shows the delivery
report is somewhat ugly in this case but acceptible in my opinion.

Change-Id: Ie34c32c83982ff0d506e0102813370e1e7c49a12
ms/ui/DeliveryReportListItem.java
c146e65d921676f7d7ca19a56b6b0ae9406a002b 01-Apr-2010 Mark Wagner <mxw@google.com> fix race condition unregistering receivers

bug 2553387

Change-Id: I43b37c0104bfbe22be81d1f938c4ff66240557bc
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
459ad1ea05610f7c071f65da6842e00e21bd5eaf 01-Apr-2010 Mark Wagner <mxw@google.com> regex fixes: need to quote the string

bug 2553520

Change-Id: I1b3daac42dc60b4cb74ede658ae6ec7f9d0c0ff9
ms/ui/ComposeMessageActivity.java
ms/ui/SearchActivity.java
4011f521ee944725d09106d96968b104c0c0eaac 01-Apr-2010 James Dong <jdong@google.com> Mms update due to CamcorderProfile.java public API refresh
Dependency: https://android-git.corp.google.com/g/#change,47310

bug - 2553862

Change-Id: I65abbc0b62139efe5f50f74d2bf3a5894136146b
ms/ui/ComposeMessageActivity.java
7a0b92858e314d8bbfcd4b9ca57e0994308aeb66 25-Mar-2010 Jim Shuma <jshuma@google.com> Merge "Migrate Vibrate setting from previous versions if needed"
9258283a430fdf030785c96380c2628603ea7e20 25-Mar-2010 Jim Shuma <jshuma@google.com> Migrate Vibrate setting from previous versions if needed

The Vibrate setting was getting properly interpreted
in MessagingNotification, but this was not visible from the
preference screen. This change migrates the preference
when the preference screen is brought up.

Bug: 2545853
Change-Id: I00a07b9f60ee4bc6cb21bb4466b31ed175d22c38
ms/ui/MessagingPreferenceActivity.java
33f7b38198f228f1814a649b880d74c34e050372 25-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix multi-share"
9c21cccdc5737c0d54fe9220959964b0a9bdaa9d 25-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix multi-share

When sharing multiple images and/or videos from the gallery, the type
passed in is */*. The code needs to recognize that type. Bug 2542419.

Change-Id: I9bf087c117f2ddaf908b4bc670072c7e8520f463
ms/ui/ComposeMessageActivity.java
627ffa0f154c4ed9ac5071af5f5fb2903234665e 24-Mar-2010 Mark Wagner <mxw@google.com> catch sqlite exception

Change-Id: Ie7635fc944d33f9bc45f2fa1726750c1e81639e2
ms/SuggestionsProvider.java
0038ac4f9a4e73ca02007fbbe30f5a0cedb6006a 24-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix an ANR in ConversationList"
63e395258ae33a101b9634a68b55ec89fac8b580 24-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix an ANR in ConversationList

ConversationList.onStart() was trying to delete old conversations
on the UI thread. Now do the delete via an asyncHandler after we've
completed the initial conversation query. Bug 2538095

Change-Id: Ia9498d61c49244f0354c7d5a1e23ad490c1eaf6b
ms/data/Conversation.java
ms/ui/ConversationList.java
c199b33f13f3d2cc8f159fa0b91f3ee2831e6029 23-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix sms and mms draft confusion"
17daf81a930e664d254cabcef00981a4c9a1f785 23-Mar-2010 Tom Taylor <tomtaylor@google.com> Tweak recipient editor dropdown

Update the recipient editor dropdown to the latest UI spec.
Bug 2524307.

Change-Id: I546146533126e657daafbe747f5745b2439a1a94
ms/ui/RecipientsAdapter.java
46bf2f57d3b88e90dc40527e1cae6f8032d27fcc 23-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix sms and mms draft confusion

When saving an mms draft, any older sms draft associated with that
same thread is deleted. That was the intent. However, the code for
getting the thread_id was in a separate thread. The code that deleted
the old sms draft was outside that thread and the conversation's
thread_id was still zero. Very simple fix. Bug 2534828.

Change-Id: Ice72770bdd506840883afd9f81a66d3447b3b764
ms/data/WorkingMessage.java
a2023c74813d4bee578462d4d4470f657d3e07de 23-Mar-2010 Tom Taylor <tomtaylor@google.com> Alert on non-UI thread

Now that we're doing more stuff off of the UI thread, catch a case
where we were trying to put up an error dialog while attaching a video.
The function is called from many places. Make sure the guts of the
function that show a toast or dialog run on the UI thread. Bug 2530897

Change-Id: I8671f43b29ccfd44f48b9f224188fa9ac6648370
ms/ui/ComposeMessageActivity.java
cb595f45ed21caac7f686d6088b7adef123ea4a4 22-Mar-2010 Tom Taylor <tomtaylor@google.com> Unregister broadcast receivers

ComposeMessageActivity needs to unregister the receivers setup by
WorkingMessage when onStop is called. Bug 2534223.

Change-Id: I44114098bf747cda3f18a81d0fe8d329dc57db80
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
a94393452e4fec5d550a6291f90393adb3fcd335 22-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Turn off debug info"
1998176d6069aa9c3e3f2f16e66f12073554ec66 22-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix a null ref

Bug 2533718.

Change-Id: Ie830d856909fc427ba90892f73f39ade90029afd
ms/ui/ComposeMessageActivity.java
5e99cf133219e11a0a3ec1f37131b7d6811b7fb3 22-Mar-2010 Tom Taylor <tomtaylor@google.com> Turn off debug info

Put the debug info behind a boolean that's normally set to false so it
doesn't get printed out by default. Bug 2534247

Change-Id: I80271cccf9d7158c57f950a9f7075419846b8c2b
ms/data/RecipientIdCache.java
3b21f6ab04db5936d73e9f53032f1587389380ff 22-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix DB query on the UI thread

Move a notification query on the UI thread to a worker thread.
Any calls from UI threads (which includes receivers) are made
nonblocking. Calls from non-UI threads (which includes services)
are blocking. Tested various scenarios and checked threads in the
debugger. Bug 2524765 and bug 2533501.

Change-Id: I38213b7202957bdb103058b657be04bfe6b085dc
ms/data/Conversation.java
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
60d7fa5f74463f22fe9a4cd81c0b2fcc95be7c09 19-Mar-2010 Tom Taylor <tomtaylor@google.com> Update after adding contact

After adding a contact, force the conversation to reload the associated
contacts. Bug 2524437.

Change-Id: I6c65bfe4f04c53f17a52ee62c678e97ade2aea80
ms/data/Contact.java
ms/ui/ComposeMessageActivity.java
e601624ab0bbb0dec6917e717cf7d3d4cd1115f1 18-Mar-2010 Mark Wagner <mxw@google.com> Merge "clone the list of listeners before iterating"
5ad68bd0767ac325cf272317c5eb80d08fc2b018 18-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix error icon

The wrong icon was shown when a message couldn't be delivered.
Align icons when there's no second line by ensuring there's always
a second line. Bugs 2523155, 2524189

Change-Id: I24fde79c9cb1b4ce2c61fb95f1cf33c3898eb08f
ms/ui/MessageListItem.java
0e3b231193556769f1d00d1a84073b652fccdd0d 18-Mar-2010 Mark Wagner <mxw@google.com> clone the list of listeners before iterating

Change-Id: I842766ee584037602446a09af273459dccb6d97a
ms/data/Contact.java
006d49271549ed639ffcd70d94c7650bb3514796 17-Mar-2010 Jim Shuma <jshuma@google.com> Bug 2457183
Silent/vibrate

Changes for Mms

Change-Id: Ib62b442551ded4695ea37ef5ec4a24c1f3240e1d
ms/transaction/MessagingNotification.java
ms/ui/MessagingPreferenceActivity.java
32fc80c3da56787085648b83940f897df56b83c4 18-Mar-2010 Tom Taylor <tomtaylor@google.com> Don't edit the wrong item

If a new message arrives or the underlying DB changes at the same
moment the user taps the error icon to edit and resend a message,
the editor can come up showing the wrong message. When the DB
gets updated, MessageListAdapter.notifyDataSetChanged() clears the
mMessageItemCache. At the same time, editing a message with an
error calls mMessageListItemhandler.handleMessage, which calls getMessageItem
which would try and get the messageItem out of the cache. Since the
cache is empty, it would then create a new messageItem out of whatever
the cursor was pointing to! With this change, the code in this path
will not create that bogus item and will silently do nothing. This
same function is called from the menu code and I argue the menu code
shouldn't be creating items either, but I didn't make that change in
this CL. Bug 2372633

Change-Id: I009a4b561e5d7a81cb45724fdf3041e9e413e09a
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListAdapter.java
22cff11251c42263fe452b59c8df3d7be252511e 18-Mar-2010 Tom Taylor <tomtaylor@google.com> Undo unbundling

Some code was commented out in the WarnOfStorageLimitsActivity on
the way to unbundling. Revert that commented out code and restore
the activity to working order. Bug 2522922

Change-Id: I2706263249c5aceaebf13d66c0a96e5e8f1d8414
ms/ui/WarnOfStorageLimitsActivity.java
ac8c9891675ea081ad04ab35ff946975f5ddbd36 17-Mar-2010 Mark Wagner <mxw@google.com> Merge "track list items so they can be updated upon avatar load completion"
6fb305d028ceaf74e4237687a1337396bb01b056 17-Mar-2010 Mark Wagner <mxw@google.com> handle null contact (think draft message)

Change-Id: Ie88ea5d6518899de3d54618f1e03d55fb6f69a3e
ms/ui/SearchActivity.java
b948f78f926dbce6eb93d4e56b09786b2c4ff0f8 16-Mar-2010 Mark Wagner <mxw@google.com> track list items so they can be updated upon avatar load completion

Change-Id: I3a78b922614d5f16880da85718e540325afa586d
ms/ui/MessageListAdapter.java
12d7e85291b0bd5772e70176e208fce82fd39b8a 12-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix cursor out of range

There's a scenario where long-pressing on a message while a
message receipt comes in causes a cursor change. By the time the
onMenuItemClick handler gets called, the cursor is invalid.
Code would test for a valid cursor, but unfortunately, earlier
code would try and read values from that cursor. With this fix,
we test for a valid cursor before doing any operations. Bug 2511080.

Change-Id: Ib689ba9cf58ca7dc552c2c258b8043c4be59c0c6
ms/ui/ComposeMessageActivity.java
9f756084b90d25fef7c22dfbb9d5842676164b34 12-Mar-2010 Kenny Root <kroot@google.com> Request layout after drawing message item

If a layout isn't requested, the MessageListItem doesn't wrap text
correctly after binding the actual message.

Change-Id: I55adfc18aea0ecc00bc5da9ba17506d5f58041cc
ms/ui/MessageListItem.java
f2de72229b2d922e0eed7659919e383d30addd84 12-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix delivery icon

Show the same delivery icon for mms as for sms. Bug 2501870

Change-Id: I0221f75cd1a0a919d28370c0cd0bdeb598fc69ff
ms/ui/MessageItem.java
1fdeecf62f6b2e9e3891e6fdee4786e850646e76 11-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Don't show toast"
c36deab7d27940a07554cc424114d9c9ddd36552 11-Mar-2010 Tom Taylor <tomtaylor@google.com> Don't show toast

When the sms delivery report setting is turned on, only show a toast
on a delivery receipt, not for every received message. Bug 2501111

Change-Id: I29bf90ea250bd3d7f2e9f5a0bceac769bfa53e94
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
ms/ui/ClassZeroActivity.java
8e968f44285098c78c3e923ee673b111a5642fe9 10-Mar-2010 Suchi Amalapurapu <asuchitra@google.com> Handle new apps on sd notifications for google voice

Change-Id: I2a3fbaf4bad385b983f40fa92cced37d8d0bb0fe
ms/data/WorkingMessage.java
cec2a0065dbbdce52c2de5ff994dd4417af4ee7f 10-Mar-2010 Tom Taylor <tomtaylor@google.com> Don't crash in discard()

If WorkingMessage.discard() is called more than once, the code throws
a fatal exception. This was fine for testing, but it shipped like this
in 2.0 and results in unncecessary crashes. With this fix, we simply
detect the fact that discard has already been called and then return.
Bug 2497842. Bug 2502735.

Change-Id: Ifaf2d22293ca0e13de4ccd66f7e51b3c46952502
ms/data/WorkingMessage.java
aa4b998c5125786a50845767f0027cfc917fbb1a 09-Mar-2010 Bai Tao <michaelbai@google.com> Correct the attachment type in setAttachement()
It will remove the send button when more than one pictures will be sent through
the SEND_MULTIPLE intent.
Fix issue http://2419923

Change-Id: I619e8fe01decb1375e19702cd65baf80b971bd24
ms/data/WorkingMessage.java
2baf5019d0880e1de34fa68fad2d931b348c2076 10-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix status icons

Icons should be inline with the "Sent: time " line - Bug 2502089.
Both "Sending ..." text and Delivered Icon are displayed at the same time -
Bug 2501685.

Change-Id: Ie13e3011e02ca4b96b70fd47ed41be155cf2aae9
ms/ui/MessageListItem.java
4497b5d445433414ddf48df604369b8e1d05136d 10-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Preserve locked message"
864d15179e4b6987e9cf97930d1033ffc2faa228 10-Mar-2010 Tom Taylor <tomtaylor@google.com> Preserve locked message

If a user turns off automatic downloads and then locks the notification message
that says they've got a download, once they download the message,
the locked notification message is deleted. This change preserves
the locked flag and copies it from the notification message to
the real message. Bug 2490108

Change-Id: I466e503dc2c2cbc346476786355ed92c11b91492
ms/transaction/RetrieveTransaction.java
b29ab46cf4ff03e708abe04aefa283a35ca802fa 09-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix an odd startup bug"
511d10f9bfb1aee1150bf2127ae03d7275706cc6 09-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix an odd startup bug

Bug 2490108 describes a situation where starting a new messaging
conversation from Contacts brings up the compose message activity in a
state where the recipients editor is not editable, even though it's a
new conversation. The bug also describes the normal case where the editor
does come up editable. The difference is that one goes through onCreate
and the other through onNewIntent. We need to clear a flag that says
whether a message has been sent or not so the recipient editor will be
displayed properly in onQueryComplete.

Change-Id: Idaacea20c277dc39e9d258fd73354c915119c2ed
ms/ui/ComposeMessageActivity.java
63ac1002131c90ae78ae1d3e69a77fa1f8d2b303 09-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix sending message

Dial back the if-test that determines whether we show a message
as "Sending..." in CMA. Remove the test for waiting for delivery
report because in some cross-network situations, we never get
those acks. Bug 2498420.

Change-Id: I7de13a9000873cafb219d3eb29c831322b10146b
ms/ui/MessageItem.java
0f1fb760aa6a1ae040703b8ce405c96923e40603 09-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix race condition

After deleting a thread in ConversationList, the onDeleteComplete function
would call Conversation.init() to update the threads and make the
conversation cache match what was on disk, then call
startAsyncQuery() to get the new state of the threads. Then it called
onContentChange(), which was a mistake. onContentChange() caused the
list to redraw based on the old cursor. The code would reinsert
the deleted conversation back into the cache as a result of doing
a Conversation.get. Later on when looking up a thread by thread id,
the cache could easily return the deleted conversation from the cache.
With that onContentChange() removed, the async query takes place
and the conversation list gets rebuilt with the new cursor.
Fixes bug 2492283.

Change-Id: I901e774dd341a3ed1a39f9a47e8026555f853566
ms/data/Conversation.java
ms/ui/ConversationList.java
f7e8281a223af6228e6399055a6197a1edd9bc3a 09-Mar-2010 Tom Taylor <tomtaylor@google.com> Remove mms-common

Get rid of the mms-common library and move the mms files back into the
framework where they originally came from.

Change-Id: I8ce2b0a2a3cfc6b7da13ce0e791173c09dd8f0f5
ms/data/Contact.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/dom/smil/parser/SmilXmlParser.java
ms/drm/DrmWrapper.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ImageModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/RegionMediaModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/telephony/Phone.java
ms/telephony/TelephonyIntents.java
ms/telephony/TelephonyProperties.java
ms/transaction/MessageSender.java
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationTransaction.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/SmsRejectedReceiver.java
ms/transaction/SmsSingleRecipientSender.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/DeliveryReportActivity.java
ms/ui/ManageSimMessages.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/RecipientsEditor.java
ms/ui/SearchActivity.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowEditor.java
ms/ui/UriImage.java
ms/util/AddressUtils.java
ms/util/DownloadManager.java
ms/util/DraftCache.java
ms/util/RateController.java
ms/util/Recycler.java
c7b4497d1129fbfc1a69ee3c5a30e28153afd3e8 08-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix empty draft

When an attachment is added, the working message is bumped up to a
temporary Mms state. Once the attachment is added, the various
flags in working message will be updated and that temporary state
removed. However, if the user backs out of adding an attachment,
the working message will be left in the fake Mms state and on
exit, will cause an empty draft to be saved. Now we clear that
fake Mms state when we return from adding a draft, successful or not.
Bug 2493456.

Change-Id: I596efbee0bcd54c30b1de4f4aedf1b9c6919f947
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
e3e9da1165ab893442fc48740f03c0e7043fd3e1 06-Mar-2010 Romain Guy <romainguy@android.com> Merge "Correctly validate numbers when pasted in NumberPicker. Bug #2258525"
c53c34c4c8c18a5ceb39dfd85e0a0da75dada079 06-Mar-2010 Romain Guy <romainguy@android.com> Correctly validate numbers when pasted in NumberPicker.
Bug #2258525
ms/ui/NumberPicker.java
db3f0f38784eea8fdc35a3a30084a6d8c6709b0b 06-Mar-2010 Dmitri Plotnikov <dplotnikov@google.com> Merge "Making email matching case-insensitive."
1457d175c80067beaa914ab75216df389666f9c3 06-Mar-2010 Tom Taylor <tomtaylor@google.com> Merge "Multiple status icons"
0a3684e0f1242518b522e2883fe275343768bb27 06-Mar-2010 Dmitri Plotnikov <dplotnikov@google.com> Making email matching case-insensitive.

Bug: 2254140
Change-Id: I403b14182b8d605a16a8f5b2f30ee75cfe2134ef
ms/data/Contact.java
5a73318ac906b37eb5634a6975a8a26ef5ed36ef 05-Mar-2010 Tom Taylor <tomtaylor@google.com> Multiple status icons

Previously, we could only show one of three possible icons with an
individual message: locked, delivered, and error. With this change,
all three icons can be displayed. The new icons are smaller than the
old ones. Still waiting for a couple of new icons. Bug 2293991

Change-Id: I960746f0e5a0601ae79b4104316eda0a7d1978c1
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
903d973ca7093ce0574feca4f58e114a0c11e099 05-Mar-2010 Mark Wagner <mxw@google.com> return Bundle.EMPTY in lieu of null per the docs for Cursor
ms/SuggestionsProvider.java
9ec8e53a995088b9413280868d77a801d1e4b8ec 04-Mar-2010 Tom Taylor <tomtaylor@google.com> Fix a null-ref

Hard to believe this was still in the code. If a contact had no
number, we'd try and de-ref a null pointer trimming the number.
Bail out earlier than we used to when the number was zero length.
Bug 2449036.
ms/ui/RecipientsAdapter.java
6a78e60e584cb440c63198b87f8aba6b4c07f8ca 03-Mar-2010 Tom Taylor <tomtaylor@google.com> Don't delete draft unless we need to

Don't even look for a draft unless the conversation says we've got a draft.
Don't delete the draft unless the draft is the only message in the
conversation. Excess drafts will get deleted at send time (or in various
other places where we save the draft or discard). Fix one of the
Conversation constructor's to use the cache. Otherwise, ConversationList
activity was updating all the conversations, but all the other activities
were retrieving old conversations from the cache. Bugs 2483022 and 2329323.
ms/data/Conversation.java
ms/data/WorkingMessage.java
9cb9fd6e387ed9f7278d47bc8743c79b18bbeb5b 02-Mar-2010 Mark Wagner <mxw@google.com> don't filter on mobile phone numbers
ms/ui/RecipientsAdapter.java
70f5af8fd89d66ae246a805d10a50540746319aa 01-Mar-2010 Wei Huang <weih@google.com> bug #2030420: mark all sms/mms messages as seen when the user clears the notification.

- implement the delete intent for statusbar notifications, so when the user hits the clear notification button, we'll be able to mark all messages as seen.
ms/MmsApp.java
ms/transaction/MessagingNotification.java
627007213deb59ef938c80353c8f3598b01478b3 26-Feb-2010 Wei Huang <weih@google.com> Bug 2030420: fix SMS/MMS statusbar notification.

- don't show statusbar notification for sms/mms based on whether there are unread messages or not. Instead, add a "seen" column for the SMS and Mpdu (mms) table. Each SMS and MMS message will now have a "seen" flag in the db. If there are unseen messages, we'll show the statusbar notification. Once the user reads a thread, we'll mark a thread (and all messages in the thread) read and seen. If the user goes to the conversation list activity, we'll mark all messages "seen", but won't touch the read flag for the messages.

So now the user can have many unread messages, but still have seen all the messages, thus won't get notified repeatedly just because there are unread messages.

we'll mark a message "seen" flag to 0 for incoming SMS and MMS (pdu) messages.

to-do: mark all messages as seen when the user hits the clear notification button in the window shade.
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiverService.java
ms/ui/ClassZeroActivity.java
ms/ui/ConversationList.java
ms/ui/ManageSimMessages.java
436042159134e8ecbc57097340a5bd81f2912574 27-Feb-2010 Tom Taylor <tomtaylor@google.com> Avoid unnecessary DB updates

Making database updates at the same time we're trying to read the list of
messages in a conversation causes any further queries to block until the updates
are complete. This results in taking a long time to display a new
message when the user selects the sms notification. With this change,
we block marking a thread as "read" until we've completed the query for
a conversation's list of messages. Also, every delete causes several
DB updates inside the provider. We can avoid one of these deletes that causes
so many updates if the thread has no drafts. Now responding to a new message
notification only results in two updates (one to the sms table and one to the
pdu table) and that happens after the messages are loaded.
Bug 2467382.

Change-Id: I2a78023e3ba7dee72c110d2023f4c79b1b816565
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
5873d00f37e4a07fad9dd94647fb73ed37f01ae5 26-Feb-2010 James Dong <jdong@google.com> Don't use system property to get the recording duration for MMS application.
Switch to use CamcorderProfile.java class to get the same info.
ms/ui/ComposeMessageActivity.java
ab8af8ef3182738dd97ba505a49f1a9caa2cd5f1 25-Feb-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master
d2d10b1f2e1413c4b418174f93ed99002ed38f41 25-Feb-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix draft corner case"
4d33cdcbb402a87ffeeaddb58237c70c4608c6f5 25-Feb-2010 Dianne Hackborn <hackbod@google.com> Update to reflect android-common no longer in framework.
ms/MmsConfig.java
ms/transaction/HttpUtils.java
c8e7da913872e802571a91d13601d7a7cf7b6ed9 12-Nov-2009 Jean-Baptiste Queru <jbq@google.com> fix build
ms/transaction/MessagingNotification.java
26cee06bca69b65486d6f6cdce6e4fe10a8070af 24-Feb-2010 Tom Taylor <tomtaylor@google.com> Handle out of memory

Fix a probably uncommon bug where we don't even have enough memory
to load the small internal resource representing "can't load picture".
Found by the relentless monkey. Tested by throwing the out of memory
exception in the block and testing each code path with a null
bitmap. Bug 2341181
ms/ui/SlideshowAttachmentView.java
1c447686aedf9daf036f5ae7d04de14f0cb2f497 23-Feb-2010 Tom Taylor <tomtaylor@google.com> Fix draft corner case

When the message being edited is the only message in the conversation, the delete
message gets deleted before being edited. The trigger "delete_obsolete_threads_pdu"
sees that a thread contains no messages and silently deletes the thread.
Meanwhile, the mConversation object still holds onto the old thread_id.
The code now notices that situation and clears out the thread_id.
Later on, when Conversation.ensureThreadId() is called, we'll
create a new thread if necessary. Bug 2166889

Change-Id: Id5d4b810dbef87f67e8aa9084faf4b7bd8557972
ms/ui/ComposeMessageActivity.java
9b668cfd54149b24855f2b8034e332b31e02ac73 18-Feb-2010 Tom Taylor <tomtaylor@google.com> am 4fda80cf: am 7a17eaed: Add better logging info

Merge commit '4fda80cf3bc76bba51948d0260bffa485d0481a6'

* commit '4fda80cf3bc76bba51948d0260bffa485d0481a6':
Add better logging info
4fda80cf3bc76bba51948d0260bffa485d0481a6 18-Feb-2010 Tom Taylor <tomtaylor@google.com> am 7a17eaed: Add better logging info

Merge commit '7a17eaedae4c54b72f420380ec7129a15442cbbc' into eclair-plus-aosp

* commit '7a17eaedae4c54b72f420380ec7129a15442cbbc':
Add better logging info
7a17eaedae4c54b72f420380ec7129a15442cbbc 18-Feb-2010 Tom Taylor <tomtaylor@google.com> Add better logging info

When trying to track down bug 2447913, chain the original exception
and print out the url that we're trying to reach.

Change-Id: I9bcb326e77bfdc95ad75eb0ba5c08aa8cc506a28
ms/transaction/HttpUtils.java
756b4d1689ce0691b0c25b4bafbd91ee60f814e0 17-Feb-2010 Tom Taylor <tomtaylor@google.com> Merge "Don't show "Add slide""
58cc5bd40f952b052e9114922b244bdff4701283 17-Feb-2010 Tom Taylor <tomtaylor@google.com> Don't show "Add slide"

When the user has added the maximum number of slides (10), don't
show the "Add slide" button in the slide show editor. Bug 2442373
ms/ui/SlideshowEditActivity.java
ae1f5cf2fe15970cbcdcf0188cd8733facac0e05 17-Feb-2010 Tom Taylor <tomtaylor@google.com> Don't resize image on attach

Previously, image attachments would get resized as soon as they
were added to a message. This caused a problem in that the first
picture would eat up as much space as it could, the second picture
would get the scraps, and on down the line. Now we don't resize
attachments until the message is actually sent and at that point,
give each attachment equal space to resize. However, there was one
unneeded resize going on when individually attaching a picture.
The picture would get resized down to the carrier's max h & v
resolution. With this change, we skip that extra resize and the
max h & v resolution gets taken into account on the final resize
at send time.
ms/model/ImageModel.java
34cba2ee7ea396870297dc7fe4a78a7a5357c859 16-Feb-2010 Tom Taylor <tomtaylor@google.com> Fix single picture attachment

Broke it in the last checkin.

Change-Id: I10208dd3fe97c8f2b52d02116abc21bfbbb8df24
ms/ui/ComposeMessageActivity.java
f6f761abb71455f79c8cadda94aa15fc15bb6d39 16-Feb-2010 Tom Taylor <tomtaylor@google.com> Load multi-attachments on background thread

Bug 2420889

Change-Id: Ie2922f9c91f1bc33898aab397bfa97c03c26c4c8
ms/ui/ComposeMessageActivity.java
ms/ui/SlideshowEditor.java
feb1aab54eabc98a04349af52e19ff9fbcd7c169 26-Jan-2010 Tom Taylor <tomtaylor@google.com> Enable GoogleVoice to intercept SMS sends

If GoogleVoice is installed, send it an intent and give it
a chance to handle sending the message. If it doesn't handle
the message or GoogleVoice isn't installed, then send the
message normally via the telephony layer.
Fixes bug: 2338847.
ms/data/Contact.java
ms/data/WorkingMessage.java
3643ac18361ebb2c6194569ac7ee2f0927155f07 12-Feb-2010 Wei Huang <weih@google.com> resolved conflicts for merge of 5b783617 to master

Change-Id: I77c46fd688d67accb60194af334c8404222c6e5c
5b783617de51ff66a90342cb304cd24d079b7c5f 12-Feb-2010 Wei Huang <weih@google.com> am 4ee7aa9a: bug #2434183: guard against ArrayIndexOutOfBoundEx when there is an empty slide show.

Merge commit '4ee7aa9aec45dd564c0e82928fa5a8378e856dcf' into eclair-plus-aosp

* commit '4ee7aa9aec45dd564c0e82928fa5a8378e856dcf':
bug #2434183: guard against ArrayIndexOutOfBoundEx when there is an empty slide show.
4ee7aa9aec45dd564c0e82928fa5a8378e856dcf 11-Feb-2010 Wei Huang <weih@google.com> bug #2434183: guard against ArrayIndexOutOfBoundEx when there is an empty slide show.

Change-Id: Iad96489e787d3e6cb9162ced4adbf164566bf421
ms/data/WorkingMessage.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/ui/SlideEditorActivity.java
755cec68c6feddf6c2d2112ba8d580f96fc3e520 12-Feb-2010 Tom Taylor <tomtaylor@google.com> Fix subject on MMS-redit

When an MMS fails to send and the user re-edits the message,
the subject did not get restored nor was the subject editor
made visible. Bug 2436188.

Change-Id: Ib35681bb924342cb6ca7b910b623be1e7340d798
ms/ui/ComposeMessageActivity.java
0af188b645e0fa69f5f5b8bff14b11c117535d8c 11-Feb-2010 Tom Taylor <tomtaylor@google.com> Don't show activity chooser

When navigating within the messaging app, go directly to the various
activities without the activity chooser popping up. Bug 2436863.

Change-Id: I1567efbc139ca6bbda529917e01284af4c311d0a
ms/ui/ComposeMessageActivity.java
799440cdb7bfda62c6df0a72f6b620969524f824 11-Feb-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix double display of outgoing messages"
4020be563f457ed2251b43928f14770246c886a2 11-Feb-2010 Tom Taylor <tomtaylor@google.com> Fix double display of outgoing messages

Prior to this fix, sending an SMS message would put the message
in the SMS table marked as pending. As the message was pulled off the queue
to be sent, a duplicate message was added to the SMS table and marked
as "outbox". Then the pending message was deleted out of the same table.
Meanwhile, the UI responded to these DB changes and momentarily flashed
two copies of the outgoing message in the ComposeMessageActivity. With
this change, we only keep a single copy of the message in the SMS table and
simple change the column value from pending to outbox. The result is a
lot less DB churn and a much smoother UI when sending an SMS. Tested with
short SMS messages and long, multi-part messages.

Change-Id: Iaad4f7a9732d79786b50aa19428f51bfec002d4a
ms/transaction/SmsReceiverService.java
ms/transaction/SmsSingleRecipientSender.java
c6c9c43cb8700528c11b27fd23793107c713f2cd 11-Feb-2010 Tom Taylor <tomtaylor@google.com> Merge "Don't refer to sdcard directly"
ebea1f24c246b8fa972ab9cbe52e6f506c5fc825 11-Feb-2010 Tom Taylor <tomtaylor@google.com> Don't refer to sdcard directly

Use constants from Environment.

Change-Id: Ifcb995c8d03f20aa3dd19da261be84c27afe5ce6
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
d62a959cf2e7d261e296f82831942a9a99320175 10-Feb-2010 Dan Egnor <egnor@google.com> Pass a Context to AndroidHttpClient.newInstance(), enabling
persistent SSL session caching.
ms/transaction/HttpUtils.java
540d263efa2830c154fc32bbad2a7e703cf5747d 10-Feb-2010 Tom Taylor <tomtaylor@google.com> Unlimited SMS message length

Remove the code that auto-converts a long SMS message into a
MMS message. We now allow a user to send unlimited length SMS
messages that get turned into multi-part SMS's. Add a UI test
for this feature. Bug 2216705

Change-Id: I0408e195dd98e2322e1d43360c49cfadb2c97939
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
0d4645de339b4681d18198ba7451e7b8807116f9 08-Feb-2010 Tom Taylor <tomtaylor@google.com> Handle multi-image resize out-of-memory

In some cases when attaching many photos to a slideshow,
the system will run out of memory trying to resize a photo
to a smaller size. Handle that case, cancel the send, and
mark the message with an error so they can edit it and resend it.
Fixes bug 2420008.
ms/data/WorkingMessage.java
ms/model/ImageModel.java
ms/ui/ComposeMessageActivity.java
07d483e5da80176484bff536d118cc061f28e586 09-Feb-2010 Tom Taylor <tomtaylor@google.com> Fix a cursor leak

Fix a cursor leak in the recycler. Add a test for sending large
numbers of sms/mms messages. Add another stress test for the recycler.

Change-Id: I8792e15d421ae32a78ca59fb4b73d354f2060819
ms/ui/ComposeMessageActivity.java
ms/util/Recycler.java
95bfdae19e9bb4fd06bf1a5be9d9943bd66b4e7e 05-Feb-2010 Paul Westbrook <pwestbro@google.com> Bug 2420366

Copy NumberPicker into Mms, as it will not be in the public SDK
ms/ui/NumberPicker.java
ms/ui/NumberPickerButton.java
ms/ui/NumberPickerDialog.java
48920b861aafadff9d85175298a2324b8dd56cd6 03-Feb-2010 Tom Taylor <tomtaylor@google.com> Fix "me" avatar

Clicking on the avatar representing "me" in message thread would
often do nothing. The contact uri and contact id we're getting set
from the wrong function.

Change-Id: Id8c166abb1af281090f8fdbfa04d6f31d197c5f2
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
5195d2d4f0c4c09f513209a70a6997652e5eb754 02-Feb-2010 Tom Taylor <tomtaylor@google.com> Merge "Update ConversationList backgrounds"
5c692bf6ab8df5145f377a2adb769d085500d91a 02-Feb-2010 Tom Taylor <tomtaylor@google.com> Update ConversationList backgrounds

Now going with a light background theme, instead of a dark one.
Take the opportunity to rename several files to names that are
more standard across Android apps. This will make it easier to
find the listitems that belong to the conversation list. The old
names always trip up those browsing the sources for the first, second,
and tenth times. Fixes bug 2406873.
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/ConversationListItem.java
ms/ui/ConversationListItemData.java
4cd245dd6fc1b9e45d774fbccc54a69a3a765861 01-Feb-2010 Maryam Garrett <mkamvar@google.com> src/com/android/mms/transaction/SmsMessageSender.java

This change adds in logging of "IME_TEXT_ACCEPTED" event,
one metric of user happiness, for the SMS application.

Change-Id: Ibf1adf278111f22f37801c6822d41fc72211cb5c
ms/data/WorkingMessage.java
3e1da0e1638c77be0c47997f17633596a38f055b 29-Jan-2010 Tom Taylor <tomtaylor@google.com> Recycler not obeying setting

One of the functions in the Mms recycler wasn't testing to see if
the Recycler was enabled or not. Therefore, it was always recycling
(probably at the default of 20 mms messages). Fixes bug 2401179.

Change-Id: Ia37f5bed184a50ed9c7dcaea04afeb88a2374f56
ms/util/Recycler.java
fd644551e8506266aad2b76463b51b44154ed62f 29-Jan-2010 Tom Taylor <tomtaylor@google.com> Update refs now that MMS is removed

Move MMS to mms-common library. Update imports.

Change-Id: I28fa24a68c27977eba58cb62f2667596d3abe2c4
ms/data/Contact.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/dom/smil/parser/SmilXmlParser.java
ms/drm/DrmUtils.java
ms/drm/DrmWrapper.java
ms/mms/ContentType.java
ms/mms/InvalidHeaderValueException.java
ms/mms/MmsException.java
ms/mms/pdu/AcknowledgeInd.java
ms/mms/pdu/Base64.java
ms/mms/pdu/CharacterSets.java
ms/mms/pdu/DeliveryInd.java
ms/mms/pdu/EncodedStringValue.java
ms/mms/pdu/GenericPdu.java
ms/mms/pdu/MultimediaMessagePdu.java
ms/mms/pdu/NotificationInd.java
ms/mms/pdu/NotifyRespInd.java
ms/mms/pdu/PduBody.java
ms/mms/pdu/PduComposer.java
ms/mms/pdu/PduContentTypes.java
ms/mms/pdu/PduHeaders.java
ms/mms/pdu/PduParser.java
ms/mms/pdu/PduPart.java
ms/mms/pdu/PduPersister.java
ms/mms/pdu/QuotedPrintable.java
ms/mms/pdu/ReadOrigInd.java
ms/mms/pdu/ReadRecInd.java
ms/mms/pdu/RetrieveConf.java
ms/mms/pdu/SendConf.java
ms/mms/pdu/SendReq.java
ms/mms/util/AbstractCache.java
ms/mms/util/PduCache.java
ms/mms/util/PduCacheEntry.java
ms/mms/util/SqliteWrapper.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ImageModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/RegionMediaModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/telephony/TelephonyProvider.java
ms/transaction/MessageSender.java
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationTransaction.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/SmsRejectedReceiver.java
ms/transaction/SmsSingleRecipientSender.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/DeliveryReportActivity.java
ms/ui/ManageSimMessages.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/RecipientsEditor.java
ms/ui/SearchActivity.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowEditor.java
ms/ui/UriImage.java
ms/util/AddressUtils.java
ms/util/DownloadManager.java
ms/util/DraftCache.java
ms/util/RateController.java
ms/util/Recycler.java
c2768997eeab2c1e986c3c6d68a1e882b9fc661d 28-Jan-2010 Satoshi Kataoka <satok@google.com> Merge "Enable to parse Html MMS"
7c8748972faf3078f53ef9ecbe6c95f0903f43f7 28-Jan-2010 satok <satok@google.com> Enable to parse Html MMS

BUG: 2373437

- Enabled multipart.aplternative
- Enabled to manage "text/html"
- Added parser for converting html mail to TextView
ms/mms/ContentType.java
ms/mms/pdu/PduParser.java
ms/mms/pdu/PduPersister.java
ms/model/SlideModel.java
ms/model/SmilHelper.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
1931fe06a209e2ed3497db0248eec31dbe95d352 28-Jan-2010 Jesse Wilson <jessewilson@google.com> Removing now redundant copies of DOM v3 from MMS.

These were necessary for SMIL when Dalvik supported only DOM v2. This was
causing crashes because the MMS app included non-standard changes to the W3C
APIs for Event.getSeekTo() and Event.initEvent(). See bug 2403861.
ms/dom/smil/SmilMediaElementImpl.java
ms/model/AudioModel.java
ms/model/VideoModel.java
2a682490e6caa0b2fc5793e0881e6ba85c21b66d 27-Jan-2010 Jesse Wilson <jessewilson@google.com> Bringing MMS up-to-date with Dalvik's new DOM v3 support.

See related Dalvik change, https://android-git.corp.google.com/g/38533
ms/dom/AttrImpl.java
ms/dom/DocumentImpl.java
ms/dom/ElementImpl.java
ms/dom/NodeImpl.java
f9e3786006b0a0e8ce264f91670bba1527e04b0a 27-Jan-2010 Tom Taylor <tomtaylor@google.com> Fix a slide out-of-bounds problem

A user received an MMS that caused the app to crash. The
UI code always assumes there's a slide 0. Allow the UI to
request slide 0 and get back null. Fixes bug 2387281 or at
least pushes the problem farther down line. Without this fix,
the user can't even forward the message to me to debug. Also
fixes monkey bug: 2369553.
ms/model/SlideshowModel.java
e0f5751d1006748a848abf6056c01c6f59574f58 27-Jan-2010 Tom Taylor <tomtaylor@google.com> Merge "Fix a crasher"
dc7f95eaf3f1668e90e1add17e07fd3b4b839535 26-Jan-2010 Wei Huang <weih@google.com> clean up MMS contact more, manually integrate bug fixes from Eclair MR3.

- integrate change to speed up contact query.
- fixes contact query threading bug that could result in the contact cache containing the wrong number.
- fixes usage of synchronized block, synchronize on the contact object when updating the contact.
ms/data/Contact.java
07cd34eef6ff14e823a3cedfadadeb1c6e535812 26-Jan-2010 Tom Taylor <tomtaylor@google.com> Fix a crasher

Actually, it's our own crasher because we were throwing an exception
in an unusual circumstance. Before we hide the recipients editor,
remove the text changed listener.
Fixes bug 2396299.
ms/ui/ComposeMessageActivity.java
c8662c2fde3cac8603bde60d8c619dc1fa761109 26-Jan-2010 Wei Huang <weih@google.com> am 2cbf43b9: bug 2384418: fix bug in mms contact lookup.

Merge commit '2cbf43b9b0429b4b09ed6f67abe56e20bcdf9f6a' into eclair-plus-aosp

* commit '2cbf43b9b0429b4b09ed6f67abe56e20bcdf9f6a':
bug 2384418: fix bug in mms contact lookup.
2cbf43b9b0429b4b09ed6f67abe56e20bcdf9f6a 26-Jan-2010 Wei Huang <weih@google.com> bug 2384418: fix bug in mms contact lookup.

- a portion of the mms contact lookup wasn't protected by the synchronization block, and that portion used a member variable 'mSelectionArgs[]', which contains the number to be looked up. If this code is accessed by different threads at the same time, mSelectionArgs[] could be overridden by a wrong number, causing the resulting contact info be bad. With the bad contact cache, future lookups by phone number would result in the wrong contact.

While I didn't reproduce this with release builds, I was able to write a test that looks up a bunch of numbers in thread 1, and another bunch in thread 2. I observed thread #2 overwritting mSelectionArgs[] for thread 1, causing contact lookup to create bad contact cache. I believe in practice this can happen as the MMS code does look up and create contact cache entries from different threads.

This problem should be in builds before ERE19. In ERE19, Dmitri added an optimization in the ContactInfoCache's contact lookup, which should result in contact lookup to fail (zero cursor) when mSelectionArgs[] is overwritten by a bad phone number. It'd be nice to confirm that, but bug 2384418 doesn't contain a bug report, and we don't know for sure which build it was found in.

In any case, this fix is straight forward and should fix the contact lookup.

Change-Id: I516ff7039bec47c1b7bdc7dd5e52347c004a5a13
ms/util/ContactInfoCache.java
b89a6e906aee77fb2c575a166e1fb6b521327276 21-Jan-2010 Christopher Van Der Westhuizen <cvanderw@google.com> Change that addresses the "Send MMS" button clipping issue.

An issue exists in which the "Send MMS" button is shrinked and has its text clipped when the text editor is one line long. This CL addresses that issue (Bug 2381613).

This CL also addresses another issue seen where, after sending an MMS message, the send button retains the "Send MMS" text and does not appropriately revert back to simply saying "Send" (Bug 2385924).
ms/ui/ComposeMessageActivity.java
2735e5277915335c0a029b463e92133b64eda015 25-Jan-2010 Eugene Koh <koh@google.com> Merge "Using the linear layout to show the slides. Enable PREV and NEXT button, to move among the slides quickly."
18caa3c3787c3b367b889d56da30dbc40ccb41cf 23-Jan-2010 Mark Wagner <mxw@google.com> Merge "Contact class cleanup"
d7a1ec4c8a007f707cc3115ed6e558f839f875ea 22-Jan-2010 Bai Tao <michaelbai@google.com> Using the linear layout to show the slides.
Enable PREV and NEXT button, to move among the slides quickly.
ms/dom/smil/SmilPlayer.java
ms/ui/SlideView.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowPresenter.java
ea5e915b6104ff0e30c313bcb5a96f838997e57b 22-Jan-2010 Mark Wagner <mxw@google.com> Contact class cleanup

Register listeners on the class rather than on the individual contact.
This is easier to manage.
ms/data/Contact.java
ms/data/ContactList.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeaderView.java
ms/ui/SearchActivity.java
42c9e6a4e71008e7aa0e8705be347d9bb31572af 14-Jan-2010 Paul Westbrook <pwestbro@google.com> Bug 2330111

Switched mms to use the new location of NumberPicker. Switched
to use protected method, instead of protected members.
ms/ui/NumberPickerDialog.java
7759a8230a258f772a0c95ad107f59d51998cbd2 21-Jan-2010 Mark Wagner <mxw@google.com> search suggestions tweakage for case insensitivity

for search suggestions if we get Foo then don't display
foo as a latter suggestion
ms/SuggestionsProvider.java
249ae2eeecf2dd7fe15ef3e050cac57042c7468e 21-Jan-2010 Bai Tao <michaelbai@google.com> avoid sending the same message two times with enter key.

http://b/2285060
ms/ui/ComposeMessageActivity.java
9facfee1596fd4467c964ec99ed20ef1a6e8107d 21-Jan-2010 Wei Huang <weih@google.com> am 9d17f038: Bug: 2167799

Merge commit '9d17f038500ebb7c7cf0e337f198e8b43bf42e4c' into eclair-plus-aosp

* commit '9d17f038500ebb7c7cf0e337f198e8b43bf42e4c':
Bug: 2167799
85a8319bce7ada6f93f0203a7a1b42138fec98d4 21-Jan-2010 Wei Huang <weih@google.com> Merge "Fix NEP when save attached of some specific MMS"
9d17f038500ebb7c7cf0e337f198e8b43bf42e4c 21-Jan-2010 Wei Huang <weih@google.com> Bug: 2167799

- use PhoneUtils.toCallerIDMinMatch() instead of getStrippedReversed(). The latter uses the whole number, and would treat numbers "1-650-555-1212" and "650-555-1212" differently. The former uses the first 7 digits of the reversed digits, and is what ContactsProvider uses to filter for numbers.
ms/util/ContactInfoCache.java
fe2332c7ae78ca4d4e1b4ea0f8a948536d16f3d8 21-Jan-2010 Bai Tao <michaelbai@google.com> Fix NEP when save attached of some specific MMS

http://b/2333442
ms/ui/ComposeMessageActivity.java
5227290bbaefe2438cac9b3868a72a12a3339e83 20-Jan-2010 Mike Lockwood <lockwood@android.com> Use default values rather than hard coding green for LED notification color.

Change-Id: I5b112684cf9e10479d32bd70085483d2774e26ab
BUG: 2329568

Signed-off-by: Mike Lockwood <lockwood@android.com>
ms/transaction/MessagingNotification.java
abca949875903a64ebd6c10ca82d54b0fe01038d 19-Jan-2010 Tom Taylor <tomtaylor@google.com> Fix black background while scrolling

Similar to gtalk bug 2364317, the messaging search results list
would turn black while scrolling. Fix the problem the correct way.

Change-Id: Icb329a6064416fbb2ad9656ab5fda8e0e1d6cb4d
ms/ui/SearchActivity.java
9a201f91e62fbc9444788da81df90dfc2afaebda 19-Jan-2010 Dmitri Plotnikov <dplotnikov@google.com> am 5a8b006e: Optimizing phone lookup for MMS recipient list.

Merge commit '5a8b006effb42a6c4088a1564cd8b6f53b037870' into eclair-plus-aosp

* commit '5a8b006effb42a6c4088a1564cd8b6f53b037870':
Optimizing phone lookup for MMS recipient list.
5a8b006effb42a6c4088a1564cd8b6f53b037870 19-Jan-2010 Dmitri Plotnikov <dplotnikov@google.com> Optimizing phone lookup for MMS recipient list.

Bug: 2167799
Change-Id: I25a7fc18260bbec3dcc5eb87ede45be644d51ef6
ms/util/ContactInfoCache.java
4cb031ac8f130f345cdfd482f8eb7bd38232c1cf 11-Jan-2010 Christopher Van Der Westhuizen <cvanderw@google.com> Updating Mms package to include a permanent, static text indicator when the message is a MMS message. This is done as per bug 2338536 and the mock up provided there.

Change-Id: Idccefa56700320af49b7639cd63a0f4ec2a6625c
ms/ui/ComposeMessageActivity.java
f31df323b2dc4b668d91b24dd3a5d34f5ccbb14c 16-Jan-2010 Tom Taylor <tomtaylor@google.com> Cleanup toast handler

This is for bug 2369881. The bug recommended removing the handler.
When I tried that (by calling the toast directly) the toast no longer
showed up. I stepped through the toast's show() method, but didn't see
anything wrong. I decided to follow the model of Activity's runOnUiThread()
and make the code a little more obvious.

Change-Id: Ice20fe9e8dff121ec2a54432bbccdab826537633
ms/transaction/SmsReceiverService.java
69f9edb80d24a50a0f98d7fcaccdc3e19cc903be 15-Jan-2010 Tom Taylor <tomtaylor@google.com> Fix a null ref

Bug 2377136.

Change-Id: I42e9231b8a2d2be83a9decb220d2651ecd6350e6
ms/ui/ComposeMessageActivity.java
ms/ui/SearchActivity.java
90420498d152ae7974f5669522116046f110421d 15-Jan-2010 Wei Huang <weih@google.com> Merge "Sending message one by one"
52b0fc717011d84dd25c1e88998eaae97c8161a8 13-Jan-2010 Bai Tao <michaelbai@google.com> Sending message one by one
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiverService.java
ms/transaction/SmsSingleRecipientSender.java
f114492537753bc68640d4a0d403861387296bcb 04-Jan-2010 Mark Wagner <mxw@google.com> search work

see the comments in the provider cl for more details
ms/MmsApp.java
ms/SuggestionsProvider.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/SearchActivity.java
8e1e2ce77c35a95efffa6601eb3101956613467a 13-Jan-2010 Tom Taylor <tomtaylor@google.com> am 68f969df: Don\'t load contacts on UI thread

Merge commit '68f969df2239c4209b3db3294498ffab4526e34e' into eclair-plus-aosp

* commit '68f969df2239c4209b3db3294498ffab4526e34e':
Don't load contacts on UI thread
68f969df2239c4209b3db3294498ffab4526e34e 12-Jan-2010 Tom Taylor <tomtaylor@google.com> Don't load contacts on UI thread

There's a route through a Conversation constructor that will
result in the conversation's contacts getting loaded on the
UI thread. Add an explicit "allowQuery" parameter to give callers
the ability to throttle this behavior. Fixes bug 2280762.

Conflicts:

src/com/android/mms/data/Conversation.java
src/com/android/mms/ui/ComposeMessageActivity.java
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
7416981874a704e3e4dea269f0d2caccb057b8d3 09-Jan-2010 Romain Guy <romainguy@android.com> Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
ms/ui/SlideView.java
3451cbcbfb5a26dba9b6713e07ba9e279f90c7de 23-Dec-2009 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of 64c734ff to master
64c734ffe641e64faf77d3a0d879b1ffd3c02730 23-Dec-2009 Tom Taylor <tomtaylor@google.com> am 6be18bed: Unbundling work

Merge commit '6be18bedb5b87dbbcdb54f37d5a0945bd0f71377' into eclair-mr2-plus-aosp

* commit '6be18bedb5b87dbbcdb54f37d5a0945bd0f71377':
Unbundling work
bb8edcae15a50b3651261db70791afc668aae294 22-Dec-2009 Tom Taylor <tomtaylor@google.com> Use TelephonyManager indirectly

In order to build against the SDK, get the TelephonyManager via
getSystemService rather than use directly.

Change-Id: If1d682a41bd590f1a9757fda13ec12d061666368
ms/MmsApp.java
ms/transaction/NotificationTransaction.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/MessagingPreferenceActivity.java
225e57fc21ad8c625dd0d5af19211b8d8ec2d157 22-Dec-2009 Tom Taylor <tomtaylor@google.com> Manually merge changes from MR2

Some changes to several dependent CL's didn't seem to get merged
and broke the build.
ms/MmsConfig.java
ms/transaction/TransactionService.java
ms/ui/RecipientsAdapter.java
7bf703913dfb4c253b645279d69b7c6d25634880 18-Dec-2009 Tom Taylor <tomtaylor@google.com> Fix a monkey crasher

The monkey can delete a slide and still popup a menu. Protect with
isFinishing.

Change-Id: Idf853df23c38095203d2d50de9b52be1e96abfd7
ms/ui/SlideEditorActivity.java
564d91e72ec4cd1613637af162dc1f09311fb358 18-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ic21e3daf

* changes:
Fix IndexOutOfBoundsException bug
b79df272305c0c27954b7bd44de0e5df97e3e639 18-Dec-2009 Tom Taylor <tomtaylor@google.com> Fix IndexOutOfBoundsException bug

The monkey discovered a bug where alternately typing into a slide and
immediately tapping the "Remove slide" button causes a crash as the
code responds to "afterTextChanged". Now if the activity is in the finishing
state, we don't bother dealing with the changed text.
Fixes bug 2336463.

Change-Id: Ic21e3daf8dd8cf936f0f0edb1e11763fabd1a0f4
ms/ui/SlideEditorActivity.java
40ab55a4337738075adbda3642ce0415f3810c4c 18-Dec-2009 Mark Wagner <mxw@google.com> Use String rather than CharSequence as hash key

This is necessary because char sequence equality is object
equality as opposed to value equality. Strings are afforded
the special value equality property.
ms/data/Contact.java
6be18bedb5b87dbbcdb54f37d5a0945bd0f71377 17-Dec-2009 Tom Taylor <tomtaylor@google.com> Unbundling work

This is the first step in unbundling the Mms app. Some of the changes include:
- moving some of the Mms code from the framework into the app itself.
- same with emoticons
- remove dependency on internal drawables and add local copy to mms
- some dependencies on various internal classes now moved to android-common library
ms/MmsApp.java
ms/MmsConfig.java
ms/data/Contact.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/dom/smil/parser/SmilXmlParser.java
ms/mms/ContentType.java
ms/mms/InvalidHeaderValueException.java
ms/mms/MmsException.java
ms/mms/pdu/AcknowledgeInd.java
ms/mms/pdu/Base64.java
ms/mms/pdu/CharacterSets.java
ms/mms/pdu/DeliveryInd.java
ms/mms/pdu/EncodedStringValue.java
ms/mms/pdu/GenericPdu.java
ms/mms/pdu/MultimediaMessagePdu.java
ms/mms/pdu/NotificationInd.java
ms/mms/pdu/NotifyRespInd.java
ms/mms/pdu/PduBody.java
ms/mms/pdu/PduComposer.java
ms/mms/pdu/PduContentTypes.java
ms/mms/pdu/PduHeaders.java
ms/mms/pdu/PduParser.java
ms/mms/pdu/PduPart.java
ms/mms/pdu/PduPersister.java
ms/mms/pdu/QuotedPrintable.java
ms/mms/pdu/ReadOrigInd.java
ms/mms/pdu/ReadRecInd.java
ms/mms/pdu/RetrieveConf.java
ms/mms/pdu/SendConf.java
ms/mms/pdu/SendReq.java
ms/mms/util/AbstractCache.java
ms/mms/util/PduCache.java
ms/mms/util/PduCacheEntry.java
ms/mms/util/SqliteWrapper.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ImageModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/RegionMediaModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/telephony/Phone.java
ms/telephony/TelephonyIntents.java
ms/telephony/TelephonyProperties.java
ms/telephony/TelephonyProvider.java
ms/transaction/MessageSender.java
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationTransaction.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/SmsRejectedReceiver.java
ms/transaction/Transaction.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/DeliveryReportActivity.java
ms/ui/ManageSimMessages.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/RecipientsAdapter.java
ms/ui/RecipientsEditor.java
ms/ui/SearchActivity.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowEditor.java
ms/ui/SlideshowPresenter.java
ms/ui/UriImage.java
ms/ui/VideoAttachmentView.java
ms/ui/WarnOfStorageLimitsActivity.java
ms/util/AddressUtils.java
ms/util/DownloadManager.java
ms/util/DraftCache.java
ms/util/RateController.java
ms/util/Recycler.java
ms/util/SmileyParser.java
02e0cb944b3112284859e683a06502d6d6b8b111 14-Dec-2009 Paul Westbrook <pwestbro@google.com> am e6effcf2: am 41f895e5: Changed class paths for classes moved in unbundling effort

Merge commit 'e6effcf20a6d4b8f372a59750dc1dc2e9987db4b'

* commit 'e6effcf20a6d4b8f372a59750dc1dc2e9987db4b':
Changed class paths for classes moved in unbundling effort
e6effcf20a6d4b8f372a59750dc1dc2e9987db4b 14-Dec-2009 Paul Westbrook <pwestbro@google.com> am 41f895e5: Changed class paths for classes moved in unbundling effort

Merge commit '41f895e5147e7115d46a46657356f33b31251504' into eclair-mr2-plus-aosp

* commit '41f895e5147e7115d46a46657356f33b31251504':
Changed class paths for classes moved in unbundling effort
41f895e5147e7115d46a46657356f33b31251504 11-Dec-2009 Paul Westbrook <pwestbro@google.com> Changed class paths for classes moved in unbundling effort
ms/transaction/HttpUtils.java
ms/ui/NumberPickerDialog.java
9f41df55c815a40fe72b2c5552977cf47a625156 11-Dec-2009 Mark Wagner <mxw@google.com> am f9e5e880: am fb3f9e4e: Merge change I554b33fc into eclair-mr2

Merge commit 'f9e5e880b22b547bc7fdddaf71417d1b82061ea2'

* commit 'f9e5e880b22b547bc7fdddaf71417d1b82061ea2':
use a hashtable to speedup contacts cache lookup
f9e5e880b22b547bc7fdddaf71417d1b82061ea2 11-Dec-2009 Mark Wagner <mxw@google.com> am fb3f9e4e: Merge change I554b33fc into eclair-mr2

Merge commit 'fb3f9e4e2b63b8d00168ed662aaefca19d559d7e' into eclair-mr2-plus-aosp

* commit 'fb3f9e4e2b63b8d00168ed662aaefca19d559d7e':
use a hashtable to speedup contacts cache lookup
fb3f9e4e2b63b8d00168ed662aaefca19d559d7e 11-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I554b33fc into eclair-mr2

* changes:
use a hashtable to speedup contacts cache lookup
39449ff84f95e0724a0afbec81160595fbece308 10-Dec-2009 Tom Taylor <tomtaylor@google.com> am e7dad81b: am d5ab1597: Merge change I8966bbf5 into eclair-mr2

Merge commit 'e7dad81b361a2b7a4c3b5e0fd146b64ad6649039'

* commit 'e7dad81b361a2b7a4c3b5e0fd146b64ad6649039':
Resize pictures at send time
27e95b8c9ac2f9f18a8a10f03b73390cabbae495 10-Dec-2009 Mark Wagner <mxw@google.com> am 3ad682e2: am b54460a3: more Contacts code reorg

Merge commit '3ad682e2b96230f20f7f023593819efe484a4760'

* commit '3ad682e2b96230f20f7f023593819efe484a4760':
more Contacts code reorg
f49d60e80bc34c626063dfb79f97142e25a264d3 10-Dec-2009 Mark Wagner <mxw@google.com> am 3b84e030: am 161c3cfe: contacts cleanup

Merge commit '3b84e0306315667a98705c7fe35d8d38e78ba150'

* commit '3b84e0306315667a98705c7fe35d8d38e78ba150':
contacts cleanup
513ec194e86409bac7d2ca61a4edcbbe6a36181e 09-Dec-2009 Mark Wagner <mxw@google.com> use a hashtable to speedup contacts cache lookup

The strategy is now as follows: for any given phone number take
the last 5 digits and use that as a key in a hashmap. Map to a
list of Contacts all of whom share that same key. Typically that
list will be very small.

Each "get" still requires at least one call to PhoneNumberUtils.compare.
We could eliminate that by introducing another hashtable which maps
from phone number to Contact object. In that case the existing mapping
function would only be used as a fallback when we didn't find anything
in the direct hash.

I recommend reviewing this change by looking at the new implementation of
"get". Trying to look at "diffs" won't work very well.
ms/data/Contact.java
e7dad81b361a2b7a4c3b5e0fd146b64ad6649039 10-Dec-2009 Tom Taylor <tomtaylor@google.com> am d5ab1597: Merge change I8966bbf5 into eclair-mr2

Merge commit 'd5ab1597311248c6144c8477e0350b5f89b05d26' into eclair-mr2-plus-aosp

* commit 'd5ab1597311248c6144c8477e0350b5f89b05d26':
Resize pictures at send time
3ad682e2b96230f20f7f023593819efe484a4760 10-Dec-2009 Mark Wagner <mxw@google.com> am b54460a3: more Contacts code reorg

Merge commit 'b54460a3af15ca85c2a7b6d5422e9e5eb4592fa8' into eclair-mr2-plus-aosp

* commit 'b54460a3af15ca85c2a7b6d5422e9e5eb4592fa8':
more Contacts code reorg
3b84e0306315667a98705c7fe35d8d38e78ba150 10-Dec-2009 Mark Wagner <mxw@google.com> am 161c3cfe: contacts cleanup

Merge commit '161c3cfe3480ab8b1b585cc0d3601f0cacc28c6d' into eclair-mr2-plus-aosp

* commit '161c3cfe3480ab8b1b585cc0d3601f0cacc28c6d':
contacts cleanup
d5ab1597311248c6144c8477e0350b5f89b05d26 09-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8966bbf5 into eclair-mr2

* changes:
Resize pictures at send time
10eed0e3020e3eb0612747fe39e0f6117222dd95 09-Dec-2009 Tom Taylor <tomtaylor@google.com> Resize pictures at send time

Before this change, picture attachments would get resized as they
were added to a message. This means the first picture could take up
to the whole message space, the second picture any remaining space, etc.
With this change, pictures aren't resized until after the user hits
send. The remaining space in a message is divided equally among all
the picture attachments and they're resized to fit within that space.
ms/data/WorkingMessage.java
ms/model/ImageModel.java
ms/model/MediaModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/ui/ComposeMessageActivity.java
ms/ui/UriImage.java
b54460a3af15ca85c2a7b6d5422e9e5eb4592fa8 08-Dec-2009 Mark Wagner <mxw@google.com> more Contacts code reorg

Merge the ContactInfoCache code into the Contacts code. The general organization
now is that all the interesting work happens in Contact.ContactsCache.
ms/MmsApp.java
ms/data/Contact.java
ms/ui/ConversationHeaderView.java
ms/util/ContactInfoCache.java
161c3cfe3480ab8b1b585cc0d3601f0cacc28c6d 07-Dec-2009 Mark Wagner <mxw@google.com> contacts cleanup

This is part one of series of code reorganizing.
ms/data/Contact.java
ms/util/TaskStack.java
ce7195597fd25dc91e8220d112898ca73832450b 03-Dec-2009 Mark Wagner <mxw@google.com> am 1fb37c91: am 53b4416f: am c407b5e3: Merge change I2e5b602b into eclair

Merge commit '1fb37c9168e97301c5f1aa34f7e5eea44a5f2c50'

* commit '1fb37c9168e97301c5f1aa34f7e5eea44a5f2c50':
be sure to set mIsStale to false (bug 2299730)
3b12742a26922674705d7c59751b807657ef2de7 03-Dec-2009 Tom Taylor <tomtaylor@google.com> am 192f0ad3: am 050de08f: Merge change Ib259ebbd into eclair-mr2

Merge commit '192f0ad30ad947edd7edf0d5d3483661a215a9bb'

* commit '192f0ad30ad947edd7edf0d5d3483661a215a9bb':
A whitespace message is not a message
4febbd38b95f78bdf1407c6970a88ee5f2ff2d07 03-Dec-2009 Tom Taylor <tomtaylor@google.com> am 914c6668: am f1ab045f: Fix auto-requery ANR\'s

Merge commit '914c6668a91caac7e5258df59cce2509bd1ed7d2'

* commit '914c6668a91caac7e5258df59cce2509bd1ed7d2':
Fix auto-requery ANR's
f41cc510be443c51e1d1dff3abdb39c5c5b60e86 03-Dec-2009 Wei Huang <weih@google.com> am 1c54495c: am dadfe89b: am 1b37c93a: bug: change default UA agent string for MMS.

Merge commit '1c54495c6aaaf1fd55e05936a7209d0889166b83'

* commit '1c54495c6aaaf1fd55e05936a7209d0889166b83':
bug: change default UA agent string for MMS.
1fb37c9168e97301c5f1aa34f7e5eea44a5f2c50 03-Dec-2009 Mark Wagner <mxw@google.com> am 53b4416f: am c407b5e3: Merge change I2e5b602b into eclair

Merge commit '53b4416f5b8c76f2f66d12645951e09554683092' into eclair-mr2-plus-aosp

* commit '53b4416f5b8c76f2f66d12645951e09554683092':
be sure to set mIsStale to false (bug 2299730)
192f0ad30ad947edd7edf0d5d3483661a215a9bb 03-Dec-2009 Tom Taylor <tomtaylor@google.com> am 050de08f: Merge change Ib259ebbd into eclair-mr2

Merge commit '050de08f2f1ee6ab2de59e5e0457067be4c55aa4' into eclair-mr2-plus-aosp

* commit '050de08f2f1ee6ab2de59e5e0457067be4c55aa4':
A whitespace message is not a message
53b4416f5b8c76f2f66d12645951e09554683092 03-Dec-2009 Mark Wagner <mxw@google.com> am c407b5e3: Merge change I2e5b602b into eclair

Merge commit 'c407b5e3443ff715b47c0c343de24aa052d93f04' into eclair-mr2

* commit 'c407b5e3443ff715b47c0c343de24aa052d93f04':
be sure to set mIsStale to false (bug 2299730)
115358483e0fa5ec760a1bb2a1e4e417c7ee018d 03-Dec-2009 Mark Wagner <mxw@google.com> am c407b5e3: Merge change I2e5b602b into eclair

Merge commit 'c407b5e3443ff715b47c0c343de24aa052d93f04' into eclair-plus-aosp

* commit 'c407b5e3443ff715b47c0c343de24aa052d93f04':
be sure to set mIsStale to false (bug 2299730)
e1b0c082f7ab1910acdf8783c3095b323f93f6e7 02-Dec-2009 Mark Wagner <mxw@google.com> be sure to set mIsStale to false (bug 2299730)
ms/data/Contact.java
b259ebbdef366c08711fd6fd0f6122bcacdcfdeb 03-Dec-2009 Tom Taylor <tomtaylor@google.com> A whitespace message is not a message

Don't enable the send button on a message that's just whitespace.
Likewise, a whitespace-only message won't be saved as a draft.
In addition, the same rules now apply to a subject. A subject of
just whitespace doesn't count as a subject.
ms/data/WorkingMessage.java
914c6668a91caac7e5258df59cce2509bd1ed7d2 02-Dec-2009 Tom Taylor <tomtaylor@google.com> am f1ab045f: Fix auto-requery ANR\'s

Merge commit 'f1ab045ff991e1ec3e4161d213627b8629971c0e' into eclair-mr2-plus-aosp

* commit 'f1ab045ff991e1ec3e4161d213627b8629971c0e':
Fix auto-requery ANR's
f1ab045ff991e1ec3e4161d213627b8629971c0e 02-Dec-2009 Tom Taylor <tomtaylor@google.com> Fix auto-requery ANR's

There are a couple of bug reports of ANR's from CursorAdapter doing
a requery on the UI thread. There are two off-the-beaten-path places
where the CursorAdapter was getting set with auto-requery == true
by default. Also, the recipients editor adapter had requery == true.
With this change, there should be no auto-requerying in mms.
ms/ui/ComposeMessageActivity.java
ms/ui/ManageSimMessages.java
ms/ui/MessageListAdapter.java
ms/ui/RecipientsAdapter.java
ms/ui/SearchActivity.java
1c54495c6aaaf1fd55e05936a7209d0889166b83 02-Dec-2009 Wei Huang <weih@google.com> am dadfe89b: am 1b37c93a: bug: change default UA agent string for MMS.

Merge commit 'dadfe89b53af9b9ea492cf2ff6e936efe64bd716' into eclair-mr2-plus-aosp

* commit 'dadfe89b53af9b9ea492cf2ff6e936efe64bd716':
bug: change default UA agent string for MMS.
dadfe89b53af9b9ea492cf2ff6e936efe64bd716 02-Dec-2009 Wei Huang <weih@google.com> am 1b37c93a: bug: change default UA agent string for MMS.

Merge commit '1b37c93a3b67483ee9b0ad604a2e1e9d8aaa84d9' into eclair-mr2

* commit '1b37c93a3b67483ee9b0ad604a2e1e9d8aaa84d9':
bug: change default UA agent string for MMS.
8e4908e8667e65636654bd761b7d226f1c1a7347 02-Dec-2009 Tom Taylor <tomtaylor@google.com> am e3a9b86c: am 5163798d: Fix conversation loading

Merge commit 'e3a9b86c698e04f0c9ac278a18f359fca31319f7'

* commit 'e3a9b86c698e04f0c9ac278a18f359fca31319f7':
Fix conversation loading
e3a9b86c698e04f0c9ac278a18f359fca31319f7 02-Dec-2009 Tom Taylor <tomtaylor@google.com> am 5163798d: Fix conversation loading

Merge commit '5163798dea35fb12fa7892120d39605a1f3c175e' into eclair-mr2-plus-aosp

* commit '5163798dea35fb12fa7892120d39605a1f3c175e':
Fix conversation loading
fe2fb7c2af1973d3278d0b9542169cef98d5f4f0 02-Dec-2009 Tom Taylor <tomtaylor@google.com> am 93d99ee9: Fix conversation loading

Merge commit '93d99ee9ec32bb04ea2b6622472a3db5942e2e78' into eclair-plus-aosp

* commit '93d99ee9ec32bb04ea2b6622472a3db5942e2e78':
Fix conversation loading
93f1f2e7758201cd8de0af3f962cdcaa7853f060 02-Dec-2009 Wei Huang <weih@google.com> am 1b37c93a: bug: change default UA agent string for MMS.

Merge commit '1b37c93a3b67483ee9b0ad604a2e1e9d8aaa84d9' into eclair-plus-aosp

* commit '1b37c93a3b67483ee9b0ad604a2e1e9d8aaa84d9':
bug: change default UA agent string for MMS.
93d99ee9ec32bb04ea2b6622472a3db5942e2e78 02-Dec-2009 Tom Taylor <tomtaylor@google.com> Fix conversation loading

After loading a thread with an exact set of recipients, the code called
setRecipients() which resets the threadId to zero. As a result, a new
conversation was created and displayed, rather than the existing conversation
with all of its messages. Fixes bug 2284007.

Change-Id: I6b38a046120f320a95f5e63721ee3000290feb1c
ms/data/Conversation.java
1b37c93a3b67483ee9b0ad604a2e1e9d8aaa84d9 01-Dec-2009 Wei Huang <weih@google.com> bug: change default UA agent string for MMS.

- add conditional logging for UAProf url.
- if the MMS port isn't set, don't use Log.e() to log it.

Change-Id: I9557763d209226eafb5cb3b0b7e4092287f5ef29
ms/MmsConfig.java
ms/transaction/HttpUtils.java
ms/transaction/TransactionSettings.java
5163798dea35fb12fa7892120d39605a1f3c175e 01-Dec-2009 Tom Taylor <tomtaylor@google.com> Fix conversation loading

After loading a thread with an exact set of recipients, the code called
setRecipients() which resets the threadId to zero. As a result, a new
conversation was created and displayed, rather than the existing conversation
with all of its messages. Fixes bug 2284007.
ms/data/Conversation.java
cb2f9810ff716e671ab418d36b5d6776b6740d16 01-Dec-2009 Tom Taylor <tomtaylor@google.com> am 66f5386e: am e692b9dc: Don\'t load contacts on UI thread

Merge commit '66f5386e2256628e01fcaa24b2366f0be005c178'

* commit '66f5386e2256628e01fcaa24b2366f0be005c178':
Don't load contacts on UI thread
66f5386e2256628e01fcaa24b2366f0be005c178 01-Dec-2009 Tom Taylor <tomtaylor@google.com> am e692b9dc: Don\'t load contacts on UI thread

Merge commit 'e692b9dcf5742e7a3ef3a7e64b44bb9d08f05b57' into eclair-mr2-plus-aosp

* commit 'e692b9dcf5742e7a3ef3a7e64b44bb9d08f05b57':
Don't load contacts on UI thread
e692b9dcf5742e7a3ef3a7e64b44bb9d08f05b57 01-Dec-2009 Tom Taylor <tomtaylor@google.com> Don't load contacts on UI thread

There's a route through a Conversation constructor that will
result in the conversation's contacts getting loaded on the
UI thread. Add an explicit "allowQuery" parameter to give callers
the ability to throttle this behavior. Fixes bug 2280762.
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
d77e3dbdbe0731272d10502bfb59161ca6cb8abb 21-Nov-2009 Wei Huang <weih@google.com> am 0f889ff0: am f3c2e75b: am 6e78b272: bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn\'t present.

Merge commit '0f889ff03533b07e329f5ac2b3fef0da77ff2250'

* commit '0f889ff03533b07e329f5ac2b3fef0da77ff2250':
bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn't present.
4f50670b91f9df05e9872ac9b79ece5ace8448f7 21-Nov-2009 Wei Huang <weih@google.com> am 6e78b272: bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn\'t present.

Merge commit '6e78b272d691669e12519d32c77d9b85abf0b05f' into eclair-plus-aosp

* commit '6e78b272d691669e12519d32c77d9b85abf0b05f':
bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn't present.
0f889ff03533b07e329f5ac2b3fef0da77ff2250 21-Nov-2009 Wei Huang <weih@google.com> am f3c2e75b: am 6e78b272: bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn\'t present.

Merge commit 'f3c2e75bec754a17f8185ec3a01f6e3a18e2fc9d' into eclair-mr2-plus-aosp

* commit 'f3c2e75bec754a17f8185ec3a01f6e3a18e2fc9d':
bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn't present.
f3c2e75bec754a17f8185ec3a01f6e3a18e2fc9d 21-Nov-2009 Wei Huang <weih@google.com> am 6e78b272: bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn\'t present.

Merge commit '6e78b272d691669e12519d32c77d9b85abf0b05f' into eclair-mr2

* commit '6e78b272d691669e12519d32c77d9b85abf0b05f':
bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn't present.
49007a14fb92624f851e0aa0b782f913b95bf359 20-Nov-2009 Tom Taylor <tomtaylor@google.com> am d6cdc3b0: am 36991889: resolved conflicts for merge of d2edbbb1 to eclair-mr2

Merge commit 'd6cdc3b0964414363f783d188cb12b5ceaa7bf69'

* commit 'd6cdc3b0964414363f783d188cb12b5ceaa7bf69':
Fix two Messaging contact updating bugs
d6cdc3b0964414363f783d188cb12b5ceaa7bf69 20-Nov-2009 Tom Taylor <tomtaylor@google.com> am 36991889: resolved conflicts for merge of d2edbbb1 to eclair-mr2

Merge commit '36991889eac09f621b14ffd5a7a47317a35870a3' into eclair-mr2-plus-aosp

* commit '36991889eac09f621b14ffd5a7a47317a35870a3':
Fix two Messaging contact updating bugs
36991889eac09f621b14ffd5a7a47317a35870a3 20-Nov-2009 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of d2edbbb1 to eclair-mr2
6e78b272d691669e12519d32c77d9b85abf0b05f 20-Nov-2009 Wei Huang <weih@google.com> bug #2271915: make MmsConfig more robust - use defaults when configs in the xml file isn't present.

Change-Id: I628ddd211e1a130b10075dbe55708fca020bcfb6
ms/MmsConfig.java
cef23171af47121825c56619a521d6422a2c3c6a 20-Nov-2009 Tom Taylor <tomtaylor@google.com> am d2edbbb1: Fix two Messaging contact updating bugs

Merge commit 'd2edbbb15b418002e3c6542e092a8228ad39baaf' into eclair-plus-aosp

* commit 'd2edbbb15b418002e3c6542e092a8228ad39baaf':
Fix two Messaging contact updating bugs
d2edbbb15b418002e3c6542e092a8228ad39baaf 19-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix two Messaging contact updating bugs

1) There's a situation where getting a contact could potentially
return a cached contact whose contents haven't been completely filled
in yet.
2) When a contact's info does change, update the messages in the thread
to reflect the current contact data.
Bug 2271800.

Change-Id: I48403c45c461b3c609400a3a5f55b99aaee01cbd
ms/data/Contact.java
ms/ui/ComposeMessageActivity.java
de63923ac33c53286d2a6bc150b144fc9655698f 19-Nov-2009 Wei Huang <weih@google.com> am 595b954c: am e37a3911: clean up synchronized block usage.

Merge commit '595b954cb78f1ceee78678c202e0669d0e8118ed'

* commit '595b954cb78f1ceee78678c202e0669d0e8118ed':
clean up synchronized block usage.
687a565e912530e321178024d21f82d6eca53aa6 19-Nov-2009 Tom Taylor <tomtaylor@google.com> am 48e957dd: am 3b7f32b2: am 715e32f9: Fix ANR from calling Contact.get()

Merge commit '48e957dd030904805573f5ca1a408cd5c4ea37bb'

* commit '48e957dd030904805573f5ca1a408cd5c4ea37bb':
Fix ANR from calling Contact.get()
595b954cb78f1ceee78678c202e0669d0e8118ed 18-Nov-2009 Wei Huang <weih@google.com> am e37a3911: clean up synchronized block usage.

Merge commit 'e37a39111cf1e43107308e607c1c955989887c40' into eclair-mr2-plus-aosp

* commit 'e37a39111cf1e43107308e607c1c955989887c40':
clean up synchronized block usage.
48e957dd030904805573f5ca1a408cd5c4ea37bb 18-Nov-2009 Tom Taylor <tomtaylor@google.com> am 3b7f32b2: am 715e32f9: Fix ANR from calling Contact.get()

Merge commit '3b7f32b230434a1dcadf38d581ecc75fb0ae05bf' into eclair-mr2-plus-aosp

* commit '3b7f32b230434a1dcadf38d581ecc75fb0ae05bf':
Fix ANR from calling Contact.get()
e37a39111cf1e43107308e607c1c955989887c40 18-Nov-2009 Wei Huang <weih@google.com> clean up synchronized block usage.
ms/data/Conversation.java
3b7f32b230434a1dcadf38d581ecc75fb0ae05bf 18-Nov-2009 Tom Taylor <tomtaylor@google.com> am 715e32f9: Fix ANR from calling Contact.get()

Merge commit '715e32f97bd9d8ce4b5ba650b97ba4b137150456' into eclair-mr2

* commit '715e32f97bd9d8ce4b5ba650b97ba4b137150456':
Fix ANR from calling Contact.get()
58b6c18c4f3e7459c4ee30596eebb841bb3f87c6 18-Nov-2009 Tom Taylor <tomtaylor@google.com> am 715e32f9: Fix ANR from calling Contact.get()

Merge commit '715e32f97bd9d8ce4b5ba650b97ba4b137150456' into eclair-plus-aosp

* commit '715e32f97bd9d8ce4b5ba650b97ba4b137150456':
Fix ANR from calling Contact.get()
715e32f97bd9d8ce4b5ba650b97ba4b137150456 18-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix ANR from calling Contact.get()

The Contact.get() API allows the caller to specify whether the operation
can block (looking up contact info in the DB) or not. There are about 10
places where various callers were passing "true" to canBlock, all coming
from the UI thread. We've previously fixed Contact.get() to always return
a Contact, with the number filled in, even if we don't have the contact
in the cache. With this change, never block the UI thread getting a contact.
The worst side-effect should be showing a number, instead of a name.
Fixes bug 2265631.
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
ms/ui/DeliveryReportListItem.java
ms/ui/MessageItem.java
ms/ui/RecipientsEditor.java
ms/util/DownloadManager.java
c579b9e9cd2257695e609ce7a3f85adab96b78f7 12-Nov-2009 Jean-Baptiste Queru <jbq@google.com> fix build
ms/transaction/MessagingNotification.java
2031c8d5e0805fc6a2fbea0a2e65a95cb7a954ca 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
ec450c253e837eb98b31123e04616fdd047904f5 14-Nov-2009 Tom Taylor <tomtaylor@google.com> am 0b9a41e3: am e3cc2856: Fix null ref

Merge commit '0b9a41e3f65db1c51ff929e6fffb9c9ae3e9d34d' into eclair-mr2-plus-aosp

* commit '0b9a41e3f65db1c51ff929e6fffb9c9ae3e9d34d':
Fix null ref
0b9a41e3f65db1c51ff929e6fffb9c9ae3e9d34d 14-Nov-2009 Tom Taylor <tomtaylor@google.com> am e3cc2856: Fix null ref

Merge commit 'e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4' into eclair-mr2

* commit 'e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4':
Fix null ref
bbef625f9b10659f537322f56bbe34d8b2302f06 14-Nov-2009 Tom Taylor <tomtaylor@google.com> am e3cc2856: Fix null ref

Merge commit 'e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4' into eclair-plus-aosp

* commit 'e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4':
Fix null ref
e3cc2856bde797af8b9c5e0d9e3b6bb49b1200e4 14-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix null ref

Fixes bug 2261398.

Change-Id: Idb4db938e93b792248d49410b9474c71d5d4bb37
ms/ui/ComposeMessageActivity.java
1f8e4c8b80199bbc42fa88a9de5ee8719176ac42 13-Nov-2009 Tom Taylor <tomtaylor@google.com> am 354b945e: resolved conflicts for merge of cd88c0f1 to eclair-mr2

Merge commit '354b945e3d1cc4b6c38c94a5c74c1552ed5a83da' into eclair-mr2-plus-aosp

* commit '354b945e3d1cc4b6c38c94a5c74c1552ed5a83da':
Only register for service changes when needed
5c498a1ebc57e0cb26351cd4fc58e7d66c98467d 13-Nov-2009 Tom Taylor <tomtaylor@google.com> am 8c8e0937: Don\'t show Converting to MMS

Merge commit '8c8e093724540586cb093181c2557b7ec0b661a5' into eclair-plus-aosp

* commit '8c8e093724540586cb093181c2557b7ec0b661a5':
Don't show Converting to MMS
354b945e3d1cc4b6c38c94a5c74c1552ed5a83da 13-Nov-2009 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of cd88c0f1 to eclair-mr2
272e05fde3a749edf355636a421ca792e7331799 13-Nov-2009 Tom Taylor <tomtaylor@google.com> am cd88c0f1: Only register for service changes when needed

Merge commit 'cd88c0f1da9bc67a67dd7174428ab3195a2dc11f' into eclair-plus-aosp

* commit 'cd88c0f1da9bc67a67dd7174428ab3195a2dc11f':
Only register for service changes when needed
8c8e093724540586cb093181c2557b7ec0b661a5 05-Nov-2009 Tom Taylor <tomtaylor@google.com> Don't show Converting to MMS

When we open a thread where the recipient is an
email address, don't automatically show the "Converting
to multimedia message" The user already saw that when
he/she added the email recipient. Bug 2235226.
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
cd88c0f1da9bc67a67dd7174428ab3195a2dc11f 12-Nov-2009 Tom Taylor <tomtaylor@google.com> Only register for service changes when needed

The SmsReceiverService registered for SERVICE_STATE changes and this
was causing the Messaging app to be needlessly started up on every
SERVICE_STATE change. With this fix, we only register for that event
when we fail to send a SMS message because of no radio sig, etc.
Once we successfully send the queued message, we'll unregister the
event filter.

Change-Id: I12cbe0cb9a72bbf628bf9a4929680519e85057a2
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
eaae85a611898cdb5e672eaf10a15e3e32a57754 12-Nov-2009 Tom Taylor <tomtaylor@google.com> am 3a0501f8: am e676b822: Fix a draft mix-up bug

Merge commit '3a0501f8e94fa124a0609fef327a7390af51d18f' into eclair-mr2-plus-aosp

* commit '3a0501f8e94fa124a0609fef327a7390af51d18f':
Fix a draft mix-up bug
2641769e00679798afb58e6965523dafa6f48779 12-Nov-2009 Wei Huang <weih@google.com> am ab520a17: am 6595d80a: bug 2251648: fix a bug where the Conversation\'s recipients field failed to be initialized.

Merge commit 'ab520a17f81d6eab0b74a750d130748aafb4babc' into eclair-mr2-plus-aosp

* commit 'ab520a17f81d6eab0b74a750d130748aafb4babc':
bug 2251648: fix a bug where the Conversation's recipients field failed to be initialized.
3a0501f8e94fa124a0609fef327a7390af51d18f 12-Nov-2009 Tom Taylor <tomtaylor@google.com> am e676b822: Fix a draft mix-up bug

Merge commit 'e676b8223ffc6a77acd8b36125f200fa30424efe' into eclair-mr2

* commit 'e676b8223ffc6a77acd8b36125f200fa30424efe':
Fix a draft mix-up bug
ab520a17f81d6eab0b74a750d130748aafb4babc 12-Nov-2009 Wei Huang <weih@google.com> am 6595d80a: bug 2251648: fix a bug where the Conversation\'s recipients field failed to be initialized.

Merge commit '6595d80abc6ab706ae296e9e51351c8ef6299219' into eclair-mr2

* commit '6595d80abc6ab706ae296e9e51351c8ef6299219':
bug 2251648: fix a bug where the Conversation's recipients field failed to be initialized.
315761a738bb5b0f90f10109774bc1c7fa4a6fdf 11-Nov-2009 Tom Taylor <tomtaylor@google.com> am e676b822: Fix a draft mix-up bug

Merge commit 'e676b8223ffc6a77acd8b36125f200fa30424efe' into eclair-plus-aosp

* commit 'e676b8223ffc6a77acd8b36125f200fa30424efe':
Fix a draft mix-up bug
e676b8223ffc6a77acd8b36125f200fa30424efe 11-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix a draft mix-up bug

There's a particular situation that'll cause ComposeMessageActivity
to choose an existing draft even though the new intent is for a totally
different contact. Fixes bug 2254833.

Change-Id: I1065806c7535a48e1c27140c4c76ccf9b9959c03
ms/ui/ComposeMessageActivity.java
a133a2c0f6a8b06a206669a350041986cfc7ba34 11-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
c53be9b593a7449c911589418fdfd592ff79636c 11-Nov-2009 Wei Huang <weih@google.com> am 6595d80a: bug 2251648: fix a bug where the Conversation\'s recipients field failed to be initialized.

Merge commit '6595d80abc6ab706ae296e9e51351c8ef6299219' into eclair-plus-aosp

* commit '6595d80abc6ab706ae296e9e51351c8ef6299219':
bug 2251648: fix a bug where the Conversation's recipients field failed to be initialized.
6595d80abc6ab706ae296e9e51351c8ef6299219 11-Nov-2009 Wei Huang <weih@google.com> bug 2251648: fix a bug where the Conversation's recipients field failed to be initialized.

- this caused by a recent change to store the recipient id key as a Long instead of a String
in RecipientIdCache. It's an easy fix.
ms/data/RecipientIdCache.java
6a870c46f3fe32763e8a9a6af5f55636b524364b 10-Nov-2009 Wei Huang <weih@google.com> am c0c44208: fix MR2 MMS build broken by auto merging a cl from eclair.

Merge commit 'c0c4420878eff51ce95cda9062cb3a1da6b671c8' into eclair-mr2-plus-aosp

* commit 'c0c4420878eff51ce95cda9062cb3a1da6b671c8':
fix MR2 MMS build broken by auto merging a cl from eclair.
c0c4420878eff51ce95cda9062cb3a1da6b671c8 10-Nov-2009 Wei Huang <weih@google.com> fix MR2 MMS build broken by auto merging a cl from eclair.
ms/SuggestionsProvider.java
eee906821617074ead8ff675bf5703a1c0bc766b 10-Nov-2009 Wei Huang <weih@google.com> am fd78cc14: am 49183c09: bug 2250049: need to allow email address when sending a SMS message.

Merge commit 'fd78cc14a7ab50f652f16a3adb0403a3f6185d51' into eclair-mr2-plus-aosp

* commit 'fd78cc14a7ab50f652f16a3adb0403a3f6185d51':
bug 2250049: need to allow email address when sending a SMS message.
fd78cc14a7ab50f652f16a3adb0403a3f6185d51 10-Nov-2009 Wei Huang <weih@google.com> am 49183c09: bug 2250049: need to allow email address when sending a SMS message.

Merge commit '49183c099b1ac79f3c2fe97368ed76caba4ca98e' into eclair-mr2

* commit '49183c099b1ac79f3c2fe97368ed76caba4ca98e':
bug 2250049: need to allow email address when sending a SMS message.
d190bad42803f5628ac6af3c10c6cb581b92373b 10-Nov-2009 Wei Huang <weih@google.com> am 49183c09: bug 2250049: need to allow email address when sending a SMS message.

Merge commit '49183c099b1ac79f3c2fe97368ed76caba4ca98e' into eclair-plus-aosp

* commit '49183c099b1ac79f3c2fe97368ed76caba4ca98e':
bug 2250049: need to allow email address when sending a SMS message.
49183c099b1ac79f3c2fe97368ed76caba4ca98e 10-Nov-2009 Wei Huang <weih@google.com> bug 2250049: need to allow email address when sending a SMS message.

- my change Ia80a2736 added code to validate and scrub MMS address. However, as a side effect
it also disallowed email address for SMS messages. Fix that.

Change-Id: Iac3783e056c933531da73bd53eb8ea9d7c0eb154
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
9395aa4b49476d54fa62291258d8deedd4987e11 10-Nov-2009 Tom Taylor <tomtaylor@google.com> am c757aeba: am 5544f47d: Fix ANR deadlock

Merge commit 'c757aeba9ac549a1743000e3ed3afa59534dbcc2' into eclair-mr2-plus-aosp

* commit 'c757aeba9ac549a1743000e3ed3afa59534dbcc2':
Fix ANR deadlock
3fff015a14b40c5515b870a30ea0131422114fc5 10-Nov-2009 Tom Taylor <tomtaylor@google.com> am 5544f47d: Fix ANR deadlock

Merge commit '5544f47dbe1ffd4af73b9b9dde0e35cd257cd795' into eclair-plus-aosp

* commit '5544f47dbe1ffd4af73b9b9dde0e35cd257cd795':
Fix ANR deadlock
c757aeba9ac549a1743000e3ed3afa59534dbcc2 10-Nov-2009 Tom Taylor <tomtaylor@google.com> am 5544f47d: Fix ANR deadlock

Merge commit '5544f47dbe1ffd4af73b9b9dde0e35cd257cd795' into eclair-mr2

* commit '5544f47dbe1ffd4af73b9b9dde0e35cd257cd795':
Fix ANR deadlock
5544f47dbe1ffd4af73b9b9dde0e35cd257cd795 10-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix ANR deadlock

When the Mms app starts up, Conversation starts a background thread
to load all the conversations into a cache. It had a lock on the cache.
Meanwhile, the ComposeMessageActivity started up and tried to load
its conversation, but was blocked and eventually ANR'd. Make the
sync lock cover a much smaller scope and don't hold the lock during
the slow operation of looking up the contact info. Also, remove the
unused SuggestionsProvider. It was causing the Mms app to spin up
needlessly. Fixes bug 2220565.

Change-Id: I0f8260338a5368dc4b8ef11249361ca0716a2887
ms/SuggestionsProvider.java
ms/data/Conversation.java
db3b131201e68da269e642a8789f0013e37b7ebc 10-Nov-2009 Wei Huang <weih@google.com> am 3ba0450d: am ca32ff93: Merge change Ifae5cfc5 into eclair

Merge commit '3ba0450dad40d9a30bee98a4b9a154b36452916e' into eclair-mr2-plus-aosp

* commit '3ba0450dad40d9a30bee98a4b9a154b36452916e':
bug 2248168: populate the recipient field when texting from the fast track.
ab57d4c842e53146db2074bd1f1ac2670678fa96 10-Nov-2009 Tom Taylor <tomtaylor@google.com> am 53628a1a: am fd8357ff: Fix missing From field

Merge commit '53628a1ade48d676cf946e55659c4b9bb7811b91' into eclair-mr2-plus-aosp

* commit '53628a1ade48d676cf946e55659c4b9bb7811b91':
Fix missing From field
7a0e0eddb79a8f600da2fa32a6ae0a72c4c7647a 10-Nov-2009 Wei Huang <weih@google.com> am 6646f0f7: am 431e11d4: bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.

Merge commit '6646f0f7e8fa5797926f93938a3b4ab1018ea4d1' into eclair-mr2-plus-aosp

* commit '6646f0f7e8fa5797926f93938a3b4ab1018ea4d1':
bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.
817a418140cb3624937d6ac7538cd9d6b4a12c76 10-Nov-2009 Wei Huang <weih@google.com> am 7df75953: am 963f4a96: bug 2245490: fix MMS makeSendPdu() not to return null.

Merge commit '7df759534e01a839ff51b38cfefec629ea5f2ff1' into eclair-mr2-plus-aosp

* commit '7df759534e01a839ff51b38cfefec629ea5f2ff1':
bug 2245490: fix MMS makeSendPdu() not to return null.
d18bc380c07a36dffb33896691c3d71d23e11ccd 10-Nov-2009 Tom Taylor <tomtaylor@google.com> am 4bda353f: am 445fb5ab: Speedup contact name resolution

Merge commit '4bda353f4af00b2f399394b4b730f20306aeb691' into eclair-mr2-plus-aosp

* commit '4bda353f4af00b2f399394b4b730f20306aeb691':
Speedup contact name resolution
3ba0450dad40d9a30bee98a4b9a154b36452916e 10-Nov-2009 Wei Huang <weih@google.com> am ca32ff93: Merge change Ifae5cfc5 into eclair

Merge commit 'ca32ff9372648413f0bb5cb37329b30a601ffbdd' into eclair-mr2

* commit 'ca32ff9372648413f0bb5cb37329b30a601ffbdd':
bug 2248168: populate the recipient field when texting from the fast track.
53628a1ade48d676cf946e55659c4b9bb7811b91 10-Nov-2009 Tom Taylor <tomtaylor@google.com> am fd8357ff: Fix missing From field

Merge commit 'fd8357ff5febab0141e1beb8dd3b26f70416b108' into eclair-mr2

* commit 'fd8357ff5febab0141e1beb8dd3b26f70416b108':
Fix missing From field
6646f0f7e8fa5797926f93938a3b4ab1018ea4d1 10-Nov-2009 Wei Huang <weih@google.com> am 431e11d4: bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.

Merge commit '431e11d429783c07eca6e789de0518d17b42fb74' into eclair-mr2

* commit '431e11d429783c07eca6e789de0518d17b42fb74':
bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.
7df759534e01a839ff51b38cfefec629ea5f2ff1 10-Nov-2009 Wei Huang <weih@google.com> am 963f4a96: bug 2245490: fix MMS makeSendPdu() not to return null.

Merge commit '963f4a964e227d62eddbe2e1f6fb0721f665f4d2' into eclair-mr2

* commit '963f4a964e227d62eddbe2e1f6fb0721f665f4d2':
bug 2245490: fix MMS makeSendPdu() not to return null.
8f33ef129101c3af6dd2f51a128397a735fb457a 10-Nov-2009 Android Code Review <code-review@android.com> Merge change I800f2ac1

* changes:
Shows a Toast when a delivery report has been received.
fd1f59986a6eafb23ce761ededfc83c771975e06 09-Nov-2009 Wei Huang <weih@google.com> am ca32ff93: Merge change Ifae5cfc5 into eclair

Merge commit 'ca32ff9372648413f0bb5cb37329b30a601ffbdd' into eclair-plus-aosp

* commit 'ca32ff9372648413f0bb5cb37329b30a601ffbdd':
bug 2248168: populate the recipient field when texting from the fast track.
ca32ff9372648413f0bb5cb37329b30a601ffbdd 09-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ifae5cfc5 into eclair

* changes:
bug 2248168: populate the recipient field when texting from the fast track.
7d41e27db2ac952f6ae299e6ee87005af6603b3b 09-Nov-2009 Tom Taylor <tomtaylor@google.com> am fd8357ff: Fix missing From field

Merge commit 'fd8357ff5febab0141e1beb8dd3b26f70416b108' into eclair-plus-aosp

* commit 'fd8357ff5febab0141e1beb8dd3b26f70416b108':
Fix missing From field
fd8357ff5febab0141e1beb8dd3b26f70416b108 09-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix missing From field

In rare cases, a Mms pdu header will not contain a "from" address.
Rather than leaving the from address blank, use a slower, but more
reliable method of getting the from address from the "addr" table.
This is the technique the Mms notification system uses to get the address
displayed in the notification bar when a new message is received.
Fixed bug 2241939.

Change-Id: If932d4f1c24f46f3c3906a7e2658d7f67d4a2cfa
ms/ui/MessageItem.java
eaac560358a6bcf64ef3c8094a69a42794cf0fed 09-Nov-2009 Wei Huang <weih@google.com> am 431e11d4: bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.

Merge commit '431e11d429783c07eca6e789de0518d17b42fb74' into eclair-plus-aosp

* commit '431e11d429783c07eca6e789de0518d17b42fb74':
bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.
79544aa987f689ef0c8a157b5d6be063aedb401d 09-Nov-2009 Wei Huang <weih@google.com> am 963f4a96: bug 2245490: fix MMS makeSendPdu() not to return null.

Merge commit '963f4a964e227d62eddbe2e1f6fb0721f665f4d2' into eclair-plus-aosp

* commit '963f4a964e227d62eddbe2e1f6fb0721f665f4d2':
bug 2245490: fix MMS makeSendPdu() not to return null.
fae5cfc585e0a68ed7ed62909bb83abf53212aef 09-Nov-2009 Wei Huang <weih@google.com> bug 2248168: populate the recipient field when texting from the fast track.

- need to call Conversation.setRecipient() when creating a new Conversation object.
ms/data/Conversation.java
ccf56ee6079a2378031a964f6a8da655e1fde023 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
5eb3d77d984368bd778b061d590704a52bb83683 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> fix build
ms/ui/MessageItem.java
c72e81d4282e17ce09e5d2129ffc35717156f6a4 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> Additional conflict resolution
ms/ui/MessageListItem.java
de247372c563058692909b3f29ae75dc22e974fe 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
431e11d429783c07eca6e789de0518d17b42fb74 07-Nov-2009 Wei Huang <weih@google.com> bug 2236535: find a way to update the stale canonical_addresses entries with new SMS/MMS number.

- when the user sends a message, let's check if the new message's address is different than the one
stored in the recipientId's cache. If it is, let's update the cache and the underlying canonical_addresses
table in the db, so we wouldn't keep using a bad number for future references.

Change-Id: I3ac9940fa3c37d29c7398cac4535915249469563
ms/data/Contact.java
ms/data/ContactList.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
963f4a964e227d62eddbe2e1f6fb0721f665f4d2 08-Nov-2009 Wei Huang <weih@google.com> bug 2245490: fix MMS makeSendPdu() not to return null.

- one of my previous change allowed makeSendPdu() to return null if there is not a valid recipient for the message.
However, there is a separate code path that makes the recipientless message a valid scenario. So always return
a valid pdu object.

Change-Id: Ice49d158e23374ca31575efc523af7e063bcb2ff
ms/data/WorkingMessage.java
4bda353f4af00b2f399394b4b730f20306aeb691 07-Nov-2009 Tom Taylor <tomtaylor@google.com> am 445fb5ab: Speedup contact name resolution

Merge commit '445fb5abf8804279e591d1c35657c9162625135e' into eclair-mr2

* commit '445fb5abf8804279e591d1c35657c9162625135e':
Speedup contact name resolution
445fb5abf8804279e591d1c35657c9162625135e 07-Nov-2009 Tom Taylor <tomtaylor@google.com> Speedup contact name resolution

The first time Messaging is launched, a background thread loads
the conversations threads, which loads the contact info cache. While
this is happening, the ConversationList activity starts and the
first thing it does is clear the contact cache that is being built
in the background. Don't clear the cache if it's currently being
built. Fixes bug 2167799.

Change-Id: Id8a9345caaf7905d1f4bcc18ee45d11cb860d293
ms/data/Conversation.java
ms/ui/ConversationList.java
9262946142b1e13a598f66f8e7b534b322710bea 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Idc127177 into eclair

* changes:
Fix contact cache rebuilding
6ff4f59f843abe764725a64a29ff964a132298d6 06-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix contact cache rebuilding

Don't toss and rebuild the ContactInfoCache on every contact change.
With this change, we mark a contact as stale and the next time we're
asked for the contact, we asynchronously update the contact in the
background. Helps speedup bug 2167799.

Change-Id: Idc1271776cddd43fedcd7f31608a3302c8861813
ms/data/Contact.java
ms/util/ContactInfoCache.java
91938f8d97bc071aa6aacce6d3fb7cbaf493f019 06-Nov-2009 Wei Huang <weih@google.com> resolved conflicts for merge of 67ec6c54 to eclair-mr2
67ec6c54e11c19caf894b4ffce7250fb3fd96d30 06-Nov-2009 Wei Huang <weih@google.com> bug #2236553: catch NPE thrown by SmsManager.sendMultipartTextMessage().

- need to catch the NPE and deal with it, like clean up and delete the queued message. Otherwise we not only get a crash in the app, but the queued message would keep getting retried, therefore grow the conversation thread everytime it retries.

- also catch a RuntimeException when we try to insert an existing conversation into the Conversation cache. That caused an app crash too!

Change-Id: Iba081955e19d7a5eb517c3a3aea5186534787c15
ms/data/Conversation.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiverService.java
39ca71db85505dad745f31d620b790bbabeb784b 06-Nov-2009 Wei Huang <weih@google.com> am 78f81825: bug 2236527: need to scrub the phone number before sending a MMS message.

Merge commit '78f81825431c8c52cad57bc4a363747533a701ab' into eclair-mr2

* commit '78f81825431c8c52cad57bc4a363747533a701ab':
bug 2236527: need to scrub the phone number before sending a MMS message.
78f81825431c8c52cad57bc4a363747533a701ab 06-Nov-2009 Wei Huang <weih@google.com> bug 2236527: need to scrub the phone number before sending a MMS message.

- add MMS address validity checking and scrubbing. If the phone number used to send a MMS message
contains invalid characters (non digits and non-valid separators), we now warn the user when he tries
to send the message. The prior validity checking code only checks against GSM SMS address, so it
would miss all the invalid chars for MMS address.

- assuming the MMS address is ok but contains separators that are not valid MMS address chars (as
far as the network is concerned), we scrub the number when creating the SendReq data structure for
MMS message.

- flag a few places where things are still not correct, but too risky to fix for MR1.

Change-Id: Ia80a2736f955b94a8cac51ffeb06617a95580ab8
ms/data/ContactList.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/RecipientsEditor.java
200d37d90dd7640aa909edca6a2b55961faa5824 05-Nov-2009 Tom Taylor <tomtaylor@google.com> Don't show Converting to MMS

When we open a thread where the recipient is an
email address, don't automatically show the "Converting
to multimedia message" The user already saw that when
he/she added the email recipient. Bug 2235226.
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
81d933b4432b1c75f02a5bd276459ab3fbaee9c3 05-Nov-2009 Tom Taylor <tomtaylor@google.com> Wrong contact header

Previously fixed this, but if the underlying search in ContactHeaderWidget
fails or takes a long time, the contact header will still show the wrong
info. Force an invalidate after clearing the ContactHeaderWidget so it'll
redraw empty, rather than leave the previous contact information.
Bug 2233151.
ms/ui/ComposeMessageActivity.java
74c1da682b6b71030a5fb090d3e7f1404bcb13cc 05-Nov-2009 Wei Huang <weih@google.com> am 56e77a57: bug #2236535: when entering MMS compose screen via an address in an intent, replace the matching contact cache with the intent address.

Merge commit '56e77a576e452f26da6941f01746435fe4b3011b' into eclair-mr2

* commit '56e77a576e452f26da6941f01746435fe4b3011b':
bug #2236535: when entering MMS compose screen via an address in an intent, replace the matching contact cache with the intent address.
56e77a576e452f26da6941f01746435fe4b3011b 05-Nov-2009 Wei Huang <weih@google.com> bug #2236535: when entering MMS compose screen via an address in an intent, replace the matching contact cache with the intent address.

- this is basically another path in which we have the actual dest address (in the intent). When the compose screen finds the
matching cached contact, it should replace the contact's address with the specified address in the intent, in case the
cached contact has a bad address.

Change-Id: Id55500e212df5dcd47ff7a1858bc99d4b4656df1
ms/data/ContactList.java
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
cab73c66f1b07a639cbb75b6510d425477cbcaec 05-Nov-2009 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of 25b939e5 to eclair-mr2
25b939e5a7ecb1e0879b684dc5bc55183cf468b4 04-Nov-2009 Wei Huang <weih@google.com> bug #2236535: use an initial bad address (from a merged contact) would lead to permanent failure for the messaging thread even after a good number is used.

- when the user selects/types a new number in the recipients editor, and we find a cached contact, set the contact's number to be the newly selected number. This will allow the user to correct the address, at least until the next time MMS rebuilds the contact cache with the bad number stored in the database. This will get us to par with the Cupcake behavior. Unfortunately, after MMS app is relaunched, the thread would use the bad initial adddress again (loaded from the 'canonical_address' table in the db). That's a much harder, riskier fix, so deferring to later.

Change-Id: If32958482b14848bd770cff50e4736457c47ac8a
ms/data/Contact.java
ms/data/Conversation.java
ms/transaction/SmsMessageSender.java
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
363a1c229621fc0289507a0d20a4c8c794dd8147 03-Nov-2009 Android Code Review <code-review@android.com> Merge change Ie7c8092e

* changes:
Mms app: Show pending/failed/success icon in MessageList.
ec317d32aec10389fa5832ae8a1164f0375efb2e 03-Nov-2009 Tom Taylor <tomtaylor@google.com> Fix "sent to self" bugs

The messaging app special cases the contact "Me". Bug 2205868 found two
cases that exposed bugs in handling messages sent to self.
ms/data/Contact.java
ms/ui/ComposeMessageActivity.java
4bcebbe2bada865041205c429c8bde798296ba7d 30-Oct-2009 Tom Taylor <tomtaylor@google.com> Strip spaces from SMS numbers

Spaces in SMS numbers cause problems for some providers. Allow the
spaces in the UI, but strip them out of the addresses at the level
where we're sending the message. Bug: 2192249
ms/transaction/SmsMessageSender.java
d94aa5fd212ff690e0527e587a1aef8313fca064 30-Oct-2009 Tom Taylor <tomtaylor@google.com> Allow full-length video replacement

When replacing an attachment with a different attachment, take into
consideration the current size of the slide and subtract that out
of the max message length. Right now, we're only doing that for video
as it is currently the only attachment where we can specify the limit
in advance. The technology is now there, however, to do the same with
captured audio. Fixes bug 2227514.
ms/ui/ComposeMessageActivity.java
8b5ea2314049354f289925d4d8c6f11d13626a34 27-Oct-2009 Mark Wagner <mxw@google.com> inline avatars for mms
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
161375d2c4eff31add607fc0befa5c781c6fd7f1 28-Oct-2009 Tom Taylor <tomtaylor@google.com> Store and show error code

When we get an intent from the telephony layer, extract and
save any error codes bubbled up. Load the error code in MessageItem
and for now, display the code in the Message Details dialog.
ms/transaction/SmsReceiverService.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageUtils.java
840b6f7d8d1f23676f5c04532bec6e47fcbfc1c1 27-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8447aa1d into eclair-mr2

* changes:
Add search history
2a2a928f8b277d09cfc7032629b5f47447e73fa4 27-Oct-2009 Wei Huang <weih@google.com> bug 2183215: clear stale draft state in the draft cache.

- when deleting a draft message (in CMA), we need to clear the draft state for the thread_id that's been released by the draft message. Otherwise, if a new message arrives and gets assigned the same thread id, the draft cache would have incorrect state.
ms/data/WorkingMessage.java
8447aa1d84a469e8938b53a60b0763633b08ae98 27-Oct-2009 Tom Taylor <tomtaylor@google.com> Add search history

Remember the previous Messaging searches and use them as suggestions
in future searches. Add a pref to settings to allow the user to
clear the search history. Fixes bug 2215776.
ms/MmsApp.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/SearchActivity.java
5467f0f860d4fb32ac4d0b230e9c21f236e46e9b 26-Oct-2009 Tom Taylor <tomtaylor@google.com> Update fasttrack info

In onStart, update the fasttrack info. The contact info associated with
the message's recipients might have changed while we were not running. This
can happen if the user updates/adds/deletes an avatar.
Fixed bug 2184815: Msg inbox not display picture id when picture add from
new msg contact.
ms/ui/ComposeMessageActivity.java
abfb316972f2732cdc63d635863556a76f8414d5 26-Oct-2009 Tom Taylor <tomtaylor@google.com> Move mem change to MR1

Manually merge change from MR2 to MR1. Handle an out of memory
exception when trying to build an attached image thumbnail.
Bug 2171440.

Change-Id: I5f7c6d7fff34e66d3e20b1fed9e78b08454e2db7
ms/model/ImageModel.java
6d5bc7dd4e7a0ce646f31120e2177388123f5cb3 24-Oct-2009 Tom Taylor <tomtaylor@google.com> am 435fda3f: Fix build

Merge commit '435fda3f21edab8cce8b6650d3a818164cf0b2a4' into eclair-mr2

* commit '435fda3f21edab8cce8b6650d3a818164cf0b2a4':
Fix build
435fda3f21edab8cce8b6650d3a818164cf0b2a4 23-Oct-2009 Tom Taylor <tomtaylor@google.com> Fix build

Change-Id: I02b4038eda480b4bf78574e736dbb7813b78e6a0
ms/ui/ComposeMessageActivity.java
467e85e9e797ccee1115b14b366632ddd9c423c2 23-Oct-2009 Tom Taylor <tomtaylor@google.com> am 11c4b635: Clear contact header

Merge commit '11c4b6354125f2e297bbf7805ec84f15ebdf0243' into eclair-mr2

* commit '11c4b6354125f2e297bbf7805ec84f15ebdf0243':
Clear contact header
11c4b6354125f2e297bbf7805ec84f15ebdf0243 23-Oct-2009 Tom Taylor <tomtaylor@google.com> Clear contact header

When updating the contact header widget, clear any stale info first
so we don't end up associating the wrong picture with a different
contact.
Fixed BC-triaged bug 2173406.

Change-Id: Ic4cabf8b88e8b0922308adefaeea9dd9467f9afa
ms/ui/ComposeMessageActivity.java
e4490bac449f8067ecbca675e80bda9e5e65b6d6 23-Oct-2009 Tom Taylor <tomtaylor@google.com> am 408675a7: Handle null cursor

Merge commit '408675a7ccd78345d68bd7d1d3b56b7d40b96d11' into eclair-mr2

* commit '408675a7ccd78345d68bd7d1d3b56b7d40b96d11':
Handle null cursor
408675a7ccd78345d68bd7d1d3b56b7d40b96d11 22-Oct-2009 Tom Taylor <tomtaylor@google.com> Handle null cursor

If for some reason the SmsProvider returns a null cursor when we try
and load the SIM messages, show the "no sim messages" UI rather than
leaving the UI in a constant loading (animated loading cursor) state.
This is part three of three fixes for BC-triaged bug 2205782.

Change-Id: Ie3dceea621f8c2aa0a2c98f79278c120df3c37e7
ms/ui/ManageSimMessages.java
2b3d70c4e6d7f9678c6666c09b44b995e5b061f2 22-Oct-2009 Tom Taylor <tomtaylor@google.com> am cb0668e2: Fix null ref

Merge commit 'cb0668e2c6541737c785af8641efad4be53a9056' into eclair-mr2

* commit 'cb0668e2c6541737c785af8641efad4be53a9056':
Fix null ref
cb0668e2c6541737c785af8641efad4be53a9056 22-Oct-2009 Tom Taylor <tomtaylor@google.com> Fix null ref

When getResizedImageData fails to scale down an image to a size that'll fit in
the remaining available message space, return null rather than trying to
dereference the null byte array.

Change-Id: Ibb1f5ddd935f952e5f90d8835947cc46bc138aa2
ms/ui/UriImage.java
ce028797bad547286b4ca6812d06489a83dd7201 22-Oct-2009 Tom Taylor <tomtaylor@google.com> am 16f98e62: Show "converting to mms" message

Merge commit '16f98e62c279550854e665e25c212ea0b04a6b6b' into eclair-mr2

* commit '16f98e62c279550854e665e25c212ea0b04a6b6b':
Show "converting to mms" message
16f98e62c279550854e665e25c212ea0b04a6b6b 21-Oct-2009 Tom Taylor <tomtaylor@google.com> Show "converting to mms" message

There's one path when we have to downscale an attached picture where
we weren't showing the "converting to mms" message.
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
da45ea49883b2b0e2aad4ce2c738a61bf4e59b9f 15-Oct-2009 Tom Taylor <tomtaylor@google.com> Honor subject charset

When retrieving the subject from the pdu, we have to look at the
subject char set and use that value to decode the string.
ms/data/WorkingMessage.java
f9ed50ad8005a797230392d79a2cafbf82d026be 15-Oct-2009 Tom Taylor <tomtaylor@google.com> Call, not dial

When the user selects the menu item to call a number, actually
call that number, rather than just bringing up the dialer with
the number preloaded.
ms/ui/ComposeMessageActivity.java
79014c1c8fb73f261616bbbda7d1d319a8b7cbf7 13-Oct-2009 Tom Taylor <tomtaylor@google.com> Handle low space on startup

Graceful exit out of ConversationList when we try and start up when
there's no storage space.
ms/ui/ConversationList.java
acf155c6db8a77212b6361e57b1c37e641bc6f04 13-Oct-2009 Tom Taylor <tomtaylor@google.com> Fix contact header updating

When a user added a recipient and tapped the message area to start
composing, the code would ask for the contact. Since we didn't have
the contact in the cache, we'd fire off an async request to load the
contact info. Meanwhile, ComposeMessageActivity would use the contact's
name, which in this case was just the number, to display in the contact
header widget. With this change, we register for changes on all the
contacts. If a contact changes, we rebuild the contact header widget.
Also removed obsolete presence code.
ms/ui/ComposeMessageActivity.java
2bcdc7ffec2982fc2a3fc998bed65ef0b019ba42 12-Oct-2009 Tom Taylor <tomtaylor@google.com> am b0ef2b0d: Fix message item click

Merge commit 'b0ef2b0d0974c13e98055d8ffd85bef559fe80a4' into eclair-mr2

* commit 'b0ef2b0d0974c13e98055d8ffd85bef559fe80a4':
Fix message item click
b0ef2b0d0974c13e98055d8ffd85bef559fe80a4 12-Oct-2009 Tom Taylor <tomtaylor@google.com> Fix message item click

When downloading a Mms video, the message item shows a play button.
Because there are various levels of nested click handlers, only the
button responds to clicks. That made it impossible for users to click
links in the text portion of the message. Turn on the click handler for
the item so both the item and the button can respond to clicks.

Change-Id: I76f5f5fb832a1bb40b9eeff2b22d0f21ee88371f

Change-Id: I5472672da2119cf01c2ab306dfa5111c93ddf478
ms/ui/MessageListItem.java
f1bf432304bcc277397b028192eaf01a94c6417d 09-Oct-2009 Wei Huang <weih@google.com> bug 2174588: fix phone number comparison for the user's own number.

- don't treat an email address containing "555-1212" the same as "555-1212".
ms/ui/MessageUtils.java
8457efd9fe165ba775805f764c5ef296f1c46df3 10-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Id09e218e into eclair-mr2

* changes:
Fix contact cache rebuilding
205c80e8d026b35af86f1b4ab5584f5a0ea2e2f1 10-Oct-2009 Wei Huang <weih@google.com> am fc8b626d: bug 2170766: call ContactHeaderWidget.bindFromEmail() if the MMS from addr is an email addr.

Merge commit 'fc8b626d34a2cfdab29248f8f58c512b457ec0d3' into eclair-mr2

* commit 'fc8b626d34a2cfdab29248f8f58c512b457ec0d3':
bug 2170766: call ContactHeaderWidget.bindFromEmail() if the MMS from addr is an email addr.
8e78075c9770d700c49bd44276fec33df1db2265 10-Oct-2009 Tom Taylor <tomtaylor@google.com> am 999efb36: Fix selection states

Merge commit '999efb36c9f329a37315b6dbff7150d2b7b79354' into eclair-mr2

* commit '999efb36c9f329a37315b6dbff7150d2b7b79354':
Fix selection states
fc8b626d34a2cfdab29248f8f58c512b457ec0d3 10-Oct-2009 Wei Huang <weih@google.com> bug 2170766: call ContactHeaderWidget.bindFromEmail() if the MMS from addr is an email addr.

Change-Id: Ie933ece6e0871145893c547f788c6454f9babd47
ms/ui/ComposeMessageActivity.java
d09e218e2278acb6276207bddfbef1761617e8f8 10-Oct-2009 Tom Taylor <tomtaylor@google.com> Fix contact cache rebuilding

Don't toss and rebuild the ContactInfoCache on every contact change.
With this change, we mark a contact as stale and the next time we're
asked for the contact, we asynchronously update the contact in the
background.
ms/data/Contact.java
ms/util/ContactInfoCache.java
628ba4654e98906f6979a3f118e58104741d70a7 09-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib6a0383d into eclair-mr2

* changes:
bug 2174588: fix phone number comparison for the user's own number.
999efb36c9f329a37315b6dbff7150d2b7b79354 09-Oct-2009 Tom Taylor <tomtaylor@google.com> Fix selection states

Use a compound drawable with the various list select states
to draw the conversation list item background.

Change-Id: I43baf202d75b9d146891a7433c3736f5cc926281
ms/ui/ConversationHeaderView.java
b6a0383dc77efea9a48e43e4e21a4290e89bf0a4 09-Oct-2009 Wei Huang <weih@google.com> bug 2174588: fix phone number comparison for the user's own number.

- don't treat an email address containing "555-1212" the same as "555-1212".
ms/ui/MessageUtils.java
4f8fef51d8fc2524aac5b6ff33d92bc4397a8818 09-Oct-2009 Wei Huang <weih@google.com> am 43523adc: bug 2175321: add gray background to SMS unread message in Conversation List screen.

Merge commit '43523adca08d2db019c55d5b611d0755a6788f21' into eclair-mr2

* commit '43523adca08d2db019c55d5b611d0755a6788f21':
bug 2175321: add gray background to SMS unread message in Conversation List screen.
43523adca08d2db019c55d5b611d0755a6788f21 08-Oct-2009 Wei Huang <weih@google.com> bug 2175321: add gray background to SMS unread message in Conversation List screen.
ms/ui/ConversationHeaderView.java
bb689a98bd5dcc5e4b3f0d7e102decff346dc631 08-Oct-2009 Tom Taylor <tomtaylor@google.com> Fix out-of-memory bug

When decoding a thumbnail, handle an out-of-memory exception. The
code will show an image indicating a broken thumbnail.
ms/model/ImageModel.java
0d6f2a98923ef82c4fb344b41b8dec172ccf0700 07-Oct-2009 Tom Taylor <tomtaylor@google.com> am 4abbac36: Merge change I863c5a3b into eclair

Merge commit '4abbac36c07f1e34e498eeae070e55f39c5753e9' into eclair-mr2

* commit '4abbac36c07f1e34e498eeae070e55f39c5753e9':
Don't allow attach audio
f23be4b40e03cda149f9e0e1459bfc37c5ea7fa8 07-Oct-2009 Wei Huang <weih@google.com> am 4f485ea3: bug 2169583: fix a thread mixup problem caused by empty draft message having an unaccounted for thread id.

Merge commit '4f485ea3aabce679b3d749ba843fee5134ebf118' into eclair-mr2

* commit '4f485ea3aabce679b3d749ba843fee5134ebf118':
bug 2169583: fix a thread mixup problem caused by empty draft message having an unaccounted for thread id.
4abbac36c07f1e34e498eeae070e55f39c5753e9 07-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I863c5a3b into eclair

* changes:
Don't allow attach audio
47471dad88703d5befcbf65abd9e0cf28872bcb3 07-Oct-2009 Tom Taylor <tomtaylor@google.com> Don't allow attach audio

If MmsConfig doesn't allow attaching a ringtone to a Mms message,
hide the menu item. Fixes bug 2171112.

Change-Id: I863c5a3b5761dc5588c48c77aef76f9bb984287b
ms/ui/SlideEditorActivity.java
4f485ea3aabce679b3d749ba843fee5134ebf118 07-Oct-2009 Wei Huang <weih@google.com> bug 2169583: fix a thread mixup problem caused by empty draft message having an unaccounted for thread id.

- there is a situation where if the user tries to attach an image in an empty draft message, we'd allocate
a thread id (creating one in the db), but immediately deleting it because the draft message is empty.
However, when we deleted the empty draft message, we didn't invalidate the in-memory thread id from the
initial allocation. At this point if a new message arrives and takes the same thread id, it will cause
the CMA to requery and pull in the new message to the draft message thread incorrectly (because both
have the same thread id).

Change-Id: I7981eb1ec1f4ba1e2650325093c2b60ac4324b94
ms/data/WorkingMessage.java
293e855e98b5ded9bfaa37168cc75d0cd5704fbd 06-Oct-2009 Tom Taylor <tomtaylor@google.com> am eb11b23b: Merge change Ie05aa504 into eclair

Merge commit 'eb11b23bddf54833a23e0891dfa01c33ef0ed62a' into eclair-mr2

* commit 'eb11b23bddf54833a23e0891dfa01c33ef0ed62a':
Launch a forward activity
75f79627e52ec0b4ed7ee319945bed9dc34f569f 06-Oct-2009 Tom Taylor <tomtaylor@google.com> Launch a forward activity

When a user forwards a message, create a new copy of the ComposeMessageActivity.
We do this by starting an aliased activity that doesn't have the singleTop
flag set. Fixed bug 2164612.

Change-Id: Ie05aa504c39df3e88eb4ecd7309d84b06e8d61be
ms/ui/ComposeMessageActivity.java
b00c701eba9dab6a751b10afe0f0821060514461 05-Oct-2009 Tom Taylor <tomtaylor@google.com> am da51c396: Don\'t automatically go back to ConversationList

Merge commit 'da51c396e2de55b4bb0cdd953987fed2ffb54a59' into eclair-mr2

* commit 'da51c396e2de55b4bb0cdd953987fed2ffb54a59':
Don't automatically go back to ConversationList
da51c396e2de55b4bb0cdd953987fed2ffb54a59 05-Oct-2009 Tom Taylor <tomtaylor@google.com> Don't automatically go back to ConversationList

When saving a draft, don't automatically launch the ConversationList. The auto-launch
behavior made backing out of Messaging a two-step operation when launched from another
app like the Browser.

Change-Id: Iffcbfb8c3af00c125562541c7292d12118434985
ms/ui/ComposeMessageActivity.java
727c4572a5a5e0717cf0faa873a2dde8cb7ce2a4 05-Oct-2009 Wei Huang <weih@google.com> am 0aef1a19: bug 2161715: don\'t decode the large JPEG into Bitmap, which causes OOM. Instead read the JPEG data directly.

Merge commit '0aef1a199b5a702f4a0acbbd27c936115ed7ab64' into eclair-mr2

* commit '0aef1a199b5a702f4a0acbbd27c936115ed7ab64':
bug 2161715: don't decode the large JPEG into Bitmap, which causes OOM. Instead read the JPEG data directly.
1d95d8928940553e9e99f34ad075865b9b34781c 03-Oct-2009 Tom Taylor <tomtaylor@google.com> Respect Mms disabled

When Mms is disabled, don't let a long message trigger the logic that turns
a multi-segment Sms message into a single Mms message. In fact, when Mms
is disabled, physically disable the ability for the app to set any of the
Mms flags.
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
0aef1a199b5a702f4a0acbbd27c936115ed7ab64 02-Oct-2009 Wei Huang <weih@google.com> bug 2161715: don't decode the large JPEG into Bitmap, which causes OOM. Instead read the JPEG data directly.

Change-Id: Iab6f27b00b4ae9dc0d2126dd369d8d04e27bcb67
ms/ui/ComposeMessageActivity.java
1cf7f03f05cf0a1172f027f75f67a6fff336c79b 30-Sep-2009 Tom Taylor <tomtaylor@google.com> Handle out-of-memory while decoding image

When adding images to a mms message we attempt to resize an image, if
necessary, to keep the message within its maximum message length. In
some cases, the first crack at decoding the image can throw an
out-of-memory exception. With this change, we catch that exception and
try decoding again at a smaller scale.

Change-Id: Id8ebcab4c407f316dd850640ab8f058845fb7054
ms/data/WorkingMessage.java
ms/ui/UriImage.java
95f110cfef9a014b259b1e77e9a0c7a93c18ab3c 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I4a82fd6f into eclair

* changes:
Change dialog to toast
1224b6560c48e146ee304f9c807296f6c22cdefb 30-Sep-2009 Tom Taylor <tomtaylor@google.com> Change dialog to toast

If we get an exception while adding a picture because the picture is
too large, a function is called to downscale the picture. If that process
take over a second, a "Compressing..." dialog is shown. If the user opens
and closes the keybaord during this period, the dialog is left dangling
or attached to the wrong window and this can cause several different crashes.
This checkin replaces the dialog with a toast that seems more immune to
the same steps. In other words, the toast closes itself, rather than us
having to call the dialog.dismiss function, which was problematic.
Also, fix a merge change on removing commas from recipient names.

Change-Id: I4a82fd6f832d935915583efb860a6c0382b3a2df
ms/ui/MessageUtils.java
ms/ui/RecipientsAdapter.java
f83ed8ac98269d9997a38c27d7fe61b012b32989 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib02a550d into eclair

* changes:
Change FasttrackBadgeWidget->QuickContactBadge
fb465ee4515a8671be60722327e1a34f11cc5631 30-Sep-2009 Evan Millar <emillar@google.com> Change FasttrackBadgeWidget->QuickContactBadge

Change-Id: Ib02a550ddfd887152c7d2aabb5ba250a48b5d000
ms/ui/ConversationHeaderView.java
c7c03f0353a874776e9f995221a1fcd1a197bae0 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I7e0211f6 into eclair

* changes:
Remove commas from recipient names
bdf9b796ffd86c9f4cbeff413f957a88a492f43f 30-Sep-2009 Tom Taylor <tomtaylor@google.com> Remove commas from recipient names

Change-Id: I7e0211f63ab46347a4aff74a6be2aa62b53536cc
ms/ui/RecipientsAdapter.java
7d9ce5cb60305dde997da90df1bc643ca2f1471e 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I0254cb89 into eclair

* changes:
bug 2154878: don't show the recipients editor after the user sends a message.
d9db0a031dc9116d13bf55c8476f8daa910a9804 30-Sep-2009 Wei Huang <weih@google.com> bug 2154878: don't show the recipients editor after the user sends a message.

Change-Id: I0254cb893fb37a37ceeade8faf9b4c7737fd3f8a
ms/ui/ComposeMessageActivity.java
0c5e3bd670bd586305f58a7f736ef7f218fbed59 30-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I2dea223c into eclair

* changes:
Call recycler on download
512681a5702e1ba6df0b7298c7737598a4e9aa8e 29-Sep-2009 Tom Taylor <tomtaylor@google.com> Call recycler on download

If Mms auto-retrieve is turned off, the recycler wasn't getting called
to limit the max number of saved messages. After a message is manually
downloaded, make a call to the recycler.

Change-Id: I2dea223c7599936e8cb4c88123df4154a9895499
ms/transaction/NotificationTransaction.java
ms/transaction/RetrieveTransaction.java
ms/util/Recycler.java
984577aa5f27608f2d251130ce373ca722d6ffe5 29-Sep-2009 Wei Huang <weih@google.com> bug 2152101: when displaying a new sms message from notifications, hide the old recipient editor if it was visible.

Change-Id: Id1d3e667f791ee7c11abf0dbdee0d252c8080ddb
ms/ui/ComposeMessageActivity.java
35de139283bfeca8b2360c8b13b9cd8dee8e039b 29-Sep-2009 Tom Taylor <tomtaylor@google.com> Update our services

Use the new onStartCommand and return START_NOT_STICKY where appropriate.
Handle null intents.

Change-Id: I9c1f7caf32d4cd793d9328c5fb9ed77f988fa83c
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
402144efe9d3d2ac9603f354ef1c725d6b8bb5ce 29-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I84e31b96 into eclair

* changes:
Don't change focus
a76f3c78dbebb56a8cce9c71f6ab5638f9c727c3 29-Sep-2009 Tom Taylor <tomtaylor@google.com> Don't change focus

When opening the keyboard, don't change the focus. The line I'm removing
must have been put in to solve some problem, but it causes other problems.
For instance, if you're editing a recipient in portrait using the soft-keyboard
and decide it'd be easier to use the hard keyboard, the focus will switch out
from under the user from the recipients editor to the message editor. With this
change, the focus will remain in the field the user was typing in.

Change-Id: I84e31b9685aae936579d1b728750ed5edc0c8c60
ms/ui/ComposeMessageActivity.java
532c4e53a525fbaaab7d946ba614863e615d6b1a 29-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I6842a231 into eclair

* changes:
bug 2150183: fix SMS address comparison so "foo"=="foo".
d63aeec78473feafc7e3edeeefd2f0d62604b283 28-Sep-2009 Wei Huang <weih@google.com> bug 2150183: fix SMS address comparison so "foo"=="foo".

- when comparing two identical SMS addresses that are not a phone number (or email address), the loose phone number comparison
in PhoneNumberUtils will return false because it's not meant to compare non phone numbers. Therefore we also need to
do String.equal().

Change-Id: I6842a231543f894c6cd33a34a52abfd62f69c7bc
ms/data/Contact.java
95e96df81536897f5856e9d33d5eccd54210d87a 28-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix a monkey crasher

It looks like the monkey can squeeze in multiple clicks before the first
click is handled. Instead of creating and throwing away an attachment adapter,
create it once and use it from then on.

Change-Id: I4679f6b2cfc80861427c4063cce0d13241801a1d
ms/ui/ComposeMessageActivity.java
67b794480aaad0e1958df2988671b78ea03b76e1 28-Sep-2009 Tom Taylor <tomtaylor@google.com> Don't use auto-requery

The default behavior with CursorAdapter is to do an automatic requery when
the content has changed. This happens on the UI thread and can cause ANR's.
Handle the content change notification ourselves and do a new query asychronously.
Update ConversationList to handle content changes and do a background query,
rather than relying on the auto cursor requery. The rarely used ManageSimMessages
can still do an auto-requery, but it's less likely because we don't write to nor
change messages on the SIM. Also, a different content observer is already registered
to notice SIM changes and update the message list in the background.

Change-Id: I42ac518b315ea55ff6edbe0a912bf60c7f868ea5
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/ManageSimMessages.java
ms/ui/MessageListAdapter.java
9f752ed5fb965b2cc84856e3eb374264f0ec3c3c 28-Sep-2009 Dmitri Plotnikov <dplotnikov@google.com> Renaming Presence and Presence-related columns.

Change-Id: Ic35214916491a4886177f66dffd6e54217c131e1
ms/util/ContactInfoCache.java
eeebde19f25e36368ecd364ea7112ea5ed69cbae 28-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix email name

If the email name in the contact is empty, fall back and use
the contact name.
ms/util/ContactInfoCache.java
c3fd23ba30422bd19aeea9330d8c75e259cc965d 28-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27322 into eclair

* changes:
Fix duration exception
7eedb5a0bbf7c83fbf57df7ad1b97ca3ae438017 28-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix duration exception

When the keyboard was opened with an invalid value in the duration field,
trying to iciclize the number generate an int-parse exception.
ms/ui/EditSlideDurationActivity.java
3e48eec660aa5eaf3dfd186f75a648ea188d1f7b 28-Sep-2009 Mark Wagner <mxw@google.com> trim the search string
ms/ui/SearchActivity.java
3b7b5b2f21500f03a661cde36960d4c6b559eb7e 27-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27081 into eclair

* changes:
Config to disable audio attachment
4d620299628c41f9149024f0cf9f42d008aedcf5 25-Sep-2009 Tom Taylor <tomtaylor@google.com> Config to disable audio attachment

And an option to MmsConfig to allow an overlay to turn off the
ability to attach an audio file to an Mms message.
ms/MmsConfig.java
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/ComposeMessageActivity.java
4544141e98bfd28ceb989019e1fb6c3172e08024 26-Sep-2009 Wei Huang <weih@google.com> bug 1898937: tweak message in MmsException when the sms body is empty.

Change-Id: I5607f882ba45116f07a8729f8884eb67715df09a
ms/transaction/SmsMessageSender.java
84f2f5376ba471ca1799cf692d1aebdb9bf14599 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26940 into eclair

* changes:
tweak capture image intent extras.
f3de2dc48cf15c04f6e545e98cfff0e4faa378d1 24-Sep-2009 Wei Huang <weih@google.com> tweak capture image intent extras.

Change-Id: I934389f552036e35ca615d2a51d32b08503ff84e
ms/ui/ComposeMessageActivity.java
c555f86a3f5b2f19244cc9c282f49cb834de12e8 24-Sep-2009 Tom Taylor <tomtaylor@google.com> Show Mms prefs based on config

In the messaging preferences activity, hide the Mms prefs if the
config says the app doesn't support Mms. We already programatically
do this for SIM prefs. By doing this for Mms prefs, we no longer
need to override the preferences.xml file in other configs that
don't support Mms.

Change-Id: I50d9321c9ac7b6c8f992a04f46d21b443c4b71c5
ms/ui/MessagingPreferenceActivity.java
61138063f3486c29a5bbda77fdf9423dcb26f949 24-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix forward focus

When forwarding a message put the focus in the recipients editor
rather than in the message editor.

Change-Id: I2f22be2cb7f130143c41785503e70280d3d74403
ms/ui/ComposeMessageActivity.java
2c77f17bc77af92e57c82cc1bfa44de2979e505a 24-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix a null intent
ms/transaction/SmsReceiverService.java
77864ad24e1a12709c7e226546b24badc22806bd 23-Sep-2009 Tom Taylor <tomtaylor@google.com> Handle multiple recipients in Contact Header

Clear the avatar and presence on multiple recipients. Show a multi-recipient avatar.
Show the actual names, rather than recipient count.

Change-Id: I1230f7260811e5a1a7e797f26430e3ab1d2eeb21
ms/ui/ComposeMessageActivity.java
d62ef06699b3ca5048c5642bd50300e9a2eb04a1 23-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix draft bug

Fix a special case of working on a draft and then getting a new intent for that same
draft. Recognize we've got the same conversation rather than trying to save the draft
and reload the same draft. Add more logging to Conversation and WorkingMessage and move
the common logging code into LogTag.

Change-Id: I1388967f3f2e7520e08730036243f958574a6001
ms/LogTag.java
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
34b48c16fc630bca88b9c4657bd19e6718a8f83e 23-Sep-2009 Wei Huang <weih@google.com> fix bug 2129498: take full resolution pics when attaching a pic taken from "Capture picture" attachment option.

- pass intent extras of "output" and "MaxNumOfPixels" to the intent action MediaStore.ACTION_IMAGE_CAPTURE.
- in onActivityResult, read the jpeg from /sdcard/mms/tmp_scrap file.

Change-Id: I86fdd5015de63e7d71974b77f02780df10d01fc7
ms/ui/ComposeMessageActivity.java
13dbe96fc54f9b7190fd415d737f9a56dc409d10 23-Sep-2009 Wei Huang <weih@google.com> Fix bug #2100169: include the from address (line1 + "/TYPE=PLMN") when sending a pdu.

Change-Id: I212a03b963ae868d7d69e3841e6a88ab7217b2e3
ms/data/Conversation.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/SendTransaction.java
ms/ui/MessageUtils.java
c39597e09610998e858d181e758ff8ae3f945b94 22-Sep-2009 Tom Taylor <tomtaylor@google.com> Tighten up slide duration

In the activity to edit a slide duration, don't allow the user to enter zero or
negative numbers. Show a toast if they manage to enter non-numeric values.

Change-Id: I25272481d965d1e33200d602493e61020d870202
ms/ui/EditSlideDurationActivity.java
424b9e2a1f9f186bfa0171872bbdb96b7be24d8d 22-Sep-2009 Tom Taylor <tomtaylor@google.com> Use real contact list

When initialize the header widget, use the "real" recipient list from
the conversation.

Change-Id: I28bac18fe453730f96bd6daf41a65d4e667c3279
ms/ui/ComposeMessageActivity.java
93d8d50b037a8c52f47f64d61e0a4a40cfddd8c2 21-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26229 into eclair

* changes:
Handle contacts with commas
b8bd3d53720ee9ebf9146a1d515a516c2068ff69 21-Sep-2009 Tom Taylor <tomtaylor@google.com> Handle contacts with commas

Treat contacts with commas as a single recipient, rather than parse the contact
into multiple recipients. Prime the recipient separator with a comma.

Change-Id: Ia4587282423ae3f318fc7db548ae694b9701be65
ms/ui/RecipientsEditor.java
d2f67de2dfb6c2e5b659c0018cd47015e0aefe7c 21-Sep-2009 Wei Huang <weih@google.com> fixing bug 1892808: use PhoneNumberUtils.compare() now it handles sms short code better.

Change-Id: I2207dad5a03ed46a563ab919b3fc0a7ab405bcf5
ms/data/Contact.java
ms/util/AddressUtils.java
ms/util/ContactInfoCache.java
adc53e24a837b0876997bc7c94bc4a8602af2782 20-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix ANR

Don't do a query inside a synchronize.
ms/util/ContactInfoCache.java
7f651fb847f44aa83132b4e31e193623f235a816 20-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25909 into eclair

* changes:
fix bug 1999421: make using VZW alias feature configurable via mms_config.xml
f6ddd0bb7fff9f479f6c306d3d3e154c6c533061 19-Sep-2009 Wei Huang <weih@google.com> fix bug 1999421: make using VZW alias feature configurable via mms_config.xml

Change-Id: I079301324d6a985fc958414a1afcb6b0b26f125b
ms/MmsConfig.java
ms/ui/MessageUtils.java
0302b33ffb53595dbf50c3b7e74d8fc1d5bbd688 19-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25807 into eclair

* changes:
Switching to streamlined naming of contact Data columns.
9caba7e7dd6de58e9aac69cd3eb04ee518e39b64 18-Sep-2009 Dmitri Plotnikov <dplotnikov@google.com> Switching to streamlined naming of contact Data columns.

Change-Id: I4206bc087296ee98c5ae19685343018583a32e12
ms/ui/RecipientsAdapter.java
ms/util/ContactInfoCache.java
817eb982a66303a8f87fc3061e3493a232627e96 16-Sep-2009 Satish Roddom <satishroddom@motorola.com> Support sending SMS to carrier alias via sms-to-email

To support this carrier feature without breaking other checks, the following logic is used:

If the existing Email address check fails, check whether entered recipient is a valid
phone number. If not check whether it is an alias, and if it is an alias, send it to Email
gateway.

Bug: 1999421
Change-Id: I4d8184bf0911bb4426c5a73e86cd932b999c107b
ms/data/WorkingMessage.java
ms/transaction/SmsMessageSender.java
ms/ui/MessageUtils.java
ms/ui/RecipientsEditor.java
738c7cb4f2b16f722d7e2938eef9fd6720309c1b 18-Sep-2009 Tom Taylor <tomtaylor@google.com> Only show out-of-memory rejections

There are a number of rejections that are broadcast. The only one
we should notify the user is out-of-memory.
ms/transaction/SmsRejectedReceiver.java
012970b3d50851d147318527a9a872108b0ab9c7 18-Sep-2009 Tom Taylor <tomtaylor@google.com> Add mobile type

When adding a new contact from the Messaging app, set the
number to mobile.
ms/ui/ConversationList.java
1b361005bd1f6a007a790e4f44736c195c83b7aa 18-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25665 into eclair

* changes:
Calc unsent message sizes
4c86b97e7aa0489813c34c13546fbbbcaa7b4897 18-Sep-2009 Wei Huang <weih@google.com> Fix bug 2101262: when forwarding a message, make sure to clear the message history from the old thread.

Change-Id: I6192ddb665f05cce2aaa94680fa14f84dc871de5
ms/ui/ComposeMessageActivity.java
692636241c9858b6b535c876a79be2f04d8201b5 18-Sep-2009 Tom Taylor <tomtaylor@google.com> Calc unsent message sizes

Allow 4 * maxMessageSize worth of unsent MMS messages before blocking the
user from sending any more MMS's.
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/transaction/MmsMessageSender.java
98fa50f3668c9339e5d716d026f4595cc3dd4fac 18-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25612 into eclair

* changes:
use phone number if no contact id
78ac273e144aa7c71382e84a581fcc979fbda959 18-Sep-2009 Mark Wagner <mxw@google.com> use phone number if no contact id
ms/ui/ConversationHeaderView.java
8b6e007cb42f46a0878fe965233b4e1dad06f3a1 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25500 into eclair

* changes:
use the FasttrackBadgeWidget instead of an ImageView. The widget knows how to launch the fast track so we don't have to have direct knowledge of that anymore.
95d7bfcd1b878df6d8f7a172888efe63311559c3 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25543 into eclair

* changes:
Add MMS unsent limit
c44a89a040956a7b9635de4a9bcf1d7230692750 17-Sep-2009 Tom Taylor <tomtaylor@google.com> Add MMS unsent limit

Don't let unsent Mms message pileup. They chew up a lot of memory. After
a configurable limit (default 4), don't allow the user to send any more
Mms's.
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
458cba41f1fd632e12a87d8d43a929b8097f5e6a 16-Sep-2009 Mark Wagner <mxw@google.com> use the FasttrackBadgeWidget instead of an ImageView. The widget knows how to launch
the fast track so we don't have to have direct knowledge of that anymore.
ms/ui/ConversationHeaderView.java
f8d043174b15c48438c441635f29824bb525951b 17-Sep-2009 Tom Taylor <tomtaylor@google.com> Add MMS contact type

Incorporate mxw's suggestion of using String.format.
ms/ui/RecipientsAdapter.java
257261dce55b6421608079e40a287f39238f1c22 17-Sep-2009 Tom Taylor <tomtaylor@google.com> Add MMS type

Add the MMS type to the recipient lookup query.
ms/ui/RecipientsAdapter.java
551713cdfaf2ce6504c3f7fc1e45d9e605914bd6 20-Jul-2009 Kenny Root <kenny@the-b.org> Avoid recipient duplication in Messaging

If you try to send an SMS/MMS to a contact which has a comma in
their name field, the Messaging app will add a duplicate recipient
for each of the commas in their name.

The RecipientsEditor tokenizer only scanned directly for commas
and then looked at the spans overlapping with those regions. This
change will take into account the span end each time and adjust the
current index to be at the end of the span if necessary.

Fixes http://code.google.com/p/android/issues/detail?id=2739
ms/ui/RecipientList.java
ms/ui/RecipientsEditor.java
77098247e64fa81b7f52457e364b81a8dbcb499a 16-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix a monkey crasher

Protect against getting a null WorkingMessage.

Change-Id: If76912ceb28eed09705e814ac769757b0487f6dc
ms/ui/ComposeMessageActivity.java
35cd23249507b9482dafd08835b042f4d2214c0b 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25339 into eclair

* changes:
fix bug 2112925: don't display zip file garbage content in MMS.
d130e2e6dc448fd80ecb70f0d31e3affb9888b9a 16-Sep-2009 Wei Huang <weih@google.com> fix bug 2112925: don't display zip file garbage content in MMS.

- if the content type of the attachment isn't "text/plain", don't try to display it as text.

Change-Id: Id3dd82afaee848019600497fb52db98c8eb14bd3
ms/model/SlideModel.java
ms/ui/MessageItem.java
dc58429bf08e9d5ba8c43f0ac21e7cd18ea8cb06 16-Sep-2009 Tom Taylor <tomtaylor@google.com> Add start activity flag

When launching external activites (e.g. youtube, contacts, dialer, etc.) from
the Messaging app, use a particular launch flag. When a user goes back to home
from that external app and then back into Messaging, they won't end up in
the external app again.

Change-Id: I5b6158d381e4eac3b6d5c6bfcda97814b2f6d029
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageListItem.java
9242286c35743422051d439d7460cd0a1426899c 16-Sep-2009 Wei Huang <weih@google.com> add more logging in MMS. Try to catch an OOM error, and dump hprof data when it occurs.
ms/dom/smil/SmilPlayer.java
ms/model/CarrierContentRestriction.java
ms/model/ImageModel.java
ms/model/MediaModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/UriImage.java
ms/util/DraftCache.java
5c0aff95e0c161d22fad145fe344430fd3474bc1 16-Sep-2009 Dave Sparks <davidsparks@android.com> Don't show DRM ringtones when the user tries to attach audio to an
MMS message. Bug 2041625.
ms/ui/MessageUtils.java
250896b68eb8046770f2fb18d6c1c028949f5e76 15-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24975 into eclair

* changes:
fix bug 2091298: don't auto restart the music app after done playing the mms audio attachment.
ca09b947272afd5f9a4960bc55a19f1b9e063d5b 15-Sep-2009 Wei Huang <weih@google.com> fix bug 2091298: don't auto restart the music app after done playing the mms audio attachment.
ms/model/AudioModel.java
ms/model/MediaModel.java
ms/model/VideoModel.java
c6482ba8c841c539dd67be432cbc59bb597a771f 15-Sep-2009 Wei Huang <weih@google.com> fix bug 2119357: don't pass null to TextView.setTextkeepState().
ms/ui/ComposeMessageActivity.java
9efd5d4913cb4c4da7802cb1be922b32223141e6 13-Sep-2009 Wei Huang <weih@google.com> Fix bug 2116423, include Phone.TYPE_WORK_MOBILE when filtering for sms recipients.
ms/ui/RecipientsAdapter.java
49b285cabf8493185e4bee786bda597fc969af13 13-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24837 into eclair

* changes:
Fix logging
3f5ec94318c06c5e4827a5f7c40205a8335eb758 12-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix logging

There's a situation where the incoming intent has a '%' in one of
the extras. When logging is enabled via setprop the log()
function called and trying to format the string causes an exception because
there are not format parameters. It turns out in CMA, we're only
passing strings, but no parameters, so simplify the logging function
to only take a string. We could make this change in other Mms files,
but for now, this one is the only one with a report of a crash. Users
won't ever see this because logging is off by default.
ms/ui/ComposeMessageActivity.java
ff408aa9dd640912cf94ae37739d76722b1d2806 12-Sep-2009 Tom Taylor <tomtaylor@google.com> Hide media controller

When the activity is stopping, make sure to hide the media controller
otherwise the window manager claims we're leaking a window.
ms/ui/SlideshowActivity.java
0d0e9db8339b15802927348b12870a0626208bfa 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24760 into eclair

* changes:
Cursor position issues in composer
747a4ee2ca85f7280f1be7258f23b3bd14d6f95d 11-Sep-2009 Satish Roddom <satishroddom@motorola.com> Cursor position issues in composer

Several cursor position issues where cursor position is not retained.

1) Type some text in 'Text' field. Place the cursor in middle of the text.
Attach any media. Cursor moves to the end.

2) Again place cursor to some other position. Say in the middle of the text.
Remove attached media. Observe cursor is moved to beginning.

Fix: 1. Used method setTextKeepState() instead of setText() in drawBottomPanel()
2. Removed the code of calling setSelection() in loadMessageContent(). This
is not required now, changes in drawBottomPanel() will take care of this.

Change-Id: Ia78b0b878e70a75e1c2ffcaf9a46bcbdba7b80e0
ms/ui/ComposeMessageActivity.java
ad71a8fc6ac5bbfa2971955a73e8345074882038 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24736 into eclair

* changes:
Better handle filenames
d9e91d95f4c8ed00d881e41b6af9783bec61cfc8 10-Sep-2009 Satish Roddom <satishroddom@motorola.com> Force-close when adding picture to a slide having video

Issue: Add video to a slide. There is a button 'Add picture'. Click it, and select a picture.
Messaging force closes.

Rootcause: It is obvious that a slide cannot have a video as well as picture. When doing so,
the function internalAdd() gets executed and throws IllegalStateException, which is not caught
anywhere.

Fix: When a slide has a video already, and user clicks 'Add picture', show him toast saying
'video and picture cannot added to one slide' and return.

Bug: 2111946
Change-Id: Iad57c2f664569bbf20db00c477d1e8f0b22664f9
ms/ui/SlideEditorActivity.java
325a37787f144421f995eeb385f67a5d255d7820 11-Sep-2009 Tom Taylor <tomtaylor@google.com> Better handle filenames

When getting an image uri that pointed to a file, the code didn't
handle filenames with spaces very well. Furthermore, if the code couldn't
parse the filename extension, it would throw an exception and crash.
Give another shot at finding the extension and if that fails, don't crash,
but show a "picture couldn't be attached" toast.

Change-Id: I5a2fcf6cc16984d81a3b8d5a7ef19367e16dd839
ms/ui/UriImage.java
b8d3be530f0d3b15ac7c63f7e5ac39281f93b094 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24715 into eclair

* changes:
Null check
782238c8102fc32f96359f6fc5a01715806d4f77 11-Sep-2009 Tom Taylor <tomtaylor@google.com> Null check

Fix a rare crasher by preventing us from passing a null uri
down the save-pdu pipeline.

Change-Id: I800548cef8bc00fd5d64db1a5acdf07f6f9d1aee
ms/data/WorkingMessage.java
d9d7479a8c9e10b7b3f39137e28ed0f283e4a257 11-Sep-2009 Wei Huang <weih@google.com> fix memory leak in MMS (bug 2021095); don't rebuild Contact cache and draft cache as frequently.

- fix a memory leak reported by Motorola. We weren't registering a Recycler listener, so weren't getting called back for onMovedToScrapHeap() when done with the ConversationHeaderViews, and thus not exercising unregistration for contacts changed listener.

- moved some tasks from ConversationList.onResume() and onPause() to onStart(). We were rebuilding the draft cache and contact cache in onResume(), which was too aggressive. Also, we no longer rebuild the draft cache anymore. I think it was defensive to do so, and I think draft cache is getting updated correctly in the right places (in CMA.onStop and onNewIntent) so we don't have to to play safe by doing unnecessary work.

- don't register for presence and contacts changed. We don't display presence directly in CMA ourselves anymore, and instead use ContactHeaderWidget, so we don't need to listen for presence changes there; for contact changed observer, I think it's too much to rebuild the contact cache for any contacts changes in the contacts provider. Instead we compromise and rebuild the contact cache in ConversationList.onStart(). This is a tradeoff, as when sitting on the CMA or ConversationList screen, we won't update if Contact changed. However, re-entering ConversationList will trigger the update if there is any.

- beefed up logging a bit more...

Change-Id: I97f1d7eae3ca5d3d069977e2c9fa0d7b0500dc3e
ms/data/Contact.java
ms/data/ContactList.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/util/DraftCache.java
102b480e3c35ee8cc40426da7d18821099506e90 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24598 into eclair

* changes:
Fix monkey crasher
6cba8248f3e41921b03cc74a823a6347016e69ba 11-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix monkey crasher

If the monkey sends an intent with uri to a non-existing thread,
the messaging app would crash.
ms/data/Conversation.java
675c3013f54100ce00ab1a4e3fa46b124e957df6 11-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24586 into eclair

* changes:
Adjust keyboard setting
6cc8b68c6b0956c51601065536f1dcd0494eef6e 11-Sep-2009 Tom Taylor <tomtaylor@google.com> Adjust keyboard setting

Adjust the keyboard mode so the keyboard doesn't automatically open
when opening ComposeMessageActivity.
ms/ui/ComposeMessageActivity.java
30523f5908dc28f7686bbc1363b20ea77ee29ab9 10-Sep-2009 Tom Taylor <tomtaylor@google.com> Strict message limits

Make the message limits hard rather than soft. We now only keep
X messages, not including locked messages. Unread vs. read messages
no longer make a difference.
ms/util/Recycler.java
61bfb8067917787fa23f727b66ea20e377f7f7bc 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24459 into eclair

* changes:
Confirm delete locked messages
3e10898d774b0005fc776865216651346503024b 10-Sep-2009 Tom Taylor <tomtaylor@google.com> Confirm delete locked messages

Allow a user to delete a locked message, but show a different
dialog alert so the user will know they're specifically deleting
a locked message. Also, fix deleting a thread. Use the same code
for deleting a thread as used in ConversationList where we check
to see if the thread contains locked messages and if so, present
a different UI.
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
d34ab553ebd6197042f8bfda9a1b5cecd69149cc 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24494 into eclair

* changes:
Remove green bar
777b020e5a1049fc464883df80eb90db674e8083 10-Sep-2009 Tom Taylor <tomtaylor@google.com> Remove green bar

Remove the green "unread messages" bar. Unread messages are signified
by just a bold title. Adjust spacing as mentioned in the bug report.
ms/ui/ConversationHeaderView.java
e5ebfb089f2d95546c599c739c97abbce49b6193 10-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24433 into eclair

* changes:
Add bulletproofing
49eaf0b56e323f2b9526677165443bb51b014d52 09-Sep-2009 Tom Taylor <tomtaylor@google.com> Add bulletproofing

Protect against the monkey sending bad data in one of the extras in
the intent. Do a simple sanity check so we don't try and lookup an
empty number.

Change-Id: I88e1452fef4a57f2d0e52c41fbddd217c0114c5c
ms/data/ContactList.java
4c43b8891eeff3a8565ffb0277488858f99a1b2a 09-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24401 into eclair

* changes:
Pin limits rather than wrap
2f3a42025f51d410162b9b4b3583528077117374 09-Sep-2009 Tom Taylor <tomtaylor@google.com> Pin limits rather than wrap

In the dialog to set message delete limits, pin the min and max rather than wrapping.
It was too confusing when lowering the limit and all of a sudden finding yourself at 5000.

Change-Id: I003181b42ae9216644140bfcbcd071a2f5dce3fe
ms/MmsConfig.java
ms/ui/NumberPickerDialog.java
ad98c6b8428b6b9a328244054a7293f4bec320e0 09-Sep-2009 Wei Huang <weih@google.com> add debug logs to track down bug 2071602.

Change-Id: I541833a7b2ee4cd32230a4ac145b4418348a9850
ms/transaction/RetryScheduler.java
ms/transaction/TransactionService.java
70262ed72605a86706b3a63810d34adbfd0868a7 09-Sep-2009 Wei Huang <weih@google.com> Fix bug 2099044: don't display "convert to SMS ..." too eagerly.

- basically, don't display message status changes when saving draft (done only in onStop and onNewIntent). I think it's sufficient to display the message status when

- the user adds/removes attachment and subject.
- the user hits send we reconcile the message protocol before sending.

Change-Id: If10e5101f11a645b66d6082fa343709fa90887ef
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
923c4c7e9afb8e364d4a93afa0eb6394485d3637 08-Sep-2009 Dmitri Plotnikov <dplotnikov@google.com> Upgrading to new Contacts email filter APIs.

Also showing avatars for email-based messages.
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/util/ContactInfoCache.java
afab47f1ea6db50df7f045131fed5dba9cead6b0 06-Sep-2009 Dmitri Plotnikov <dplotnikov@google.com> Upgrading to new Contacts APIs
ms/ui/RecipientsAdapter.java
f79b803adc0cee3778cf6aac52d203896cde5d95 04-Sep-2009 Christian Gustafsson <christian.gustafsson@motorola.com> Resize images when they exceed the MMS payload size

Code was in place to resize images when they exceeded the maximum
MMS dimensions. But the case where the byte size of an image was exceeding the
MMS payload just resulted in an error message to the user. This is a problem
with high resolution images taken by the devices camera. These images fit the
MMS dimensions but routinely exceed the MMS byte size.

Extra fix for GIF images. The GIF decoder does not honor the scaled decode
parameter. Code now calls the Bitmap scale function when this happens.

1. Change the getResizedImageData function in UriImage.java to account for
byte size as well. If the resulting jpg exceeds the byte size attempt to
reduce the quality on the compressor first. But not below 50%. Should
this step not work then rescale the image to a lower resolution and try
again. Do this up to 4 times.
2. Change resizeImageAsync in MessageUtil.java to pass a maximum bytes size.
Account for a MMS overhead of 5000 bytes in this case. So the maximum
image size will be msConfig.getMaxMessageSize() ? 5000.
3. Update 3 places to call resizeImageAsync instead of showing an error
message to the user.

Change-Id: I33427fe79c42677e24acf0390ae834d58205c8f1
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
ms/ui/UriImage.java
28267695b591d5d9cc176e5f199eb2aef3f9fcd3 04-Sep-2009 Tom Taylor <tomtaylor@google.com> Save draft

If the user is in CMA and hasn't created a thread and then receives an SMS,
the new SMS would get jammed into the CMA the user was in the process of
editing. With this change, we save (if necessary) the existing work as a
draft, first.

Change-Id: I9f2018b6a6636194f5e978a15247238ffb27f0e3
ms/ui/ComposeMessageActivity.java
a2279b8af29b5bef9050e1f3e30ac1fdd29d2b1d 04-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23831 into eclair

* changes:
Remove Manage SIM pref
4c93cf90a87725e0b6958f933b20e149e6c074f0 03-Sep-2009 Tom Taylor <tomtaylor@google.com> Remove Manage SIM pref

Dynamically remove the "manage sim" pref when the device doesn't
have a SIM. Also, simplify the existing code. There was no need to
create a Preference subclass just to handle clicking on the preference.
The actual fix has been short-circuited until the function used to
check for the presence of the SIM works correctly.

Change-Id: I465256f675a059459000a2c4832e97259c24efc0
ms/ui/ManageSimPreference.java
ms/ui/MessagingPreferenceActivity.java
23142979f43786098655229416cf1d07c5f78e09 03-Sep-2009 Tom Taylor <tomtaylor@google.com> Fix send order

When SMS messages can't be sent, they're queued up. When messaging
can continue (back in range or out of airplane mode) the messages
were pulled off the queue in the newest-to-oldest order, resulting in
them getting sent in the wrong order. With this change, messages are
send in the same order that they were composed.

Change-Id: Id7a190dc27ef975c9553fd33210c58bba07ef0dd
ms/transaction/SmsReceiverService.java
0d798c0853ead129b245ac7e8700f3a4aba92ecb 03-Sep-2009 Wei Huang <weih@google.com> tweak logging SMS sending and receiving.

Change-Id: Ia037cd8d63956c05c75f690df35a0dc4ef1b24f3
ms/data/WorkingMessage.java
ms/transaction/SendTransaction.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiverService.java
749646289b9e9732f001cbd2d74c1759705661b6 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23684 into eclair

* changes:
Add logging info
f3d4a23a76a4bbe0d48503ad7abf5d8f4fc38c31 02-Sep-2009 Tom Taylor <tomtaylor@google.com> Add logging info

Add logging info for receiving and sending SMS messages, hoping to track
down the bug where the receiver gets multiple copies of a message.

Change-Id: I75398140d67ed5b9dc7b21d288a6e4fc7dc00790
ms/transaction/SmsReceiverService.java
920a5d9d43896dc6d1b2ddebb5e3a07c66b41691 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23710 into eclair

* changes:
don't crash due to bad contact url.
1a0ec0c1576cab49e02a1dab796ed2be33f0a0a5 03-Sep-2009 Wei Huang <weih@google.com> don't crash due to bad contact url.

Change-Id: I826ca5e35f917e5afa0d7686b5e1ab4d85858a3b
ms/transaction/HttpUtils.java
ms/ui/ComposeMessageActivity.java
417d3ee9970f4cef1a42650c49d97c6d85c35204 02-Sep-2009 Mark Wagner <mxw@google.com> fixes to make sure the search results list is selectable
ms/ui/SearchActivity.java
e3baaa51cd25b52c7a24e381319926b9da00abdf 02-Sep-2009 Wei Huang <weih@google.com> don't vibrate by default for new message notifications in MMS app.

- also fix cursor management.

Change-Id: I7a786b8651408c3803abe9eddf1921e4344821b8
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
a1af734418c5578483f3387e5e0bf6128c963dfa 02-Sep-2009 Tom Taylor <tomtaylor@google.com> Handle SMS Rejected message

Add a receiver to handle the SMS rejected intent. Put up a notification
and take the user the conv list when selected.

Change-Id: Iaebb09d13e0b98b36d2c118328a4c47dad684ec5
ms/transaction/SmsRejectedReceiver.java
ms/ui/ConversationList.java
85fbc94e34688455c3f2f36271ba65b90ceb2542 27-Aug-2009 Tom Taylor <tomtaylor@google.com> Fix delete threads dialog

When deleting a thread with locked messages, show a checkbox that allows
a user to delete even locked messages.

Change-Id: I544fc0188bf9e96af671bd2e4321dba4356ebf81
ms/data/Conversation.java
ms/ui/ConversationList.java
fa1c08f58afd8246b223c2a55a4ba0a6dac39526 01-Sep-2009 Tom Taylor <tomtaylor@google.com> Attachments in landscape

Use a compressed (vertical) layout for the attachment views in landscape mode so
there's enough room to see at least one new incoming messages.

Change-Id: Ic0df528e94064e0da7f591083de1799c683498be
ms/ui/AttachmentEditor.java
ms/ui/ComposeMessageActivity.java
3e1dba104aba35d44db97ca5f7083ba8e865d261 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23466 into eclair

* changes:
use resize mode so the virtual keyboard doesn't get in the way as much
08c99d3e1045d9d5dd27d0845e0647d7664bfb4f 01-Sep-2009 Mark Wagner <mxw@google.com> use resize mode so the virtual keyboard doesn't get in the way as much
ms/ui/ComposeMessageActivity.java
86b3e552c250704de7abeab5553bab664fa01f64 01-Sep-2009 Wei Huang <weih@google.com> fix bug 2087093: rework getDur() for playing Smil document. Limit Tom's work around (set min duration to 7s) for video or audio content only.

- for only limit the video/audio duration after we failed to compute the duration from "end-start" computation.
- reorg log tags.

Conflicts:

src/com/android/mms/dom/smil/ElementTimeImpl.java

Change-Id: I753598dd23a340506f67d0917a5535847b980222
ms/dom/smil/ElementTimeImpl.java
ms/dom/smil/SmilMediaElementImpl.java
ms/dom/smil/SmilPlayer.java
ms/model/MediaModelFactory.java
ms/model/SlideshowModel.java
ms/ui/SlideshowEditor.java
128121ed946ef0c12d544e823d2f64e51e2a204d 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23352 into eclair

* changes:
fit and finish. 1) reorder search in the menu 2) use correct window title in search results
f539c6440cffefab7b4677cd6a3ee9f019317bdc 01-Sep-2009 Wei Huang <weih@google.com> when handling onNewIntent(), we need to requery for message history if it's for a different conversation.

- refactor the query code for message history so onNewIntent() can call it if the conversation is different.
- when forwarding a message, need to handle the result from startActivityIfNecessary(). If the result is false,
we need to handle the intent ourselves.

Change-Id: I822e4e2f900877ae6a5aa1a346514f90dc29aeb6
ms/ui/ComposeMessageActivity.java
800f2ac17e15b24e93158574649e821a334c491e 01-Sep-2009 Alexis ROBERT <alexis.robert@gmail.com> Shows a Toast when a delivery report has been received.
ms/transaction/MessagingNotification.java
b2de23b71c774412d228d20ff4b941f082df3725 01-Sep-2009 Mark Wagner <mxw@google.com> fit and finish.
1) reorder search in the menu
2) use correct window title in search results
ms/ui/ConversationList.java
ms/ui/SearchActivity.java
120953551224a018618b1397ac790812b8a66f20 31-Aug-2009 Satish Roddom <satishroddom@motorola.com> Cursor issue in draft messages

Open a draft message with some text. Issue is cursor is at the starting
position of text editor instead of end of the text. This change sets the
cursor position based on the length of the text.
ms/ui/ComposeMessageActivity.java
3c68b6852913222dd982dddd4e39b3e57613c37e 30-Aug-2009 Wei Huang <weih@google.com> fix bug 2087495: don't show the notification ticker when not showing a new message notification.

- when updating mms notification, don't always display a ticker message for the last unread message.
- remove old logic no longer used.

Change-Id: I3c004cdb688dd897644dbaa75573dfc1e5b9e258
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
f598e2c766ab30c71a18854e446d848ce79dfe7a 30-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23180 into eclair

* changes:
when binding the contact header widget use the right list of contacts.
32a1dcecca6ed0881431555a4218d0282814326c 27-Aug-2009 Wink Saville <wink@google.com> temporary fix for bug 1892808. If the SMS address is a short code addr, don't feed it to PhoneNumberUtils.compare() as that doesn't handle short phone numbers.

- if the SMS address is shorter than 6 digits, just do a straight string comparison now. SMS short codes don't usually have the separater characters like "(.- ", or the prefix '+'.
- when updating the contact cache, don't spin up one thread per contact. Do all the contacts update in a single thread.
- add a unit test for comparing SMS phone numbers and short codes. Disabled ConversationaListTest, it seems to get stuck for a long long time.

Change-Id: I9fca4734c235466671ff72d144842bbbb0d7dda9
ms/LogTag.java
ms/data/Contact.java
ms/transaction/SmsMessageSender.java
ms/util/AddressUtils.java
2c8a398f5562569d46215dec1455c1dc04b3ba1a 28-Aug-2009 Mark Wagner <mxw@google.com> when binding the contact header widget use the right list of contacts.
ms/ui/ComposeMessageActivity.java
551f74fb7f57ce5eb706e4860c997519920e71b3 27-Aug-2009 Wink Saville <wink@google.com> New message icon for MMS not always updated on status bar in call

Issue : When the phone is in a voice call, the CDMA data connection gets suspended.
The download of an MMS fails when auto retrieve is On.
So, notification bar is not updated with the new messages icon.

Fix : When we are in call, the notification manager is updated as soon as we receive the MMS.
(In general, we show notification to the user ONLY after the complete message is
downloaded for auto retrieve ON).

- We show notification of incoming message.

- Let the message stay as a WAP push.

- Message can be downloaded manually whenever needed.

Hence instead of trying to download the message which will definitely fail when in call,
just notify the user of an incoming message, and let him download later.

Change-Id: I6b4b9d32cc6eb1f5a74888fd55386983f0a81fb9
ms/transaction/NotificationTransaction.java
ce7fd67592aac660d96a9ed196c9d4fb03005b6c 26-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22739 into eclair

* changes:
pause music player when playing audio in MMS slideshow, and resume when MMS audio is stopped.
7fa61cafe50deb74beb0819bdf52128239d50201 26-Aug-2009 Wei Huang <weih@google.com> pause music player when playing audio in MMS slideshow, and resume when MMS audio is stopped.

- more logging reorg.

- call

Intent i = new Intent(MUSIC_SERVICE_ACTION);
i.putExtra("command", "pause");
mContext.sendBroadcast(i);

to pause music player, and

Intent i = new Intent(MUSIC_SERVICE_ACTION);
i.putExtra("command", "togglepause");
mContext.sendBroadcast(i);

to resume.

Change-Id: I917310fe1e4f127e608f2acdb2c7976290746188
ms/model/AudioModel.java
ms/model/ImageModel.java
ms/model/LayoutModel.java
ms/model/MediaModel.java
ms/model/SlideModel.java
ms/model/VideoModel.java
59be3105fb43b5e9fcb363981dfa3de31c1bc2a8 26-Aug-2009 Wei Huang <weih@google.com> support intent extra parameter "address" for launching ComposeMessageActivity. If the intent has no "thread_id", and doesn't contain a data uri, then look for the "addrss" field.

- this is to support testing of

adb shell am start -a android.intent.action.VIEW --es address <number> --es sms_body <body> -t vnd.android-dir/mms-sms

Change-Id: I38c0dff2f0cc20ba0a0dbafdb17660c5eacb4b49
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
b22b30999e7d65d9a9a1991c1e409315a2c5ba99 26-Aug-2009 Wei Huang <weih@google.com> fix bug 2040009: when we hide the subject editor in CMA, make sure to remove the text watcher, otherwise it will continue to get onTextChanged() with '' as the string and make us think it's a MMS message.

- when we get '' in subject editor text watcher, we merrily call mWorkingMessage.setSubject(''), which is interpreted as forcing a subject and causing the message to be converted to MMS. So let's not confuse the poor text watcher when the subject editor is hidden.

Change-Id: Icaca2e482244af3e9dc8dd7a48c8abf75b88fc39
ms/ui/ComposeMessageActivity.java
64d0ce47710fb671b0d4d7f2e8789757085eeac9 25-Aug-2009 Chih-Chung Chang <chihchung@google.com> Pass max recording duration parameter to video recorder.
ms/ui/ComposeMessageActivity.java
aff7def79179073663365200e0619b283190c3ea 26-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22713 into eclair

* changes:
MMS-IOT Notifications go to wrong MMSC
475d780550e0034379ed821a90fdbc96d810b72d 26-Aug-2009 Tom Taylor <tomtaylor@google.com> Handle delete all vs. delete unlocked

For the various options of deleting a thread, ask the user to choose
between deleting all messages or just the unlocked ones.

Change-Id: I04c9d7ddc220ec5bb61e0fb487bfd13a1a7aeb66
ms/data/Conversation.java
ms/ui/ConversationList.java
dcbeb61efcc36b3cefd1b1c58e0d1a7e47ba0cdd 25-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22653 into eclair

* changes:
bug #2060208: in CMA.onNewIntent(), compare two conversations by their thread ids instead of direct Java references, which could be different in some cases.
88ee29139d831325875c8d4e05d3edf6fa05d510 25-Aug-2009 Wei Huang <weih@google.com> bug #2060208: in CMA.onNewIntent(), compare two conversations by their thread ids instead of direct Java references, which could be different in some cases.

Change-Id: Ie3a27e4cbd9bfc4d0912080d6cc99dc9cb85654b
ms/ui/ComposeMessageActivity.java
00a536eb56824e79bb844f48c1f3cbe8afdb68ab 25-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22645 into eclair

* changes:
Don't always show sent timestamp
0e19f738c114f86d0d88825ee48966015fb48b6d 25-Aug-2009 Tom Taylor <tomtaylor@google.com> Don't always show sent timestamp

Hide the sent timestamp until an SMS or MMS message has been
successfully sent.

Change-Id: Ie394a8dd6e3ad3852a8cb945794783f2fbf0afcc
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
7542864dfb78a58d056e26c9f12e48842324a849 25-Aug-2009 Wei Huang <weih@google.com> bug 1987402: update draft cache when deleting thread/all_threads in the ConversationList activity.

Change-Id: I3eb35169f2ea9c627835b27ba8e45b0195262c8c
ms/ui/ConversationList.java
161c9154aa7aafa397332caee40b2776db988bf7 25-Aug-2009 Christian Gustafsson <christian.gustafsson@motorola.com> MMS-IOT Notifications go to wrong MMSC

Some carriers need the M-Acknowledge.ind and M-NotifyResp.ind to be
sent to the URL that came with the M-Notification.ind (WAP PUSH).

The standard is a bit hard to read. But it seems to suggest
that these notifications should be sent to the MMSC configured in the device:

7.3.1 Transaction Flow
This message is submitted using a URI that addresses the
MMS Proxy-Relay that supports the specific MMS Client.

That assumes that the carrier would only have a single MMSC.
Some carriers have at least two.

1. Add a new flag to MmsConfig.java to make this feature dynamic.
2. Add a sendPDU function to Transaction.java that will
take a URL as override the TransactionSettings MMSC URL.
3. Update NotificationTransaction.java and
RetrieveTransaction.java to pass the ContentLocation URL
to the new sendPDU function when the feature is enabled.
ms/MmsConfig.java
ms/transaction/NotificationTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/Transaction.java
812391ad832f3fdac054ad3a50af563da16e99b5 25-Aug-2009 Wei Huang <weih@google.com> Add onNewIntent() to ComposeMessageActivity, and add the launchmode="singleTop" to AndroidManifest.xml. Just specifying the intent flag Intent.FLAG_ACTIVITY_SINGLE_TOP doesn't make the activity single top.

(cc: Dianne only for the activity launch mode flags in AndroidManifest.xml)

- the singletop launch mode is needed for the case when we receive a new message notification for the same contact that's on CMA already. If CMA has a MMS draft on screen (but not saved to db yet), not going thru. onNewIntent() would cause the following bad sequence.

- onCreate() would load any draft saved in db, but in this case there isn't draft saved in db yet because we only save draft in CMA.onStop(). So loadDraft() would load the empty draft.
- onStop() on the old CMA activity would now save the in-memory MMS draft to db.
- the new CMA lost the MMS draft that's there before clicking on the notification. But resulting db has the MMS draft, which is now orphaned and not associated with the conversation. From here on out, entering and exiting the CMA for this conversation would not see the MMS draft, but it's there in the part table in db. VERY BAD!

so with onNewIntent(), we can check if the new intent's recipient is the same as the old one, and skip the whole shenanigan.

- add debug logging for draft cache. Changed the log tag for draft cache to "Mms:draft", and CMA to "Mms:compose".
- guard against null cursor returned from Contacts query. Contacts is very flaky right now, and I am getting a null cursor from it all the time.
- reorg logging. Add new LogTag class. Log MMS app logs using "Mms:app" and transaction logs using "Mms:transaction".

Change-Id: I5e12c87ab378ff9b6ff326e136598f64bd423129
ms/LogTag.java
ms/data/WorkingMessage.java
ms/transaction/HttpUtils.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageUtils.java
ms/util/ContactInfoCache.java
ms/util/DraftCache.java
0be5770b07cbd03eea9cd821ef02c8480020b162 17-Aug-2009 Mark Wagner <mxw@google.com> updating the title bar (ContactHeaderWidget.bind) when losing focus
from the recipient editor
ms/ui/ComposeMessageActivity.java
fb7792a0da91c78175619cac47e39573a128b7da 25-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22480 into eclair

* changes:
Set defaults
e6367524d22c6bfedfb81c7e068e475b0f807053 24-Aug-2009 Tom Taylor <tomtaylor@google.com> Set defaults

Add some reasonable defaults to the SMIL: zero duration elements default
to seven seconds. Media items with widths or heights of zero default to the
document's bounds.

Change-Id: I97ad6580dbcbd1b06eb0d794c862d1356b61bd7a
ms/MmsConfig.java
ms/dom/smil/ElementTimeImpl.java
ms/dom/smil/SmilRegionElementImpl.java
322a547ba74caade04b22158fa8908bcb47add26 21-Aug-2009 Satish Roddom <satishroddom@motorola.com> Compose Message "To" field allows adding sequence of characters as contact

When we select this option, this sequence of characters (which is neither a
valid email address nor a phone number), gets stored in contact with type MOBILE.

Fix: In function canAddToContacts, adding a check to validate whether the contact
to be added is a valid email address or phone number. If not, user will not be shown
with the option "Add to Contacts".
ms/ui/ComposeMessageActivity.java
3b9acf897f4bdd4d76cbcf10d7bd2728c941c7d5 19-Aug-2009 Christian Gustafsson <christian.gustafsson@motorola.com> MMS-IOT Single Segment WAP duplicate check always succeeds

The content location is used to detect duplicate MMS WAP
pushes. This is a problem with single segment WAP pushes
since these always have the same Content Location until the
Transaction ID is appended to the Content Location URL.
User was only able to receive a single MMS message.
Solution is to append the Transaction ID to the
Content Location much earlier in the process (before the
duplicate check). The URL is persisted in the database,
with TransactionID attached, making it unnecessary to check
the feature enable flag in any subsequent code.
ms/transaction/PushReceiver.java
ms/transaction/RetrieveTransaction.java
2da5d167a64209f79dc65460989f15b007e90dc6 22-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22363 into eclair

* changes:
Slide show issue with multiple files
31e14b68beee7af348a4d1528acf947732351a51 22-Aug-2009 Tom Taylor <tomtaylor@google.com> Quote filenames for Smil

We need to xml quote filenames before putting them into the Smil. For instance,
an & in a filename make the xml parser think it's an entity. Converting the special
characters to the xml quote equivalent solves the problem.
ms/model/SmilHelper.java
0c2942c43825512a26f69ce480a9d3d53214da10 21-Aug-2009 Satish Roddom <satishroddom@motorola.com> Slide show issue with multiple files

Issue: Receive a MMS containing slide show with two audio files in it. Play the slide show.
First audio file plays properly and the file name is shown correctly, but when second
audio file plays file name is not getting updated i.e it still shows the first file name.

Fix: initAudioInfoView() is responsible for setting the audioName. This logic was getting
executed only when mAudioInfoView is NULL i.e it was working only for first audio slide.
The same logic was not executing for second audio slide hence the name was not getting
updated. Now removed this null check and it is working properly.
ms/ui/SlideView.java
3500f67d4623845a4053a7f06d9ab8d5ff08333b 21-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22209 into eclair

* changes:
add more debug logs to MMS transaction processing.
2ad86c587e6614d813632e0364b252210b71ffd0 21-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22283 into eclair

* changes:
Display mode 00 exception fix
1ffb580716215361e1ee5bd1d0d0554e7c30ecce 21-Aug-2009 Jeff Hamilton <jham@android.com> Merge goog/eclair-dev into goog/eclair

Merge commit 'goog/eclair-dev' into merge
43bcf48daea4e763811dffa75f62c2b4a3a39310 11-Aug-2009 Yong Liu <yong.liu@motorola.com> Display mode 00 exception fix

Issue: Click HOME after receiving display-mode-00 message, then launching messaging
throws exception.
ms/ui/ClassZeroActivity.java
2be1333ab5b265c0ff758354bac6a9eff97e1fac 21-Aug-2009 Dmitri Plotnikov <dplotnikov@google.com> Upgrading MMS to new Contacts API
ms/data/Contact.java
ms/util/ContactInfoCache.java
6dabb09aaf6386d6501e4165c0530bd11c2fe2a0 21-Aug-2009 Wei Huang <weih@google.com> add more debug logs to MMS transaction processing.
ms/transaction/TransactionService.java
293000e15498b71a4986d7247e60fe8bdaa05a4b 19-Aug-2009 Wei Huang <weih@google.com> fix an issue where our http socket timeout (20sec) is too aggressive for connecting to VZW mmsc, which could have up to 48 sec delay responding to a request. Make the MMS config socket timeout of 1 min (configurable by mms_config.xml). Also fix a bug where we write 8k extra of nothingness when saving to sdcard.

- add getHttpSocketTimeout() to MmsConfig. Use in HttpUtils when creating a new AndroidHttpClient.
- manually integrate a change from open source, fixing a bug where we write up to 8k of empty bytes to the end of the content when saving to sdcard.
- also added logs to dump content type.
- tweaked the log when we throw a MmsException when we can't get the duration of media content.
ms/MmsConfig.java
ms/model/MediaModel.java
ms/transaction/HttpUtils.java
ms/ui/ComposeMessageActivity.java
fc0070e2bd326b9a4290d62dcbf6d8ff29c6ae89 20-Aug-2009 Tom Taylor <tomtaylor@google.com> Auto-open soft keyboard

On devices without a hard keyboard, auto-open the soft keyboard when a
user composes a new message so they'll be all set to start entering recipients.
ms/ui/ComposeMessageActivity.java
2ad07da6a7a23441c1aa7eebc783a7840989d4be 20-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21999 into eclair

* changes:
Fix slideshow layout
6bf6dd8f9327299fd4a829fb7844568f96dd5278 20-Aug-2009 Tom Taylor <tomtaylor@google.com> Fix slideshow layout

The actions for the layout menu actions were reversed.
ms/ui/SlideEditorActivity.java
020411c42adb2b7968872d43f5594535aa3acaf4 19-Aug-2009 Marco Nelissen <marcone@google.com> Update MMS app to use extended MediaPlayerControl interface.
ms/ui/SlideshowActivity.java
5d31dfbc15ca3403b8c0a489256fc1e7fba38101 18-Aug-2009 Tom Taylor <tomtaylor@google.com> Don't auto pop-up completion list

Sometimes when you compose a new message, the recipient drop down pops down before
the user even types a single character. Make sure the user has typed the minimum before
popping down the list.
ms/ui/RecipientsEditor.java
e7c8092e952d9d5edbc1c0b62e5f872c4d21d2b4 18-Aug-2009 Ondrej Novy <ondrej.novy@gmail.com> Mms app: Show pending/failed/success icon in MessageList.
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
b348f222ee27426e0a038232d2a5b4b863f7ad9c 18-Aug-2009 Tom Taylor <tomtaylor@google.com> Hide message edit with slideshow

When the user adds a slideshow with more than one slide to a message, the
message area is normally hidden. However, after exiting editing the slideshow
and re-entering CMA, the edit field was still improperly visible.
ms/ui/ComposeMessageActivity.java
396a06af4e393f5aab3864c43392a67c60715d38 17-Aug-2009 Tom Taylor <tomtaylor@google.com> Don't show convert message

When forwarding a MMS message, the user would see "Converting to MMS" even
though the message was already an MMS. There are a couple of situations where
we are initializing a message where we are too zealous showing the message.
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
de188a33f592f60e347baa48c230e5a0e6d198c8 17-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21531 into eclair

* changes:
Contacts with commas
58a68e767b8f859a863976f4094757218f6cdf8b 17-Aug-2009 Tom Taylor <tomtaylor@google.com> Fix copy to sdcard

The code for checking for something eligable for copying to the sdcard
forgot to set its result.
ms/ui/ComposeMessageActivity.java
7203001c04b42ef7a32440c753faa99d5839df04 17-Aug-2009 Tom Taylor <tomtaylor@google.com> Contacts with commas

If a contact name contains a comma (i.e. "Flintstone, Fred) the messaging app would
consider that two contacts because it uses comma as a delimiter. The app would end
up sending the same message to that contact twice. Don't add dupes to the final
list of numbers to send to.
ms/data/ContactList.java
044856d87b39a0ffb581ad946968da4598198f15 07-Aug-2009 Satish Roddom <satishroddom@motorola.com> Cancel button on the notification dialog, when
Displaymode00 message is recieved is not proper.

Whenever the string in the notification is small,
the Cancel button is getting cut and the second
half is displayed below.
ms/ui/ClassZeroActivity.java
17674e5adcb2fbac4e7a8d9ef92ff5bd6f842b9d 13-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20857

* changes:
Adjust for ConnMann change around MOBILE_MMS type
c4d5bd1c65a3f87f1eda810bb5c3f6fe067a4a06 13-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21113

* changes:
catch ActivityNotFoundException
16e40177467f2af99ac1c6ecac48c7f41701cce7 13-Aug-2009 Mark Wagner <mxw@google.com> catch ActivityNotFoundException
ms/ui/ConversationHeaderView.java
edd39351defc331fc268a6ed88338f64fe6f17cf 12-Aug-2009 Tom Taylor <tomtaylor@google.com> Support multiple send intent

Allow a user to send multiple pictures/videos in an mms message. Each
gets added as its own slide.
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
4485565b0141038f65f8f1de5cccc2bafc55dcfa 06-Aug-2009 Robert Greenwalt <robdroid@android.com> Adjust for ConnMann change around MOBILE_MMS type

Bug: 1899170
ms/transaction/RetryScheduler.java
ms/transaction/Transaction.java
ms/transaction/TransactionService.java
a1e4905939ef884ce011f1eb317d25fbc8908dae 12-Aug-2009 Mark Wagner <mxw@google.com> add fasttrack launching to the avatars in the mms message list
ms/ui/ConversationHeaderView.java
d88177e4fd7b43d761c889dbe9cd2be432e84cc4 12-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20792

* changes:
show avatar in conversation list in mms
b3bbd22cf834a92780cdcb75f6473009d73412ea 11-Aug-2009 Mark Wagner <mxw@google.com> show avatar in conversation list in mms
ms/ui/ConversationHeaderView.java
07dde49d355fbe188b1ead3276544c4a324ebd11 07-Aug-2009 Tom Taylor <tomtaylor@google.com> Drm work to support ringtones
ms/model/MediaModel.java
ms/ui/ComposeMessageActivity.java
bddd230f0841974a022ef5f2296ecf0b08d432b2 11-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20655

* changes:
One-time storage limit check
f766f33b774cfb6dd4100a6522ffa23c0a0dae35 11-Aug-2009 Tom Taylor <tomtaylor@google.com> One-time storage limit check

When running the Messaging app for the first time, specifically the
ConversationList, check to see if we can auto-enable the storage limits
setting. If any of the conversation threads have more messages than
the storage limit settings, show an activity that will tell the user how
to turn on the storage limits. Otherwise, just enable the setting.
ms/ui/ConversationList.java
ms/ui/WarnOfStorageLimitsActivity.java
ms/util/Recycler.java
f788737b03ff8f3f9f1302f944333b4e1d287820 03-Aug-2009 Mark Wagner <mxw@google.com> move to ContactHeaderWidget
ms/data/Contact.java
ms/ui/ComposeMessageActivity.java
976506f3ecfce6c9a0dd6f3e5c8d9f2ed9feae03 07-Aug-2009 Satish Roddom <satishroddom@motorola.com> Cache not getting refreshed when deleted thread from ComposeMessage screen

When a thread is deleted from ComposeMessageActivity it is not getting deleted from cache.
And sometimes the deleted thread's address is getting displayed while forwarding other SMS.
Although cache is refreshed when a thread is deleted from ConversationList, when deleted
from ComposeMessage, it is not refreshed. Adding code to refresh the cache on a thread deletion...
ms/ui/ComposeMessageActivity.java
e456dc390dc5f3eeb3dd4b4f37d9bd4a74efe6c8 07-Aug-2009 Satish Roddom <satishroddom@motorola.com> Video capture force close issue

Compose new message, go to options, attach, record video. After recording,
press cancel. Got force close.

Root cause: When we press cancel, in addVideo() we are getting uri as NULL.
Same is passed to setAttachment() and down the line it results in crash.
ms/ui/ComposeMessageActivity.java
dbe1ba29cf677381c0459570107d2424cb56a068 07-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20278

* changes:
Allow ; between recipients
592a22133822eaa0f54a1de1d56cea14f57c2677 06-Aug-2009 Tom Taylor <tomtaylor@google.com> Allow ; between recipients

A bug requires us to accept a semicolon as a delimeter between recipients.
Fix the RecipientsEditor to handle both commas and delimeters as separators.
ms/ui/RecipientsEditor.java
fcee5ced94387a39cbae45b65113491a141f07ec 06-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20190

* changes:
Fix crash when sending SMS to email address
8b8512311239cfd2b086827a406de636c6f0e197 04-Aug-2009 Satish Roddom <satishroddom@motorola.com> Fix crash when sending SMS to email address

Must call ensureSlideshow() and syncTextToSlideshow(), otherwise in send()
function, variable "slideshow" will be NULL and results in force close.
ms/data/WorkingMessage.java
ce781a2d55d43ac6b6b6af9a399f6f9ca2145526 05-Aug-2009 Tom Taylor <tomtaylor@google.com> Move SMS->MMS limit to mms_config.xml

When a user types a long message, longer than a single SMS can handle, it
gets broken up into pieces and sent as several SMS's. Once the message is longer
than 3 SMS's, it gets converted to MMS. Move that threshold limit into mms_config.xml
so each operator can set the SMS to MMS limit for themselves.
ms/MmsConfig.java
ms/ui/ComposeMessageActivity.java
6c068773c218b800dc126008f50918ec219be196 05-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20158

* changes:
Send option not enabled after composing message with slides
b07ffb392946e167b9aedcb955ff9bb71b060349 05-Aug-2009 Tom Taylor <tomtaylor@google.com> Use new lock icon

Replace the old lock icon with the new asset.
ms/ui/MessageListItem.java
69cdbeb42c870826d5ae8caad87e644a82763226 04-Aug-2009 Satish Roddom <satishroddom@motorola.com> Send option not enabled after composing message with slides

Issue: Compose a slideshow (with 2 or more slides), and with some valid
destination address. Say done.

It is seen that the 'Send' button is not enabled. User has no way to send
a message with slides directly. It has to be saved in draft and opened.
And only then the 'Send' button is enabled.

Reason: When the done button is pressed, 'Send' button of the Attachment
editor is not enabled. Fixing this by updating the Send button.
ms/ui/ComposeMessageActivity.java
8f68b0ab5ea9d44f99226ad344dfa7e49f443f81 31-Jul-2009 Satish Roddom <satishroddom@motorola.com> Fix MMS outbox query

Query for the outbox was using hardcoded m_id which is incorrect. The correct
column name (Mms._ID) has now been used instead in accordance with the query
formation guidelines elsewhere.
ms/transaction/RetryScheduler.java
1c59b33adcdc15a035fce8bd37cd02cd063b4274 30-Jul-2009 Mark Wagner <mxw@google.com> avatar work
ms/data/Contact.java
ms/ui/ComposeMessageActivity.java
ms/util/ContactInfoCache.java
3b100dd8425ea38ea70c6d29ef0d85aa85482ae5 13-Jul-2009 Richard Meng <richard.meng@motorola.com> Handle SMS during CDMA emergency callback mode

If in emergency callback mode, user tries to send a message,
popup a notice provided by Phone pacakge (on change 309).
ms/ui/ComposeMessageActivity.java
f96423bc61528310b3db01930883d25e66866b99 03-Aug-2009 Tom Taylor <tomtaylor@google.com> Dismiss dialog

The monkey found a window leak. When a user chooses a smiley, the dialog
was going away but not getting officially dismissed.
ms/ui/ComposeMessageActivity.java
bccbfe8a16aa5b995589322dc250def59ddd4283 03-Aug-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
3a5d8c239410c14e993b1f4370ea304fb5719b13 31-Jul-2009 Amith Yamasani <yamasani@google.com> am 3f1a2ade: Fix #2021958: "next" doesn\'t work when composing message

Merge commit '3f1a2ade1338a719ceb0fff053951577a21ebec4'

* commit '3f1a2ade1338a719ceb0fff053951577a21ebec4':
Fix #2021958: "next" doesn't work when composing message
27d81162979aafd8a4d64e26bdfe3fc3abb4233c 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9222

* changes:
Don't show Anonymous as the MMS sender
52f854cbb75e8f9975c7e33216b828eb2f981095 30-Jul-2009 Tom Taylor <tomtaylor@google.com> Don't show Anonymous as the MMS sender

When the MMS app receives a message of type MESSAGE_TYPE_NOTIFICATION_IND = 0x82,
it tries to extract the sender out of the pdu headers. In the case of a particular
platform/provider, the sender header is not set. Until now, we'd fill in the sender
with "Anonymous". Eventually, another pdu arrives with the headers filled out and
the Anonymous is replaced with the real sender. The flashing is annoying, so just
let that field be empty.
ms/ui/MessageItem.java
5893069282b516db7da5e16eef051cd02508eb2a 30-Jul-2009 Tom Taylor <tomtaylor@google.com> Fix a notification bug.

Marking a conversation as read wasn't clearing the notification. The conversation's
cached "read" state didn't match that on disk because newly received messages don't
update the conversation's state. Now we always mark a conversation as read and
always update the notification state.
ms/data/Conversation.java
3f1a2ade1338a719ceb0fff053951577a21ebec4 30-Jul-2009 Amith Yamasani <yamasani@google.com> Fix #2021958: "next" doesn't work when composing message

Set the imeOptions attribute on the To field editor.
ms/ui/RecipientsEditor.java
560ec0a513f50a94b9f466f54d5aa4aecefabac3 29-Jul-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
baf7fec7d1a5b8d52ae7be04865f9e869742c261 27-Jul-2009 repo sync <dxn738@motorola.com> SMS to own number creates two threads and crashes

Send an SMS from a test phone to itself (say the number is 9243176013).
A thread gets created. But when this SMS gets received (of course from
the test phone itself), the number gets received as '09243176013'. And
one more thread is created. But in the conversation list, 2 threads are
shown with the same number (9243176013). When it is tried to add this
new conversation thread to the cache, it throws an Exception which is
not caught.

From this time onwards, everytime we launch Messaging, we keep getting
the Uncaught Exception, and the application closes.

To fix, in Conversation.java handled the exception by catching it from
wherever this function is called. In files Conversation.java and
SmsReceiverService.java did changes to consider 9243176013 and 09243176013
as a same 'from address', so that only one thread id gets created.
ms/data/Conversation.java
ms/transaction/SmsReceiverService.java
0d35c9dd276d09d00169f5b01a3dff81794928dd 17-Jul-2009 Satish Roddom <satishroddom@motorola.com> Fix the invalid destination issue.

The problem this change fixes is that phone did not prompt an error notice
when an MO MMS had an invalid destination address. The correct behavior is
that phone should show an error notice indicating the invalid destination
address.
ms/transaction/RetryScheduler.java
ms/util/DownloadManager.java
6436c745770f2a1f75df934ed3ca021666365dd6 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge korg/donut into korg/master
9c5e0566f91c7622a7cf9d53a6a84c56ed4139c1 23-Jul-2009 Tom Taylor <tomtaylor@google.com> Get protected content type

When we've got protected content, we must reach into
the drm object in order to get the actual content type.
In addition, the previous code was independently setting
the type and then the data of the intent. Both setType
and setData wipe out the other guy (by design). They both
have to be set at the same time for this to work.
ms/ui/MessageUtils.java
e64a39148677dfae433185af5a63f9a9f8687b48 23-Jul-2009 Tom Taylor <tomtaylor@google.com> Fix a monkey crasher

The monkey is apparently able to click an empty listitem
or one that gets deleted immedately after the click. Protect
a couple of methods from trying to build a conversation out
of an empty cursor. Bug 1995821.
ms/ui/ConversationList.java
d5107a1381ad70c6aa8e1cdc2edcf4b05001f0f3 23-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8236

* changes:
Fix a MMS crasher
5cbf11ad39767245f1a9ef467963d270f19a5fab 22-Jul-2009 Tom Taylor <tomtaylor@google.com> Fix a MMS crasher

This is the fix for bug 1975670, though if you read that bug, you'll swear it's
talking about a different one than my fix description which follows. When a user
receives a MMS with an attachment and goes into ComposeMessageActivity to read it,
a new WorkingMessage is created in case the user types a response. Once inside CMP,
the user may click on the attachment (to see the picture, etc.). Eventually, CMP's
onStop gets called. The WorkingMessage is empty so it is discarded. Once the user is
back in CMP, they're sitting on a time bomb with a discarded WorkingMessage. If they
try and delete the thread (the original bug), they'll get an exception that the working
message has already been deleted. This simple fix is to undelete the WorkingMessage
in onRestart.
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
6fb56eb953e7f1839aeb5ecaf9568e07d4b74d1b 22-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8238

* changes:
App change to support single segment wap push for MT MMS
604b2555f16c8f90dd083b326590ab4bd8526244 20-Jul-2009 Satish Roddom <satishroddom@motorola.com> App change to support single segment wap push for MT MMS
ms/MmsConfig.java
ms/transaction/RetrieveTransaction.java
ff6f8c7a9fb292996311ad24e4a5ab79fa5e557e 16-Jul-2009 Satish Roddom <satishroddom@motorola.com> Fix MMS expire issue - show toast and delete message
ms/util/DownloadManager.java
2ef055d733c84b93f5ac23bb177f6e2429d09f67 21-Jul-2009 James Dong <jdong@google.com> MediaPlayer.prepare() fails if the audio track in a media clip does not contain valid audio data

The reason is that no display surface is set before the prepare() call in MMS application and thus the
vidoe data path does not exist. As a result, only audio data path is verified internally at the framework
layer. If there is no valid audio data, prepare() simply fails (reasonable!)

This change contains a workaround for fixing this edge case in MMS application. A long-term solution
would be to look for the metadata information from the database established by application such as
Gallery and there is no need in MMS application to duplicate the effort.

bug 1935341
ms/model/MediaModel.java
f8470373c69d8ec1c89d0d533144eaf4b4dc5766 21-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8053

* changes:
Fix a wrong resource id
560cf61c66742e2134f42dc65681091127683c0c 21-Jul-2009 Tom Taylor <tomtaylor@google.com> Fix a wrong resource id

Fix a crasher where the wrong resource id was used and resulted in a null
text field. After looking up a contact and getting presence info, trying
to stuff the status into null didn't quite work.
ms/ui/ComposeMessageActivity.java
666769d3d2d2612d06ef6e4885c8458c72075150 21-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7960

* changes:
MMS Auto-delete prefs
53a1dc1c4fed88c20a3ce4c2d37c909dc1e469e2 21-Jul-2009 Tom Taylor <tomtaylor@google.com> MMS Auto-delete prefs

Update the UI prefs so the user can set the Mms and Sms auto-delete limits.
ms/MmsConfig.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/NumberPickerDialog.java
ms/util/Recycler.java
f0ae91b128d5a8529242c1d134e19cc8be6e0472 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7781

* changes:
New title bar for compose message activity (presence, etc)
ca90541d95becdc03a01f51d23c885dc635c0226 18-Jul-2009 Mark Wagner <mxw@google.com> New title bar for compose message activity (presence, etc)
ms/ui/ComposeMessageActivity.java
58e8a4a597d04209353d03e35087086f2f1365d5 18-Jul-2009 Tom Taylor <tomtaylor@google.com> Add an exception to catch a bug.

Bug 1898937 found an unusual circumstance where the original message was not null,
but after splitting the message, we're getting a message count of zero. Throw an
exception and log the original message. The UI normally doesn't allow an empty
message to be sent. Need to log this to track it down.
ms/transaction/SmsMessageSender.java
07ce1878a36d2df1707dd4bbd9cd7235679bdc94 16-Jul-2009 Tom Taylor <tomtaylor@google.com> Fix a problem with drafts

This is a fix for bug 1973603. If you go into SMS from contacts and create a draft
and in the meantime receive a message from that same contact, we'd crash in the
conversation cache trying to add the new conversation. This crash occured because
the draft conversation wasn't getting cleared out of the cache after thread was
deleted on disk. Since conversations in the cache are "equal" by recipients, the
incoming recipient matched the stale conversation in the cache. It gets even more
tricky. Bottom line: anytime a thread is deleted from the database, the equivalent
conversation has to be removed from the cache.
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/ConversationList.java
bc878528ed57d19bec31553cd75efaac1e0d3a5b 17-Jul-2009 Mark Wagner <mxw@google.com> search results to UI spec
ms/ui/MessageListItem.java
ms/ui/SearchActivity.java
07fd438290f18696092b00813ff1c57ac16fa81c 16-Jul-2009 Tom Taylor <tomtaylor@google.com> Add optional recipient limits

Feature request 1932398 : limit the max number of SMS recipients to 10.
Fixed by adding a config value to mms_config.xml that lets a carrier specify
a limit to the number of recipients. The default, as checked into master here,
is no limit.
ms/MmsConfig.java
ms/ui/ComposeMessageActivity.java
4a4397d5d9bf7c2e3f987c3fa41772fb969fdb5d 15-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7423

* changes:
Sms Draft issue fix.
338855e07bb9c998705d4e6680f696888ca3d0e5 15-Jul-2009 Tom Taylor <tomtaylor@google.com> Read a long instead of an int Thread ID

Bug 1973603 is throwing an exception when adding a new conversation. Immediately
before, the code checks to see if the conversation exists, by thread id, and if
not, creates and adds the new conversation. I'm not able to duplicate the bug,
but found a problem where we're reading the threadid as an int, rather than a long.
Also added the threadid to the exception so we'll be able to look at the database.
ms/data/Conversation.java
08a7e5fc3b213e7a89d2e31cf86d6fb0ffee197f 13-Jul-2009 Kavya H N <dxn738@motorola.com> Sms Draft issue fix.

The issue this change fixes is:
1. Compose an SMS to a contact and press back to save as draft
2. open draft again
3. Receive an SMS from the same contact.
4. drag down status bar and open SMS
5. "The application Messaging (process com.android.mms) has stopped
unexpectedly. Please try again."
ms/data/WorkingMessage.java
28433bd3a11e22e8ec9383053b74a7eb6454b463 15-Jul-2009 Tom Taylor <tomtaylor@google.com> Port a change from donut to master

Port a change from donut to limit the size of a video attachment
based on the size of the current message.
ms/ui/ComposeMessageActivity.java
4da6513065fbcfbf7fee9a18176ce62d2f62c825 24-Jun-2009 Yong Liu <yong.liu@motorola.com> Display Mode 00 for CDMA Messaging

The Message Display Mode subparameter is used to indicate to the mobile
station when to display the received message.

The Message Display Mode subparameter can take on the following parameters:

'00': Immediate Display: The mobile station is to display the received
message as soon as possible.
'01': Mobile default setting: The mobile station is to display the received
message based on a pre-defined mode in the mobile station.
'10': User Invoke: The mobile station is to display the received message
based on the mode selected by the user.
'11': Reserved

So when phone receives SMS with display mode 00, the message has to be displayed
immediately. The current android code supports Display mode 00 but it does not
give the additional requirements. User has choice to save it or discard it after
reading. If the user doesn't respond in 5 minutes, the message will be saved to
the database automatically.
ms/transaction/SmsReceiverService.java
ms/ui/ClassZeroActivity.java
5bdedada04dd261f406f55161b16e73a0ce61d55 08-Jul-2009 Wu-cheng Li <wuchengli@google.com> Specify video capture size limit. do not merge

Fix b1660028.
ms/ui/ComposeMessageActivity.java
cea16acf02be8943133bc5048b1d64286bfef1d8 07-Jul-2009 Satish Roddom <satishroddom@motorola.com> SMS-to-email improvements

MO SMS: When a message is sent to email address, if length
of any of the entered email address + message body
is greater than 160, send it as MMS. Otherwise send
it as SMS

MT SMS: When a message is received from Email gateway, from
the message body, extract the first word and treat
as "From" address and rest as actual "message text".
ms/MmsConfig.java
ms/data/WorkingMessage.java
ms/transaction/SmsMessageSender.java
9ebc85c812d3c6c6ed6cec13d9cd72a452049560 08-Jul-2009 Tom Taylor <tomtaylor@google.com> Log the message state when throwing an exception.

The monkey is able to generate a situation where we're coming into
ComposeMessageActivity thinking we've got an MMS message, based on
the message flags, but the attachment flags indicate the MMS message
hasn't been initialized. Log the message state so next time this happens,
we can track down the source of the problem.
ms/ui/ComposeMessageActivity.java
9c9cedd75f5490a99a03060335aaf3f89c6a4313 06-Jul-2009 Wei Huang <weih@google.com> fix a bug found by Motorola team. Make sure we show the toast for the unknown error.
ms/ui/ComposeMessageActivity.java
2715f316d9fda69d8fe022fddbf6627ba0b18fc1 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6233

* changes:
Changes to stop locked messages from getting deleted
4e6a0b30702f89bf805e0a8ffeb2f85e1d24fcca 06-Jul-2009 Tom Taylor <tomtaylor@google.com> am 437cfcb3: Fix bug 1954381: MMS crashes in zaku build of donut.

Merge commit '437cfcb32630fb28ca6aa8f90b673d8068627bd1'

* commit '437cfcb32630fb28ca6aa8f90b673d8068627bd1':
Fix bug 1954381: MMS crashes in zaku build of donut.
d0480376fabb519abb703acb42209d2e0d9dfa7a 24-Jun-2009 Madhav B <ridhishguhan@motorola.com> Changes to stop locked messages from getting deleted

Specific list of changes that are made as a part of this patch are:
1. When a user tries to delete a locked message.
The locked message doesn't gets deleted and it pops a toast
that locked messages cannot be deleted.
2. When a user tries to delete a thread containing locked messages.
Only the unlocked messages present in the same thread are getting
deleted. The locked message which are part of the thread are not
deleted.
ms/data/Conversation.java
ms/ui/ComposeMessageActivity.java
437cfcb32630fb28ca6aa8f90b673d8068627bd1 02-Jul-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1954381: MMS crashes in zaku build of donut.

If MMS is disable in mms_config.xml, don't require a valid UAProf url.
Tested various config settings to make sure it works.
ms/MmsConfig.java
2928434df4e363838e9af131c4a1f4319c03ab54 02-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5969

* changes:
Fix bug 1929981 - Monkey bug situation.
8074e71a4cdf1a8548743e38155f1bcea04d05fe 01-Jul-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1929981 - Monkey bug situation.

The monkey found and/or generated a situation where there's a contact
with an empty number. Prevent the empty number from poisoning the recipient
list downstream.
ms/data/RecipientIdCache.java
bdf926782d291baf6f6b96dd71ad883deb77582f 24-Jun-2009 Madhav B <guhanridhish@motorola.com> Stop the smilPlayer as soon as Back or Menu buttons are pressed

Fix the usecase where a user receives a 3gp file from MMS and plays it.
After it starts playing, if the user presses a back button, the user
observes a black box on top of message menu upto size of video Attachment.
With this fix user no longer sees any black box on top of message menu.
ms/ui/SlideshowActivity.java
3b3d9ba082ee58fe2d408890ec3cbeee846e57ff 01-Jul-2009 Wei Huang <weih@google.com> fix Mms app to not crash due to (optional) missing MMS settings in the overlay mms_config.xml files
ms/MmsConfig.java
c2123b96dbe850aa5d752940245fc804523a299c 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5715

* changes:
Additional customization options for mms http transport.
89e7af1acc0b62f2822ace8df6d56f4c6d37a40f 20-Jun-2009 Christian Gustafsson <qmfd78@motorola.com> Additional customization options for mms http transport.

Modified the MMS http transport and configuration to allow for more settings.
This is needed for CDMA carriers.

1. UserAgent needs to be modifiable. Most MMSC on the CDMA side will use
the user agent name as the device identification to invoke the right
transcoder settings.
2. The tag name for the UAProfUrl is not the same for all carriers.
Instead of "x-wap-profile" they might require "Profile".
3. There are additional http parameters required some with the users phone
number. For example:
x-up-calling-line-id: 15555550000
where 15555550000 would the users telephone number. Since these
parameters vary wildly from carrier to carrier the code was written to
be flexible. All additional parameters can be added to a single string
in the mms_config.xml file. They are separated by '|'. The substitution
string for the users phone number is also flexible to avoid a carrier
parameter clash. Example:
<string name="httpParams">x-up-calling-line-id: UserNumerGoesHere</string>
<string name="httpParamsLine1Key">UserNumerGoesHere</string>
If the users number happens to be 15555550000 then at runtime a
x-up-calling-line-id: 15555550000
would appear in the http transactions with the MMSC.
Additional parameters can be added:
<string name="httpParams">x-up-calling-line-id:#LINE1#|x-iot-pass-date: 20001122</string>
<string name="httpParamsLine1Key">#LINE1#</string>
In this case two additional parameters would be added to the http transaction:
x-up-calling-line-id: 15555550000
x-iot-pass-date: 20001122
ms/MmsConfig.java
ms/transaction/HttpUtils.java
926da0d5c27e8d0e4246ea975c2226b83a81a5d3 29-Jun-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1930462: Draft message disappears in Conversation List when editing a draft.

When a user creates a draft and then backs out, a thread is created for the draft. When
the user re-edits the draft, the thread is deleted after loading the conversation. When
the user backs out again, we still have a valid threadId (but no actual thread) and the
message is saved without a corresponding thread. The fix is simple. When the thread is
deleted, the threadId has to be reset in the Conversation to match. Then when the user backs
out again (or in any other code path, e.g. send), the thread will get created.
ms/data/Conversation.java
ms/data/WorkingMessage.java
d808dd7a449839282d13426d353b7007122ddb64 25-Jun-2009 Mark Wagner <mxw@google.com> two changes: remove the color from the text highlighting in the snippet
for search results. we now rely on bold only.

second: add an "empty view" to the search results so that we don't get
an empty screen when there are no matches.
ms/ui/SearchActivity.java
f06d26b3491ea4708e8e1b8214f2ef1cf9d4575b 20-Jun-2009 Mark Wagner <mxw@google.com> mods to support searching of mms messages
ms/ui/SearchActivity.java
81c7152ef1638673d215e36a126b4bf8db236abe 16-Jun-2009 Mark Wagner <mxw@google.com> Don't use synchronous Contact lookup since it could be slow.
ms/ui/SearchActivity.java
82f5492b211f51e71c7089eb7779384ff03c0d89 15-Jun-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1691499: MMS constantly stopping.

What was happening was MmsSystemEventReceiver was registered for any connection
state changes in the AndroidManifest. On a connection state change, MmsSystemEventReceiver
would startup the TransactionService. The TransactionService would check its queue and if
there wasn't anything to do, would stop itself. Apparently on the MV campus, there exists
a situation that causes the phone to switch between connections, causing the CONNECTION
STATE CHANGED intent to be sent out frequently and hence, lots of starting and stopping of
the TransactionService even when it has nothing to do. With this change, the MmsSystemEventReceiver
no longer registers for that intent in the AndroidManifest. That event receiver is still
needed in the manifest because it registers for boot completed events. Meanwhile, the TransactionService
keeps another MmsSystemEventReceiver. When the TransactionService has a transaction to
process, but there's no connectivity, it enables the MmsSystemEventReceiver to
listen for connectivity changes. Whenever the TransactionService completes its work, it
unregisters the MmsSystemEventReceiver so it no longer responds to connection changes.
I added test code to TransactionService so I could simulate no connection and test that
the MmsSystemEventReceiver registers for connection changes and then appropriately starts
up the TransactionService. I left the test code in place, but it is disabled.
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/TransactionService.java
331864544ec51ba6807fc5471cc6d537b7fef198 08-Jun-2009 Mark Wagner <mxw@google.com> add search capability
ms/SuggestionsProvider.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ManageSimMessages.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/SearchActivity.java
8fe0dc7bde259488a917f3c246a5020b992cfe8a 12-Jun-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1786333: "Add to Contact" options is displayed for a recipient in Contact list - recipient is a STK response

Don't show the "Add to contacts" menu for contacts that have names or numbers beginning with *, %, or $.
ms/ui/ComposeMessageActivity.java
e24e5684d04e7f6337bc90377422f84fcf2b1f0d 11-Jun-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1909820 - Modifying Contact name does not allow to send SMS/MMS.

The real problem in eclair was the recipient editor wasn't getting loaded
with the contact. Once that was fixed, modifying the contact name (the
original bug) seemed to be no problem.
ms/ui/ComposeMessageActivity.java
458dea8d1858e418b6918f477d0139335b14ff45 10-Jun-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1808964 - Remove presence polling.

Register a content observer to listen for presence changes and immediately update the
presence state of the header of the ComposeMessageActivity.
ms/data/Contact.java
ms/ui/ComposeMessageActivity.java
bbb630b93bb63ee28ec7aa32a47412d6d8d9d280 08-Jun-2009 Tom Taylor <tomtaylor@google.com> Do not merge. Fix bug 1635579 - Make build system configure UAProf.

Don't rely on GConfig anymore for various settings. Instead, grab
them out of mms_config.xml.
ms/MmsApp.java
ms/MmsConfig.java
ms/model/CarrierContentRestriction.java
ms/transaction/HttpUtils.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
95817b166d415114bac89ca0946c3717ae229526 06-Jun-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1794914: Message not downloaded notification leads to "compose message" UI.

With this change, the thread id gets correctly passed in extras so ComposeMessageActivity
knows to load the thread. Also, added code to be able to detect and dismiss the notification.
Otherwise, the notification would stay up forever.
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
48e2ed5031f9812b25dbb0de9957f45a6c27a933 08-Jun-2009 Colin Godsey <crgodsey@gmail.com> Refer to change: #10240.
Adds context option to a contact listed in the Mms thread list to send a IM if they have a current presense.
ms/ui/ConversationList.java
23da10700b189ccca64b8e729631763572a0f15f 05-Jun-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1895010 - Need to delete excess messages by single thread, rather than processing all threads.

This change calls the recycler with a specific thread id when sending or receiving a sms or mms message.
ms/data/WorkingMessage.java
ms/transaction/NotificationTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
440071bb40c9c7bac5870a8bb3110edbe665c702 04-Jun-2009 Tom Taylor <tomtaylor@google.com> Add initial UI to lock/unlock a message to prevent the message from being deleted.

First cut at the UI to allow a user to lock (or unlock) a message and prevent it
from being automatically deleted by the recycler.
ms/ui/ComposeMessageActivity.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/util/Recycler.java
f170b99e745c6794123049641759a5199fc07cc4 03-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2824

* changes:
Checkpoint work on MMS/SMS Recycler
3239889e9a417617b755d4cde22070843e5c070b 01-Jun-2009 Tom Taylor <tomtaylor@google.com> Checkpoint work on MMS/SMS Recycler

A user can enable a setting to limit the number of saved messages
per thread. Eventually, UI will allow a user to lock a message and
prevent it from getting automatically deleted when hitting the limit
of saved messages. Work to do includes adding a saved column to the
sms and pdu tables and then implementing the UI to modify/view the
lock per message.
ms/data/WorkingMessage.java
ms/transaction/RetrieveTransaction.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
ms/ui/MessagingPreferenceActivity.java
ms/util/Recycler.java
71bbae69cee0da902032743d0702e283cfe31504 28-May-2009 Ficus Kirkpatrick <ficus@android.com> Fix a race condition in Conversation.get().

Missed entering a monitor on the cache when doing a get-or-create
operation.

Also remove a bunch of trailing whitespace and some dead code.
ms/data/Conversation.java
ms/ui/ConversationList.java
33a87f96f8c625aa10131a77a3968c97c4ec5a62 27-May-2009 Ficus Kirkpatrick <ficus@android.com> Remove all references to ContactInfoCache except those in Contact.

This is in preparation for moving the database logic from ContactInfoCache
into Contact and removing the old cache.
ms/data/Contact.java
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/DeliveryReportListItem.java
ms/ui/MessageItem.java
ms/util/DownloadManager.java
20b79e068c8aebff46f24fd3803cf7697df4eac4 27-May-2009 Ficus Kirkpatrick <ficus@android.com> Remove RecipientList, whose functionality has been subsumed by ContactList.
ms/data/Contact.java
ms/ui/ConversationList.java
ms/ui/DeliveryReportActivity.java
ms/ui/RecipientList.java
ms/ui/RecipientsAdapter.java
ms/util/ContactInfoCache.java
1d98ae0b203e01034ddead4214d1520ce863a23b 22-May-2009 Ficus Kirkpatrick <ficus@android.com> New data model for contact information.
ms/MmsApp.java
ms/data/Contact.java
ms/data/ContactList.java
ms/data/Conversation.java
ms/data/RecipientIdCache.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/RecipientsEditor.java
ms/util/TaskStack.java
86a1cf79bf92dbb2b9d09431379bff6de83c2581 19-May-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1635579 - Make build system configure UAProf.

Don't rely on GConfig anymore for various settings. Instead, grab
them out of mms_config.xml.
ms/MmsApp.java
ms/MmsConfig.java
ms/model/CarrierContentRestriction.java
ms/transaction/HttpUtils.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
e1e172449187ff90b191fb4296798dd74d210be2 18-May-2009 Daisuke Miyakawa <dmiyakawa@google.com> Hand merge from cupcake_dcm to donut, part 3.

Modify VCardManager so that it uses the latest vCard importer code.

This Change MUST be comitted with #1853 and #1854.
ms/activity/VCardManager.java
d756a17492d468544d5544c61a1a96cc2db9c95b 12-May-2009 Eric Fischer <enf@google.com> am 0a9c474: Let translators reformat the "Name: " prefix of MMS messages

Merge commit '0a9c47474e4b08aa5cd7f61da0b7135efb0ea624'

* commit '0a9c47474e4b08aa5cd7f61da0b7135efb0ea624':
Let translators reformat the "Name: " prefix of MMS messages.
0a9c47474e4b08aa5cd7f61da0b7135efb0ea624 12-May-2009 Eric Fischer <enf@google.com> Let translators reformat the "Name: " prefix of MMS messages.

Move it to a resource string so that there can be a space before
the colon in French.
ms/ui/MessageListItem.java
3882a23e3ac0a8ef39853e16b79e8ec17c4bb3db 06-May-2009 Ficus Kirkpatrick <ficus@android.com> Handle loadFromUri() with an empty slideshow by reverting to SMS.
ms/data/WorkingMessage.java
70c73e05a792832aa28da751cdaf3fa83a7b8113 23-Apr-2009 Ficus Kirkpatrick <ficus@android.com> Begin moving all conversation data behind a data model with a cache.

Remove some unused code like the stale concept of "common threads" vs.
"broadcast threads", old references to search, etc.
ms/MmsApp.java
ms/data/Conversation.java
ms/transaction/MessagingNotification.java
ms/transaction/SmsMessageSender.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/ManageSimMessages.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
ms/util/DraftCache.java
7a1ec433282b1c9aa2e6e144d8ed126fb5a6942d 24-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/donut'
cb5481d8b2a15ba206520b76a48bca140bc9efdc 22-Apr-2009 Tom Taylor <tomtaylor@google.com> Fix bug 1734302: Auto refresh of Contact names fails.

Need to invalidate the id->address cache in the adapter when a contact
changes. The old phone URI registered with the content resolver didn't
seem to be the right one. The observer's onChange never got called when
adding/deleting/changing a contact. I changed the uri to People.CONTENT_URI
and now onChange is getting called appropriately. Could this account for
missing presence updates?
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
48da875f1beea835c6771977e5bd8a9aa3d4bc10 13-Apr-2009 Tom Taylor <tomtaylor@google.com> Begin adding UI unit tests to the Mms app.

Start with a couple preliminary tests and go through the GIT workflow.
ms/ui/ConversationList.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
e995b84b783c4a430bf3899372a337cc9c896b38 17-Apr-2009 Ficus Kirkpatrick <ficus@android.com> Scrub the MMS app for dead code.
ms/AttachImage.java
ms/ContentClassException.java
ms/ExceedMessageSizeException.java
ms/ResolutionException.java
ms/UnsupportContentTypeException.java
ms/activity/VCalManager.java
ms/activity/VCardManager.java
ms/drm/DrmWrapper.java
ms/model/LayoutModel.java
ms/model/MediaModel.java
ms/transaction/AbstractRetryScheme.java
ms/transaction/DefaultRetryScheme.java
ms/transaction/MessagingNotification.java
ms/transaction/RetryScheduler.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionBundle.java
ms/transaction/TransactionService.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/EditSlideTextActivity.java
ms/ui/MessageListAdapter.java
ms/ui/MessageUtils.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/Presenter.java
ms/ui/RecipientList.java
ms/util/AddressUtils.java
7a3c48efdf16bf9991a80107e5f5252a8d1f6ff3 17-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 236

* changes:
Stop requiring a Context to be passed in to ContactInfoCache.
3d0bd7dafa7543b24f0c0e12f297b46d8c7d9f37 17-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 204

* changes:
Add a new Conversation class for protecting access to conversations/threads.
2dff2402b7c2c968f3cf70e1737780fe25dc2b03 16-Apr-2009 Eric Fischer <> Merge branch 'readonly-p4-master'
61e0021ad3abc1a18db1cf0acfe30ba18913c9c9 16-Apr-2009 Eric Fischer <> AI 146499: am: CL 145984 am: CL 145927 Move hardcoded strings to resources.
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146499
ms/ui/SlideshowEditActivity.java
66dde9460badebf8e740275cabde9cca256006eb 16-Apr-2009 Ficus Kirkpatrick <ficus@android.com> Stop requiring a Context to be passed in to ContactInfoCache.

It already has a perfectly good one sitting around in its instance.
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/DeliveryReportListItem.java
ms/ui/MessageItem.java
ms/ui/RecipientList.java
ms/ui/RecipientsEditor.java
ms/util/ContactInfoCache.java
ms/util/DownloadManager.java
ab6141d9c98f1a6024fac52fe3c897076d8549c0 16-Apr-2009 Ficus Kirkpatrick <ficus@android.com> Add a new Conversation class for protecting access to conversations/threads.
ms/data/Conversation.java
ms/data/WorkingMessage.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
753fa8f69e1b66bcd601a459b0f6558d09902556 15-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
17688d9a397234f35ba5519e46135ea268ed6d89 14-Apr-2009 Ficus Kirkpatrick <ficus@android.com> Just insert new drafts to update them instead of querying first.

Now that SmsProvider guarantees per-thread uniqueness of drafts,
we don't have to query first to find out whether we should insert
or replace.
ms/data/WorkingMessage.java
3315c60d8928d315e1a7e5f85dbcbe6378513587 14-Apr-2009 Eric Fischer <> AI 145984: am: CL 145927 Move hardcoded strings to resources.
Original author: enf
Merged from: //branches/cupcake/...

Automated import of CL 145984
ms/ui/SlideshowEditActivity.java
aca0e6f980de850170478d04dc329554b66cc7b5 14-Apr-2009 Patrick Scott <> Merge branch 'readonly-p4-master'
f08cd04f658ad56f90df92c0eafb42248e8596bf 14-Apr-2009 Patrick Scott <> AI 146016: am: CL 145907 Add the application id to the intent when launching the Browser to reuse
the same tab.
Original author: phanna

Automated import of CL 146016
ms/ui/MessageListItem.java
b2e7bded736c257f43a73e63b3d89484b7134a5d 13-Apr-2009 Eric Fischer <> AI 145927: Move hardcoded strings to resources.
BUG=1779145

Automated import of CL 145927
ms/ui/SlideshowEditActivity.java
b9bcfdd226bbb6f5b265f925343375192963d58a 11-Apr-2009 Ficus Kirkpatrick <ficus@android.com> Move in-progress message state out of ComposeMessageActivity and into its own class.
ms/data/WorkingMessage.java
ms/ui/AttachmentEditor.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideshowEditActivity.java
e21ef6774e610a1411a7989feae7025f4f5c87af 13-Apr-2009 Patrick Scott <> AI 145907: Add the application id to the intent when launching the Browser to reuse
the same tab.
BUG=1462695

Automated import of CL 145907
ms/ui/MessageListItem.java
1fb69582c74e87174114e185fa9af110887766f4 09-Apr-2009 Tom Taylor <> AI 145459: am: CL 145075 Fix bug: 1774564 - [Top10-VF-10667] "Name" field gets clobbered when adding phone # or e-mail address to existing contact from SMS app.
When creating the intent to Add a contact, we'd pass the number or email for the name in the intent, so the name field would get filled
in when the user chose "Add contact" in Contacts. Unfortunately, that had the unintended side-effect of replacing the name when a user
chose to associate the SMS/MMS info with an existing contact. With this simple change, the code no longer tries to pre-populate the
contact name.
Original author: tomtaylor
Merged from: //branches/cupcake/...

Automated import of CL 145459
ms/ui/ConversationList.java
955c0f019e90703bae311f31af18631764a8ba60 09-Apr-2009 Tom Taylor <> AI 145481: am: CL 145459 am: CL 145075 Fix bug: 1774564 - [Top10-VF-10667] "Name" field gets clobbered when adding phone # or e-mail address to existing contact from SMS app.
When creating the intent to Add a contact, we'd pass the number or email for the name in the intent, so the name field would get filled
in when the user chose "Add contact" in Contacts. Unfortunately, that had the unintended side-effect of replacing the name when a user
chose to associate the SMS/MMS info with an existing contact. With this simple change, the code no longer tries to pre-populate the
contact name.
Original author: tomtaylor
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 145481
ms/ui/ConversationList.java
c9cd9f4a9c2db0590d4ae8f64d10f4dd441ed332 08-Apr-2009 Tom Taylor <> AI 145075: Fix bug: 1774564 - [Top10-VF-10667] "Name" field gets clobbered when adding phone # or e-mail address to existing contact from SMS app.
When creating the intent to Add a contact, we'd pass the number or email for the name in the intent, so the name field would get filled
in when the user chose "Add contact" in Contacts. Unfortunately, that had the unintended side-effect of replacing the name when a user
chose to associate the SMS/MMS info with an existing contact. With this simple change, the code no longer tries to pre-populate the
contact name.
BUG=1774564

Automated import of CL 145075
ms/ui/ConversationList.java
37321876549776417f035118f157d9531f73de6b 02-Apr-2009 Wink Saville <> AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Automated import of CL 144245
ms/transaction/MessageStatusReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiverService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ManageSimMessages.java
4bc4156cff14034f49ea89b9dd879bddeec6b363 02-Apr-2009 Wink Saville <> AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185
ms/transaction/MessageStatusReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiverService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ManageSimMessages.java
4a289bdc49453d22851ce7a46a893604536a539d 31-Mar-2009 Tom Taylor <> AI 143834: Fix bug: 1716138 - Editing recipient filed restores the old recipient number code.
Implemented a suggestion from enf:
If the user is in the middle of editing an existing recipient, don't offer the
auto-complete menu. Without this, when the user selects an auto-complete menu item,
it will get added to the list of recipients so we end up with the old before-editing
recipient and the new post-editing recipient. As a precedent, gmail does not show
the auto-complete menu when editing an existing recipient.
BUG=1716138

Automated import of CL 143834
ms/ui/RecipientsEditor.java
c008bb042ed68d3b68e1e37730f9fa4ea69e00bc 28-Mar-2009 Ficus Kirkpatrick <> AI 143362: am: CL 143211 am: CL 143007 When discarding an MMS message, also delete any associated SMS drafts.
This will keep intermediate anonymous drafts created in the process of switching
activities (e.g. to attach a picture) from being left behind.
Original author: ficus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143362
ms/ui/ComposeMessageActivity.java
27c3ed4432d0acc92919aabd269b115f54a42268 28-Mar-2009 Ficus Kirkpatrick <> AI 143353: am: CL 143202 am: CL 142984 Don't cancel failed message notifications from ConversationList.
They will (and should only be) cancelled from ComposeMessageActivity
when the failed message has been reviewed by the user.
Original author: ficus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143353
ms/ui/ConversationList.java
86bcfc0a48ee7baf6a9221711bce071a2b7f3caf 28-Mar-2009 Ficus Kirkpatrick <> AI 143352: am: CL 143201 am: CL 142983 Bail out early from saveDraft() if we have already discarded a message to keep from
creating a bogus thread.
Original author: ficus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143352
ms/ui/ComposeMessageActivity.java
810fae756f4d2db00b35d7c9dfead252737abdac 28-Mar-2009 Tom Taylor <> AI 143330: am: CL 143180 am: CL 142923 Fix bug: 1730901 - Unread notification takes me to the wrong thread.
When a user selected a notification for a specific message failure, the intent sent to
ComposeMessageActivity was sometimes a previous intent and the wrong message thread
would be displayed. We needed to set a flag in PendingIntent so the intent we passed
in would replace any previous one. Hard to find. Easy to fix.
Original author: tomtaylor
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143330
ms/transaction/MessagingNotification.java
227c061247fb53150330a1c11bc163881def7ef6 28-Mar-2009 Ficus Kirkpatrick <> AI 143211: am: CL 143007 When discarding an MMS message, also delete any associated SMS drafts.
This will keep intermediate anonymous drafts created in the process of switching
activities (e.g. to attach a picture) from being left behind.
Original author: ficus
Merged from: //branches/cupcake/...

Automated import of CL 143211
ms/ui/ComposeMessageActivity.java
59cd1f499645badf8df9e2820b29d28fc1835e79 28-Mar-2009 Ficus Kirkpatrick <> AI 143325: am: CL 143175 am: CL 142882 Rework the way ConversationList interacts with its adapter.
Stop caching its cursor, stop making an entirely new adapter with every query. Hopefully
fixes the long-lurking HeaderViewListAdapter crash.
Original author: ficus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143325
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
598ca14f5d7d26d6d5125d8fe0d07e50f066ff98 28-Mar-2009 Ficus Kirkpatrick <> AI 143315: am: CL 143166 am: CL 142862 Allow anonymous (recipientless) draft messages to be saved when we have no choice but to
either save the message or throw it out and can't give the user a choice with a dialog.
More aggressive refresh of draft cache to catch cases where the thread ID may have changed.
Avoid losing track of proper MMS state in image attachment add failure on resize.
Original author: ficus
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143315
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/util/DraftCache.java
2d11976c7fad88534b1a255959b4a128b04ebac0 28-Mar-2009 Ficus Kirkpatrick <> AI 143202: am: CL 142984 Don't cancel failed message notifications from ConversationList.
They will (and should only be) cancelled from ComposeMessageActivity
when the failed message has been reviewed by the user.
Original author: ficus
Merged from: //branches/cupcake/...

Automated import of CL 143202
ms/ui/ConversationList.java
e814e69c5e135eb3f50723865bed1df3de15a8fc 28-Mar-2009 Jean-Baptiste Queru <> AI 143296: Merge from donut Change 143147

Automated import of CL 143296
ms/util/SmileyParser.java
23406dbb9d9a15c56b995d99f1dfa5d933db05b4 28-Mar-2009 Ficus Kirkpatrick <> AI 143201: am: CL 142983 Bail out early from saveDraft() if we have already discarded a message to keep from
creating a bogus thread.
Original author: ficus
Merged from: //branches/cupcake/...

Automated import of CL 143201
ms/ui/ComposeMessageActivity.java
b0e1b6b529e9aaaca69b48d721bf06f8a4c3aa76 28-Mar-2009 Tom Taylor <> AI 143180: am: CL 142923 Fix bug: 1730901 - Unread notification takes me to the wrong thread.
When a user selected a notification for a specific message failure, the intent sent to
ComposeMessageActivity was sometimes a previous intent and the wrong message thread
would be displayed. We needed to set a flag in PendingIntent so the intent we passed
in would replace any previous one. Hard to find. Easy to fix.
Original author: tomtaylor
Merged from: //branches/cupcake/...

Automated import of CL 143180
ms/transaction/MessagingNotification.java
42f7c6a5988dcce8250b552b42feb2ec23fb9c3e 28-Mar-2009 Ficus Kirkpatrick <> AI 143175: am: CL 142882 Rework the way ConversationList interacts with its adapter.
Stop caching its cursor, stop making an entirely new adapter with every query. Hopefully
fixes the long-lurking HeaderViewListAdapter crash.
Original author: ficus
Merged from: //branches/cupcake/...

Automated import of CL 143175
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
76c89496956e33cd111cb0eaf5fe131a1b542d1a 27-Mar-2009 Ficus Kirkpatrick <> AI 143166: am: CL 142862 Allow anonymous (recipientless) draft messages to be saved when we have no choice but to
either save the message or throw it out and can't give the user a choice with a dialog.
More aggressive refresh of draft cache to catch cases where the thread ID may have changed.
Avoid losing track of proper MMS state in image attachment add failure on resize.
Original author: ficus
Merged from: //branches/cupcake/...

Automated import of CL 143166
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/util/DraftCache.java
a45b64baaddd0ce760d6b3605dcd31a24a17c8a4 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
34cb61d231155e7cf8886fcefb7dba92ec0da5c3 27-Mar-2009 Dianne Hackborn <> AI 143147: Manual integration

Automated import of CL 143147
ms/util/SmileyParser.java
e1d70c5dfec35f894ebdb77f6dc708d3771dcdf6 27-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@143007,143007
ms/ui/ComposeMessageActivity.java
4a9a981a4b1f4f4b4aa4125e2f2318b52015388b 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142984,142984
ms/ui/ConversationList.java
99d9049914903bbbbe3fffbeaa39b887c62d6fd1 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142983,142983
ms/ui/ComposeMessageActivity.java
3977ee5f77396df57468d93610d9385f72ea278f 26-Mar-2009 Tom Taylor <> Automated import from //branches/cupcake/...@142923,142923
ms/transaction/MessagingNotification.java
400710746f46028e6a7486be3453a94cd3a140ee 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142882,142882
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
04671afee958ba54ece19b9b5c97827cecd3ecf0 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142862,142862
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/util/DraftCache.java
950e3c67325eb5030cb713a57fdf754033ee166c 26-Mar-2009 Dianne Hackborn <> Automated import from //branches/cupcake/...@142829,142829
ms/util/SmileyParser.java
d49a5ae921cc531faec9530896ae9e0a5f3bfe66 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142724,142724
ms/ui/AttachmentEditor.java
ms/ui/ComposeMessageActivity.java
5914a6b8293c0e1d063b84a4fc3f5853383932b3 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142715,142715
ms/transaction/MessagingNotification.java
0cabf65c0474c30f3c711ca661283206924365ff 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142706,142706
ms/ui/ConversationList.java
ms/util/DraftCache.java
71cf4b0b2901590fffd04c7cdeba8d1c05c4c214 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142768,142768
ms/ui/AttachmentEditor.java
ms/ui/ComposeMessageActivity.java
ce10738e05b3d51d00999b34995586eafc167ae5 26-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@142705,142705
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
c0c78f771e7ce097103241c0da02959319b58709 26-Mar-2009 Ye Wen <> Automated import from //branches/donutburger/...@142704,142704
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
b11a5086727c4b67c72ca605771fb37e12dcf803 26-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142753,142753
ms/transaction/MessagingNotification.java
b530437ceaad97151be691067191f48e1e93b87e 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142742,142742
ms/ui/ConversationList.java
ms/util/DraftCache.java
19be5b3fbe66749f6bc030c9776936b0602ed62f 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@142741,142741
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
4522cafe21816d43626b8ac42e1c5d3667212a97 25-Mar-2009 Ye Wen <> Automated import from //branches/master/...@142740,142740
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
5afe62a7cc4493b4c6918188ee6301958b67d289 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142653,142653
ms/ui/AttachmentEditor.java
ms/ui/ComposeMessageActivity.java
e708a9766a27ca5e12a04735695be89109ded8d8 25-Mar-2009 Daisuke Miyakawa <> Automated import from //branches/master/...@142673,142673
ms/activity/VCardManager.java
11e40684ed6c2c2fff5990ff5ccd0a5d775189b9 25-Mar-2009 Wei Huang <> Automated import from //branches/master/...@142672,142672
ms/ui/ComposeMessageActivity.java
d63344421b131e7bd44d25f5c5914400e7cc7f93 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142616,142616
ms/transaction/MessagingNotification.java
124a74faecff61ff567cac4a9024b4978876b0f8 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142573,142573
ms/ui/ConversationList.java
ms/util/DraftCache.java
6373da7b56ee6b90feeb98224787f918a05747bf 25-Mar-2009 Tom Taylor <> Automated import from //branches/cupcake/...@142572,142572
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
7580049218496620a9503637e7cea50a1b4e9d5e 25-Mar-2009 Ye Wen <> Automated import from //branches/cupcake/...@142565,142565
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
89562ed725e2345742402aee4fe3358b437bf866 25-Mar-2009 Daisuke Miyakawa <> Automated import from //branches/donutburger/...@142509,142509
ms/activity/VCardManager.java
d56917ab5c0beb4cca782973bc2e4631b82a3d50 25-Mar-2009 Wei Huang <> Automated import from //branches/donutburger/...@142505,142505
ms/ui/ComposeMessageActivity.java
3d2107af884e95720b72201e99d9ab4bce9bba3b 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@142400,142400
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
34390cc77dd159b3aec558e26d4fb0674104dae4 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142388,142388
ms/ui/ComposeMessageActivity.java
629b0f7b26a2abd77aab65fa6298321189730a92 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@142350,142350
ms/ui/ComposeMessageActivity.java
2d54f0192a7204138c0a2ca26d8f552a749a0d45 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@142393,142393
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
b5e7fe89067b3f9473d0c83cd57c7c6d2598cc53 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142386,142386
ms/ui/ComposeMessageActivity.java
b92b26763e49fd9cc34d382dee4d764ef163bde5 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142331,142331
ms/transaction/MessagingNotification.java
03aa027ef8fdf32d5de715cfdf1da51d27740d25 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@142349,142349
ms/ui/ComposeMessageActivity.java
64e0a02e1ff5725916b6e3f1683d92e7ec0f859a 25-Mar-2009 Daisuke Miyakawa <> Automated import from //branches/cupcake/...@142508,142508
ms/activity/VCardManager.java
fbcd1835007f776413ce638328d27fc8e49083d8 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142329,142329
ms/transaction/MessagingNotification.java
9de7fc851de8efe7f292a5e4120a4475090950a6 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142252,142252
ms/ui/ComposeMessageActivity.java
5bfc60dc04e20d8fb5be82b771c355aab4a08ca5 25-Mar-2009 Wei Huang <> Automated import from //branches/cupcake/...@142500,142500
ms/ui/ComposeMessageActivity.java
b3cb9bbf929f70cb4855f03e4bfbed749022cf1b 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142128,142128
ms/transaction/MessagingNotification.java
ms/transaction/RetryScheduler.java
ms/transaction/SmsReceiverService.java
614c3384b83966ec1d8d47c562d4a1cd3b7b55d5 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142247,142247
ms/ui/ComposeMessageActivity.java
4d75e8e385b76d0f12234089e8a1aa07041e57b7 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@142086,142086
ms/ui/ComposeMessageActivity.java
43ca4f260568dbaea2f1997677958b303678d1ea 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142085,142085
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
32aa08675475d9e2b20f0d388750db5e4d8ce641 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142127,142127
ms/transaction/MessagingNotification.java
ms/transaction/RetryScheduler.java
ms/transaction/SmsReceiverService.java
07e7775d5a792334b89436bf5479bfd5abeeb8c4 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@142058,142058
ms/MmsApp.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/util/DraftCache.java
409cd4a6298902912a5ee57282c862b3b332c791 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@142084,142084
ms/ui/ComposeMessageActivity.java
2baf4a232afded96164d97328a5c8c43dbb8c0d2 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142083,142083
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
553defae65b35a966269f2ece997863a13eda574 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@142056,142056
ms/MmsApp.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/util/DraftCache.java
afb09d77dbeceb3d40d9a5a8e8bd2c0ecf9ce125 25-Mar-2009 Wei Huang <> Automated import from //branches/master/...@141987,141987
ms/ui/ComposeMessageActivity.java
bcce53d80fc6b539279f622532eba52a26aa4fd3 25-Mar-2009 Wei Huang <> Automated import from //branches/donutburger/...@141986,141986
ms/ui/ComposeMessageActivity.java
1bb6975b0a9a5a4b38aef689305b1e7eb5b61b08 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@141950,141950
ms/ui/ConversationList.java
7d17c12dddca4d4e3b0ffddbc21ae740a1e47338 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@141949,141949
ms/ui/ConversationList.java
77f8431915049ae84c17b689110fd7206c4e5a80 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@141835,141835
ms/ui/ComposeMessageActivity.java
749055e2a1e2e6c9bd18e0e589f5c0170457a306 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@141833,141833
ms/ui/ComposeMessageActivity.java
35a74a9e0ee7c171c6e17f0eda4b0df0253f8364 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@141740,141740
ms/transaction/MessagingNotification.java
ms/transaction/SendTransaction.java
ms/ui/ComposeMessageActivity.java
46997de8d763f60dfc64fa94ee4220851d8067fe 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@141738,141738
ms/transaction/MessagingNotification.java
ms/transaction/SendTransaction.java
ms/ui/ComposeMessageActivity.java
f5983f05c74dd498bb0ca2485e32531cc764e05b 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@141538,141538
ms/ui/ComposeMessageActivity.java
d893545a4c7b71d35cb52888c8c0722d09dd954f 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@141536,141536
ms/ui/ComposeMessageActivity.java
466655c199825063a0594ce739e561b7ae12566b 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@141441,141441
ms/ui/ConversationHeaderView.java
64ad15987e382dbf4e8c9ef94d645d6b01bc3328 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@141438,141438
ms/ui/ConversationHeaderView.java
2d3e7a1cbe53d4dc4b6f8157e35866e441938fb4 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@141432,141432
ms/ui/ComposeMessageActivity.java
28918ff518a3724c05e8088e46edf36fcfb92c6f 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@141430,141430
ms/ui/ComposeMessageActivity.java
ece5890ca6c6075ed81324258a4e3991cc45a00f 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@141422,141422
ms/ui/ComposeMessageActivity.java
e96c6d3009f2b708ff727b650874c65dae34708e 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@141421,141421
ms/ui/ComposeMessageActivity.java
72f5210ca0a42c8059c4b1b98b2a05ec25ec2c60 25-Mar-2009 Tom Taylor <> Automated import from //branches/cupcake/...@142390,142390
ms/ui/ComposeMessageActivity.java
ms/ui/RecipientsEditor.java
e7f5e099a2776e1954f0f59ad0797a47cd988796 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142383,142383
ms/ui/ComposeMessageActivity.java
426c5a868c5908f750c59e4708b51c8beb7dc9b4 25-Mar-2009 Tom Taylor <> Automated import from //branches/cupcake/...@142346,142346
ms/ui/ComposeMessageActivity.java
809c9ceddf5be502a7ba0389421b8b166a319a9d 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142327,142327
ms/transaction/MessagingNotification.java
aed407b93ddd93d5ea887492c565db8adb7a66e4 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142155,142155
ms/ui/ComposeMessageActivity.java
0dca46a4e0582a449315ddbe424412511bf4bbc7 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142126,142126
ms/transaction/MessagingNotification.java
ms/transaction/RetryScheduler.java
ms/transaction/SmsReceiverService.java
05a67efd32fab66436702c2915d8bd0e20081e3a 25-Mar-2009 Tom Taylor <> Automated import from //branches/cupcake/...@142082,142082
ms/ui/ComposeMessageActivity.java
9be120e248aed940252a4dfa0df048b48bbecd97 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142078,142078
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
f64874be0db402e7b2061ee4049c0e508d8fa93d 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@140920,140920
ms/ui/ComposeMessageActivity.java
47489b213932b2b6e40d129ead466959bf217d02 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@140919,140919
ms/ui/ComposeMessageActivity.java
4c3af9d01ca1924459eb0d586cfe9324d8e52382 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@142052,142052
ms/MmsApp.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/util/DraftCache.java
9bedeaab23be6f6aaa6f3f006a09ecf33c5bea67 25-Mar-2009 Wei Huang <> Automated import from //branches/cupcake/...@141985,141985
ms/ui/ComposeMessageActivity.java
7d3e1caa6000b0bbab0716b1815c2c7177d67948 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@140862,140862
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/util/ContactInfoCache.java
644f7a81b2ef4ae9c67f93d1e75c259b801eeb8a 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@140861,140861
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/util/ContactInfoCache.java
cd87a4285599aeb732e4590136a5c103e1c42ccd 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/master/...@140858,140858
ms/ui/ComposeMessageActivity.java
e8bdd0b8135561699fcffb2c5b6db3f93505683e 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/donutburger/...@140854,140854
ms/ui/ComposeMessageActivity.java
3b07828569896758ab6ef1cc2d765d3f3ff1b692 25-Mar-2009 Tom Taylor <> Automated import from //branches/cupcake/...@141948,141948
ms/ui/ConversationList.java
00a6a244e1743be468bd3ab709781ef9751aa8c2 25-Mar-2009 Mark Wagner <> Automated import from //branches/master/...@140784,140784
ms/ui/ComposeMessageActivity.java
cbbd348cd4116f3b4362740c6cb8bd9e394f37c7 25-Mar-2009 Mark Wagner <> Automated import from //branches/donutburger/...@140779,140779
ms/ui/ComposeMessageActivity.java
b0b2b3863a332dff7d3fe680af9e46e1858803f0 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@141831,141831
ms/ui/ComposeMessageActivity.java
0f55000e8fa21e909e003ad6d20a887964beda01 25-Mar-2009 Ficus Kirkpatrick <> Automated import from //branches/cupcake/...@141736,141736
ms/transaction/MessagingNotification.java
ms/transaction/SendTransaction.java
ms/ui/ComposeMessageActivity.java
6f53960f9a27fe76ba11735ede0778456d3f6930 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@140678,140678
ms/ui/BasicSlideEditorView.java
ms/ui/ImageAttachmentView.java
ms/ui/MessageListItem.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideshowAttachmentView.java
ms/ui/VideoAttachmentView.java
a1a71dd05a759715c82bfc8bcaa12bbe2d22c751 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@140677,140677
ms/ui/BasicSlideEditorView.java
ms/ui/ImageAttachmentView.java
ms/ui/MessageListItem.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideshowAttachmentView.java
ms/ui/VideoAttachmentView.java
b8cadac68b0e449a7b2139fe3a0a4352873bcee5 25-Mar-2009 Tom Taylor <> Automated import from //branches/master/...@140539,140539
ms/ui/ConversationHeaderView.java
eb96a1703927b2bcf07f89bc032a7bd06e79feec 25-Mar-2009 Tom Taylor <> Automated import from //branches/donutburger/...@140536,140536
ms/ui/ConversationHeaderView.java
cc3c7514e69ec68102152ec264361f71233cb28a 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
ms/ui/BasicSlideEditorView.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ImageAttachmentView.java
ms/ui/MessageListItem.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideshowAttachmentView.java
ms/ui/VideoAttachmentView.java
ms/util/ContactInfoCache.java
5d2d0046ada7b53205e537d8675d32a8785e8d1d 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
ms/MmsApp.java
ms/model/SlideshowModel.java
ms/model/TextModel.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/RetryScheduler.java
ms/transaction/SmsReceiverService.java
ms/transaction/TransactionService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
ms/util/ContactInfoCache.java
abd8281fc52d0a3ec8fc89364f230bebb055c4e3 18-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
src/com/android/mms/ui/MessageUtils.java
591d17e9a51bb9f829d6860dc7aa0bad25062cd5 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
ms/transaction/NotificationTransaction.java
ms/transaction/RetrieveTransaction.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
ms/util/ContactInfoCache.java
836945de572ac80fd6f6a7bf59036d4cce801410 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
ms/transaction/MessagingNotification.java
ms/transaction/PushReceiver.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeaderView.java
ms/ui/MessageUtils.java
ms/ui/RecipientsEditor.java
ms/ui/SlideListItemView.java
ms/ui/SlideshowEditActivity.java
72b7fda4ff5e94ba1a13c41601ac1cd61c0d6663 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
ms/transaction/SendTransaction.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/UriImage.java
ms/util/ContactInfoCache.java
bd09a4b8c2d1f922f1459c4d7b61e7e87ed4ddf3 06-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136745
ms/MmsConfig.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
ms/ui/UriImage.java
2f56791329cefc49ce79663b8d3aff50594cc1f3 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
ms/transaction/MessagingNotification.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/ui/BasicSlideEditorView.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationListAdapter.java
ms/ui/ManageSimMessages.java
ms/ui/MessageUtils.java
ms/ui/RecipientsEditor.java
ms/ui/SlideEditorActivity.java
ms/util/ContactInfoCache.java
72735c62aba8fd2a9420a0f9f83d22543e3c164f 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ms/AttachImage.java
ms/ContentClassException.java
ms/ContentRestrictionException.java
ms/ExceedMessageSizeException.java
ms/MmsApp.java
ms/MmsConfig.java
ms/ResolutionException.java
ms/UnsupportContentTypeException.java
ms/activity/VCalManager.java
ms/activity/VCardManager.java
ms/dom/AttrImpl.java
ms/dom/DocumentImpl.java
ms/dom/ElementImpl.java
ms/dom/NamedNodeMapImpl.java
ms/dom/NodeImpl.java
ms/dom/NodeListImpl.java
ms/dom/events/EventImpl.java
ms/dom/events/EventTargetImpl.java
ms/dom/smil/ElementParallelTimeContainerImpl.java
ms/dom/smil/ElementSequentialTimeContainerImpl.java
ms/dom/smil/ElementTimeContainerImpl.java
ms/dom/smil/ElementTimeImpl.java
ms/dom/smil/SmilDocumentImpl.java
ms/dom/smil/SmilElementImpl.java
ms/dom/smil/SmilLayoutElementImpl.java
ms/dom/smil/SmilMediaElementImpl.java
ms/dom/smil/SmilParElementImpl.java
ms/dom/smil/SmilPlayer.java
ms/dom/smil/SmilRefElementImpl.java
ms/dom/smil/SmilRegionElementImpl.java
ms/dom/smil/SmilRegionMediaElementImpl.java
ms/dom/smil/SmilRootLayoutElementImpl.java
ms/dom/smil/TimeImpl.java
ms/dom/smil/TimeListImpl.java
ms/dom/smil/parser/SmilContentHandler.java
ms/dom/smil/parser/SmilXmlParser.java
ms/dom/smil/parser/SmilXmlSerializer.java
ms/drm/DrmUtils.java
ms/drm/DrmWrapper.java
ms/layout/HVGALayoutParameters.java
ms/layout/LayoutManager.java
ms/layout/LayoutParameters.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ContentRestriction.java
ms/model/ContentRestrictionFactory.java
ms/model/IModelChangedObserver.java
ms/model/ImageModel.java
ms/model/LayoutModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/Model.java
ms/model/RegionMediaModel.java
ms/model/RegionModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/transaction/AbstractRetryScheme.java
ms/transaction/DefaultRetryScheme.java
ms/transaction/HttpUtils.java
ms/transaction/MessageSender.java
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationTransaction.java
ms/transaction/Observable.java
ms/transaction/Observer.java
ms/transaction/PrivilegedSmsReceiver.java
ms/transaction/ProgressCallbackEntity.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/Transaction.java
ms/transaction/TransactionBundle.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/transaction/TransactionState.java
ms/ui/AdaptableSlideViewInterface.java
ms/ui/AttachmentEditor.java
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/AudioAttachmentView.java
ms/ui/BasicSlideEditorView.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConfirmRateLimitActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/DeliveryReportActivity.java
ms/ui/DeliveryReportAdapter.java
ms/ui/DeliveryReportItem.java
ms/ui/DeliveryReportListItem.java
ms/ui/EditSlideDurationActivity.java
ms/ui/EditSlideTextActivity.java
ms/ui/IconListAdapter.java
ms/ui/ImageAttachmentView.java
ms/ui/LayoutSelectorAdapter.java
ms/ui/ManageSimMessages.java
ms/ui/ManageSimPreference.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageListView.java
ms/ui/MessageUtils.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/Presenter.java
ms/ui/PresenterFactory.java
ms/ui/RecipientList.java
ms/ui/RecipientsAdapter.java
ms/ui/RecipientsEditor.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideViewInterface.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowAttachmentView.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowEditor.java
ms/ui/SlideshowPresenter.java
ms/ui/UriImage.java
ms/ui/VideoAttachmentView.java
ms/ui/ViewInterface.java
ms/util/AddressUtils.java
ms/util/ContactInfoCache.java
ms/util/DownloadManager.java
ms/util/RateController.java
ms/util/SendingProgressTokenManager.java
ms/util/SmileyParser.java
892f2c5bf965b1431ae107b602444a93f4aad4a3 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ms/AttachImage.java
ms/ContentClassException.java
ms/ContentRestrictionException.java
ms/ExceedMessageSizeException.java
ms/MmsApp.java
ms/MmsConfig.java
ms/ResolutionException.java
ms/UnsupportContentTypeException.java
ms/activity/VCalManager.java
ms/activity/VCardManager.java
ms/dom/AttrImpl.java
ms/dom/DocumentImpl.java
ms/dom/ElementImpl.java
ms/dom/NamedNodeMapImpl.java
ms/dom/NodeImpl.java
ms/dom/NodeListImpl.java
ms/dom/events/EventImpl.java
ms/dom/events/EventTargetImpl.java
ms/dom/smil/ElementParallelTimeContainerImpl.java
ms/dom/smil/ElementSequentialTimeContainerImpl.java
ms/dom/smil/ElementTimeContainerImpl.java
ms/dom/smil/ElementTimeImpl.java
ms/dom/smil/SmilDocumentImpl.java
ms/dom/smil/SmilElementImpl.java
ms/dom/smil/SmilLayoutElementImpl.java
ms/dom/smil/SmilMediaElementImpl.java
ms/dom/smil/SmilParElementImpl.java
ms/dom/smil/SmilPlayer.java
ms/dom/smil/SmilRefElementImpl.java
ms/dom/smil/SmilRegionElementImpl.java
ms/dom/smil/SmilRegionMediaElementImpl.java
ms/dom/smil/SmilRootLayoutElementImpl.java
ms/dom/smil/TimeImpl.java
ms/dom/smil/TimeListImpl.java
ms/dom/smil/parser/SmilContentHandler.java
ms/dom/smil/parser/SmilXmlParser.java
ms/dom/smil/parser/SmilXmlSerializer.java
ms/drm/DrmUtils.java
ms/drm/DrmWrapper.java
ms/layout/HVGALayoutParameters.java
ms/layout/LayoutManager.java
ms/layout/LayoutParameters.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ContentRestriction.java
ms/model/ContentRestrictionFactory.java
ms/model/IModelChangedObserver.java
ms/model/ImageModel.java
ms/model/LayoutModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/Model.java
ms/model/RegionMediaModel.java
ms/model/RegionModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/transaction/AbstractRetryScheme.java
ms/transaction/DefaultRetryScheme.java
ms/transaction/HttpUtils.java
ms/transaction/MessageSender.java
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationTransaction.java
ms/transaction/Observable.java
ms/transaction/Observer.java
ms/transaction/PrivilegedSmsReceiver.java
ms/transaction/ProgressCallbackEntity.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/Transaction.java
ms/transaction/TransactionBundle.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/transaction/TransactionState.java
ms/ui/AdaptableSlideViewInterface.java
ms/ui/AttachmentEditor.java
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/AudioAttachmentView.java
ms/ui/BasicSlideEditorView.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConfirmRateLimitActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/DeliveryReportActivity.java
ms/ui/DeliveryReportAdapter.java
ms/ui/DeliveryReportItem.java
ms/ui/DeliveryReportListItem.java
ms/ui/EditSlideDurationActivity.java
ms/ui/EditSlideTextActivity.java
ms/ui/IconListAdapter.java
ms/ui/ImageAttachmentView.java
ms/ui/LayoutSelectorAdapter.java
ms/ui/ManageSimMessages.java
ms/ui/ManageSimPreference.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageListView.java
ms/ui/MessageUtils.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/Presenter.java
ms/ui/PresenterFactory.java
ms/ui/RecipientList.java
ms/ui/RecipientsAdapter.java
ms/ui/RecipientsEditor.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideViewInterface.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowAttachmentView.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowEditor.java
ms/ui/SlideshowPresenter.java
ms/ui/UriImage.java
ms/ui/VideoAttachmentView.java
ms/ui/ViewInterface.java
ms/util/AddressUtils.java
ms/util/ContactInfoCache.java
ms/util/DownloadManager.java
ms/util/RateController.java
ms/util/SendingProgressTokenManager.java
ms/util/SmileyParser.java
153ae99e0a7d626a24d61475eeb133249deb448c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
ms/model/SlideshowModel.java
ms/model/TextModel.java
ms/transaction/MessagingNotification.java
ms/transaction/TransactionService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
ms/ui/UriImage.java
ms/util/ContactInfoCache.java
abd7b2d90f7491075f1daba4b4cccdfc82f8ddd1 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
ms/model/SlideshowModel.java
ms/model/TextModel.java
ms/transaction/MessagingNotification.java
ms/transaction/TransactionService.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
ms/ui/UriImage.java
ms/util/ContactInfoCache.java
121083d1d2046ec3f7c50c19366303c797833a4a 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
ms/MmsApp.java
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/util/SmileyParser.java
59d72c57ce9c319b6cd43ce2ab36b7076c9e821f 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
ms/MmsApp.java
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/DeliveryReportListItem.java
ms/ui/MessageItem.java
ms/ui/MessageListItem.java
ms/ui/RecipientList.java
ms/util/ContactInfoCache.java
ms/util/ContactNameCache.java
ms/util/DownloadManager.java
44cea74dc55e2459262d0d765ef4a69267dd09b0 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
ms/transaction/MessagingNotification.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageItem.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
ms/ui/UndeliveredMessagesActivity.java
ms/ui/UndeliveredMessagesListAdapter.java
61c5973c3cda88d614b5c8491982f1d3c3ded897 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/transaction/PushReceiver.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ManageSimMessages.java
ms/ui/MessageListItem.java
ms/ui/RecipientList.java
ms/ui/RecipientsAdapter.java
ms/ui/UndeliveredMessagesActivity.java
ms/ui/VideoAttachmentView.java
ms/util/ContactNameCache.java
2d9959fea0cfea5fca09d139b66b1fa2cd45bf49 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'cupcake'
21b919f737006ffd654ac788aeedcaed05f5b367 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127436
ms/model/CarrierContentRestriction.java
ms/model/ContentRestriction.java
ms/model/SlideshowModel.java
c17636b9296c9b149546f93e2f6e523ee3f212f9 21-Jan-2009 Jean-Baptiste Queru <jbq@google.com> Revert "Optional provisioning"

This reverts commit dab6c7163ec0daf37ac2cd3cb50642529ca574c1.
ms/transaction/SimFullReceiver.java
e935089b29465ecc4c6905082d8563011afdc2b9 21-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
1a4b3a26659d034b9df52fc6a0e184cffe7451ae 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/SlideEditorActivity.java
123868e6c096c057a33dd0a7f5e1c9b84cf08c9c 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'master' of git://android.git.kernel.org/platform/packages/apps/Mms
7ea15f943d16d632f299baee5747f1a615043aa1 16-Jan-2009 android-build SharedAccount <android-build@undroid16.corp.google.com> Merge branch 'cupcake'
3dbc13db0e4e332b0ab7e9515a7e47cefd70f627 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
ms/transaction/MessagingNotification.java
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/ComposeMessageActivity.java
ms/ui/MessageListItem.java
ms/ui/SlideshowEditActivity.java
dab6c7163ec0daf37ac2cd3cb50642529ca574c1 15-Jan-2009 Jean-Baptiste Queru <jbq@google.com> Optional provisioning

This introduces an ro.requires_provisioning property, which defaults to false,
such that by default the platform doesn't require any setup application to
set a run-time "provisioned" bit and allows all behaviors right away (home key,
lock screen, etc...).
ms/transaction/SimFullReceiver.java
d08fe2573bf22164e5def01a18fec09d09c50ef6 14-Jan-2009 Brad Fitzpatrick <brad@danga.com> Cache the expensive 12/24 hour display mode lookup.
ms/ui/MessageUtils.java
e82e62f94d4ba4ac139faf055f40fbbc2b99b551 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationList.java
ms/ui/ManageSimMessages.java
ms/ui/MessageListItem.java
ms/ui/RecipientList.java
ms/ui/RecipientsAdapter.java
ms/ui/RecipientsEditor.java
ms/ui/SlideshowEditActivity.java
ms/ui/UndeliveredMessagesActivity.java
0f236f55349f070ac94e12cca963847173393da8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ms/activity/VCalManager.java
ms/dom/smil/SmilRegionElementImpl.java
ms/dom/smil/SmilRootLayoutElementImpl.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ImageModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/RegionMediaModel.java
ms/model/SlideshowModel.java
ms/model/VideoModel.java
ms/transaction/HttpUtils.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/NotificationTransaction.java
ms/transaction/PrivilegedSmsReceiver.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/Transaction.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/ui/AlertDialogActivity.java
ms/ui/AttachmentEditor.java
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/DeliveryReportActivity.java
ms/ui/DeliveryReportListItem.java
ms/ui/EditSlideDurationActivity.java
ms/ui/LayoutSelectorAdapter.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageListView.java
ms/ui/MessageUtils.java
ms/ui/RecipientList.java
ms/ui/RecipientsAdapter.java
ms/ui/SlideEditorActivity.java
ms/ui/UndeliveredMessagesListAdapter.java
ms/ui/UriImage.java
ms/ui/UrlListActivity.java
ms/util/ContactNameCache.java
ms/util/DownloadManager.java
8eed706474910ccb978acda03e85d3261037da6e 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ms/AttachImage.java
ms/ContentClassException.java
ms/ContentRestrictionException.java
ms/ExceedMessageSizeException.java
ms/MmsApp.java
ms/MmsConfig.java
ms/ResolutionException.java
ms/UnsupportContentTypeException.java
ms/activity/VCalManager.java
ms/activity/VCardManager.java
ms/dom/AttrImpl.java
ms/dom/DocumentImpl.java
ms/dom/ElementImpl.java
ms/dom/NamedNodeMapImpl.java
ms/dom/NodeImpl.java
ms/dom/NodeListImpl.java
ms/dom/events/EventImpl.java
ms/dom/events/EventTargetImpl.java
ms/dom/smil/ElementParallelTimeContainerImpl.java
ms/dom/smil/ElementSequentialTimeContainerImpl.java
ms/dom/smil/ElementTimeContainerImpl.java
ms/dom/smil/ElementTimeImpl.java
ms/dom/smil/SmilDocumentImpl.java
ms/dom/smil/SmilElementImpl.java
ms/dom/smil/SmilLayoutElementImpl.java
ms/dom/smil/SmilMediaElementImpl.java
ms/dom/smil/SmilParElementImpl.java
ms/dom/smil/SmilPlayer.java
ms/dom/smil/SmilRefElementImpl.java
ms/dom/smil/SmilRegionElementImpl.java
ms/dom/smil/SmilRegionMediaElementImpl.java
ms/dom/smil/SmilRootLayoutElementImpl.java
ms/dom/smil/TimeImpl.java
ms/dom/smil/TimeListImpl.java
ms/dom/smil/parser/SmilContentHandler.java
ms/dom/smil/parser/SmilXmlParser.java
ms/dom/smil/parser/SmilXmlSerializer.java
ms/drm/DrmUtils.java
ms/drm/DrmWrapper.java
ms/layout/HVGALayoutParameters.java
ms/layout/LayoutManager.java
ms/layout/LayoutParameters.java
ms/model/AudioModel.java
ms/model/CarrierContentRestriction.java
ms/model/ContentRestriction.java
ms/model/ContentRestrictionFactory.java
ms/model/IModelChangedObserver.java
ms/model/ImageModel.java
ms/model/LayoutModel.java
ms/model/MediaModel.java
ms/model/MediaModelFactory.java
ms/model/Model.java
ms/model/RegionMediaModel.java
ms/model/RegionModel.java
ms/model/SlideModel.java
ms/model/SlideshowModel.java
ms/model/SmilHelper.java
ms/model/TextModel.java
ms/model/VideoModel.java
ms/transaction/AbstractRetryScheme.java
ms/transaction/DefaultRetryScheme.java
ms/transaction/HttpUtils.java
ms/transaction/MessageSender.java
ms/transaction/MessageStatusReceiver.java
ms/transaction/MessagingNotification.java
ms/transaction/MmsMessageSender.java
ms/transaction/MmsSystemEventReceiver.java
ms/transaction/NotificationTransaction.java
ms/transaction/Observable.java
ms/transaction/Observer.java
ms/transaction/ProgressCallbackEntity.java
ms/transaction/PushReceiver.java
ms/transaction/ReadRecTransaction.java
ms/transaction/RetrieveTransaction.java
ms/transaction/RetryScheduler.java
ms/transaction/SendTransaction.java
ms/transaction/SimFullReceiver.java
ms/transaction/SmsMessageSender.java
ms/transaction/SmsReceiver.java
ms/transaction/SmsReceiverService.java
ms/transaction/Transaction.java
ms/transaction/TransactionBundle.java
ms/transaction/TransactionService.java
ms/transaction/TransactionSettings.java
ms/transaction/TransactionState.java
ms/ui/AdaptableSlideViewInterface.java
ms/ui/AlertDialogActivity.java
ms/ui/AttachmentEditor.java
ms/ui/AttachmentTypeSelectorAdapter.java
ms/ui/AudioAttachmentView.java
ms/ui/BasicSlideEditorView.java
ms/ui/ClassZeroActivity.java
ms/ui/ComposeMessageActivity.java
ms/ui/ConfirmRateLimitActivity.java
ms/ui/ConversationHeader.java
ms/ui/ConversationHeaderView.java
ms/ui/ConversationList.java
ms/ui/ConversationListAdapter.java
ms/ui/DeliveryReportActivity.java
ms/ui/DeliveryReportAdapter.java
ms/ui/DeliveryReportItem.java
ms/ui/DeliveryReportListItem.java
ms/ui/EditSlideDurationActivity.java
ms/ui/EditSlideTextActivity.java
ms/ui/IconListAdapter.java
ms/ui/ImageAttachmentView.java
ms/ui/LayoutSelectorAdapter.java
ms/ui/ManageSimMessages.java
ms/ui/ManageSimPreference.java
ms/ui/MessageItem.java
ms/ui/MessageListAdapter.java
ms/ui/MessageListItem.java
ms/ui/MessageUtils.java
ms/ui/MessagingPreferenceActivity.java
ms/ui/MmsThumbnailPresenter.java
ms/ui/Presenter.java
ms/ui/PresenterFactory.java
ms/ui/RecipientList.java
ms/ui/RecipientsAdapter.java
ms/ui/RecipientsEditor.java
ms/ui/SlideEditorActivity.java
ms/ui/SlideListItemView.java
ms/ui/SlideView.java
ms/ui/SlideViewInterface.java
ms/ui/SlideshowActivity.java
ms/ui/SlideshowAttachmentView.java
ms/ui/SlideshowEditActivity.java
ms/ui/SlideshowEditor.java
ms/ui/SlideshowPresenter.java
ms/ui/UndeliveredMessagesActivity.java
ms/ui/UndeliveredMessagesListAdapter.java
ms/ui/UriImage.java
ms/ui/UrlListActivity.java
ms/ui/VideoAttachmentView.java
ms/ui/ViewInterface.java
ms/util/AddressUtils.java
ms/util/ContactNameCache.java
ms/util/DownloadManager.java
ms/util/RateController.java
ms/util/SendingProgressTokenManager.java