Mike Cleron
741ebcddd4
am 065d5c62
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
...
Merge commit '065d5c6292b080f3f0e1507fc70e94a74ee9c9c2'
* commit '065d5c6292b080f3f0e1507fc70e94a74ee9c9c2':
Fix problem with timeouts and sending attachments (#2178288 )
2009-10-13 16:52:25 -07:00
Eric Fischer
bdbc5647c6
Reimport translations.
...
Change-Id: I2a37ff6a07f79136ac2bd3fb3e4db72371f45e8c
2009-10-13 16:32:56 -07:00
Eric Fischer
a745f9ae44
Import revised translations. DO NOT MERGE
2009-10-13 16:05:51 -07:00
Marc Blank
31d96b0890
am 7cfda60b
: am 4e424a33
: Merge change Ie093215f into eclair
...
Merge commit '7cfda60b2b2f8769079189727cee4c8fb9934d35' into eclair-mr2-plus-aosp
* commit '7cfda60b2b2f8769079189727cee4c8fb9934d35':
Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807 )
2009-10-13 14:49:56 -07:00
Marc Blank
7cfda60b2b
am 4e424a33
: Merge change Ie093215f into eclair
...
Merge commit '4e424a33c29446d750790e360e43fb7c83ec0c6f' into eclair-mr2
* commit '4e424a33c29446d750790e360e43fb7c83ec0c6f':
Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807 )
2009-10-13 14:46:04 -07:00
Marc Blank
e35f854582
am 4e424a33
: Merge change Ie093215f into eclair
...
Merge commit '4e424a33c29446d750790e360e43fb7c83ec0c6f' into eclair-plus-aosp
* commit '4e424a33c29446d750790e360e43fb7c83ec0c6f':
Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807 )
2009-10-13 14:45:29 -07:00
Android (Google) Code Review
4e424a33c2
Merge change Ie093215f into eclair
...
* changes:
Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807 )
2009-10-13 17:39:59 -04:00
Mihai Preda
88f95c62ef
am 51e7fa5d
: am affa5660
: MessageView: UI change prev/next arrows.
...
Merge commit '51e7fa5dc46463ee4d96ac9db633cd150940a22b'
* commit '51e7fa5dc46463ee4d96ac9db633cd150940a22b':
MessageView: UI change prev/next arrows.
2009-10-13 14:27:54 -07:00
Rebecca Schultz Zavin
7102979272
am 9e72a844
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
...
Merge commit '9e72a844d11439c17ad61ef942a951bff0ce6f34'
* commit '9e72a844d11439c17ad61ef942a951bff0ce6f34':
2009-10-13 14:27:50 -07:00
Andrew Stadler
b48b1e9a81
am b7c67a01
: am 754240bc
: Fix race condition in testMultiple()
...
Merge commit 'b7c67a0124fe4897c71f5cbe4bbae87621a6a1fa' into eclair-mr2-plus-aosp
* commit 'b7c67a0124fe4897c71f5cbe4bbae87621a6a1fa':
Fix race condition in testMultiple()
2009-10-13 12:47:23 -07:00
Andrew Stadler
b7c67a0124
am 754240bc
: Fix race condition in testMultiple()
...
Merge commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0' into eclair-mr2
* commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0':
Fix race condition in testMultiple()
2009-10-13 12:43:20 -07:00
Andrew Stadler
c1f1d7279c
am 754240bc
: Fix race condition in testMultiple()
...
Merge commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0' into eclair-plus-aosp
* commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0':
Fix race condition in testMultiple()
2009-10-13 12:43:11 -07:00
Marc Blank
5fd81cad4c
Add truncation at 100k (EAS 2.5) and 200k (EAS 12) ( #2184807 )
...
* Prevents OOM errors with huge message bodies
Change-Id: Ie093215f96a514b3a1bcd31aa1f5957d1ada7719
2009-10-13 12:06:47 -07:00
Andrew Stadler
754240bcf3
Fix race condition in testMultiple()
...
* If we close the activity while a requeryList() is pending in the
handler queue, we'll eventually try to operate on a closed cursor
when we get to testMultiple().
* The fix: Return immediately if the cursor is not available.
Fixes bug http://b/2180416
Followup for bug http://b/2149083
2009-10-13 12:02:46 -07:00
Eric Fischer
7821e7f6ef
am 38fdd515
: (-s ours) am 268d5faa
: am b634dbf6
: (-s ours) am 20b3ba23
: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit '38fdd515eeda01f3a03a54df1a2b58d732d1a3f6'
* commit '38fdd515eeda01f3a03a54df1a2b58d732d1a3f6':
Import revised translations. DO NOT MERGE
2009-10-13 11:56:58 -07:00
Marc Blank
72058581e6
am fae90688
: am 676ea183
: Merge change I15dccd1f into eclair-mr2
...
Merge commit 'fae9068859f58e7b4ad2926b802370781b9fb609'
* commit 'fae9068859f58e7b4ad2926b802370781b9fb609':
Server validates even though server address is wrong
2009-10-13 11:53:54 -07:00
Marc Blank
4fea01b748
am f9191a95
: am ff0c1f63
: Merge change Ic2d782c1 into eclair-mr2
...
Merge commit 'f9191a955ab4c80f9c7ba5f7e20748a1a37dc065'
* commit 'f9191a955ab4c80f9c7ba5f7e20748a1a37dc065':
Add checks to prevent duplicate service starts (fixes #2099830 )
2009-10-13 11:53:50 -07:00
Mihai Preda
52f4c8cecc
am e284eb9e
: am ba0b7340
: am 73032f46
: Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
...
Merge commit 'e284eb9e61f76d4cb195d1f490ab4709cefb77eb'
* commit 'e284eb9e61f76d4cb195d1f490ab4709cefb77eb':
2009-10-13 11:53:30 -07:00
Dima Zavin
53fc90bd25
am d3dfc2b7
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
...
Merge commit 'd3dfc2b7401c8559a5ae722d9f63d8d0d39f2132'
* commit 'd3dfc2b7401c8559a5ae722d9f63d8d0d39f2132':
Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
2009-10-13 11:53:26 -07:00
Mihai Preda
10a1facb8d
am 2bc47f24
: MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
...
Merge commit '2bc47f24a4db464f58977ae808f754e2a9191daa' into eclair-mr2-plus-aosp
* commit '2bc47f24a4db464f58977ae808f754e2a9191daa':
MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
2009-10-13 04:01:46 -07:00
Mihai Preda
2bc47f24a4
MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
...
Bug 2180995.
2009-10-13 12:53:16 +02:00
Marc Blank
a844e8a69b
am 255dba84
: am 2c74ee56
: Prevent EmailAddressAdapter from leaking cursors; load in bg
...
Merge commit '255dba84f123ee4645217fd7e07b5bdd0d89aa61' into eclair-mr2-plus-aosp
* commit '255dba84f123ee4645217fd7e07b5bdd0d89aa61':
Prevent EmailAddressAdapter from leaking cursors; load in bg
2009-10-12 14:07:37 -07:00
Marc Blank
255dba84f1
am 2c74ee56
: Prevent EmailAddressAdapter from leaking cursors; load in bg
...
Merge commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe' into eclair-mr2
* commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe':
Prevent EmailAddressAdapter from leaking cursors; load in bg
2009-10-12 14:02:19 -07:00
Marc Blank
b2304d2778
am 2c74ee56
: Prevent EmailAddressAdapter from leaking cursors; load in bg
...
Merge commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe' into eclair-plus-aosp
* commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe':
Prevent EmailAddressAdapter from leaking cursors; load in bg
2009-10-12 14:01:45 -07:00
Marc Blank
2c74ee56a4
Prevent EmailAddressAdapter from leaking cursors; load in bg
...
* Relates to a number of bugs related to ANR's and slow behavior
when addressing mail
* Call changeCursor(null) on the Adapter when the activity is destroyed
* Call getCount() in the background thread to force data there rather
than in the UI thread
* If this change is accepted, something equivalent should be
used in the Gmail app as well
* Addresses #2180237 (P1, target Eclair_Sholes) as well as
#2180976 and #2146926 , the latter two of which were fixed
with workarounds.
Change-Id: I7503c5fbe091dbc5e784d5a7bebeb3d60226d57d
2009-10-12 13:54:05 -07:00
Andrew Stadler
6ab8725f5a
am b1265fde
: am 3bacb738
: am dfee3ff2
: Fix a crash when you scroll MessageList to junk @ bottom
...
Merge commit 'b1265fde2ac790a74fddb42755602dfbeac9d52a'
* commit 'b1265fde2ac790a74fddb42755602dfbeac9d52a':
2009-10-12 12:39:20 -07:00
Dmitri Plotnikov
74cd5ab3cd
am 9865567b
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
...
Merge commit '9865567bfc4f86e7569e97e2114bac62b49b3b16'
* commit '9865567bfc4f86e7569e97e2114bac62b49b3b16':
Fix a crash when you scroll MessageList to junk @ bottom
2009-10-12 12:39:16 -07:00
Andrew Stadler
b7a0bedb78
am c82cc866
: am ec7bdde6
: am 5b26bbe4
: Switch QuickContact presentation from MEDIUM to LARGE.
...
Merge commit 'c82cc86603140027a28c817029803dc30b4bdcc0'
* commit 'c82cc86603140027a28c817029803dc30b4bdcc0':
2009-10-12 12:37:50 -07:00
David Krause
419431073d
am 0abf305d
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
...
Merge commit '0abf305d3333802dd6f36f56a6750cdf80fc4b74'
* commit '0abf305d3333802dd6f36f56a6750cdf80fc4b74':
Switch QuickContact presentation from MEDIUM to LARGE.
2009-10-12 12:37:46 -07:00
Andrew Stadler
ad409c31d1
am 7b95890f
: am 9331d413
: am 25920f67
: Merge change I7a3482fd into eclair
...
Merge commit '7b95890f18d9b7a97d8885371f64e3cde14c23ea'
* commit '7b95890f18d9b7a97d8885371f64e3cde14c23ea':
2009-10-12 12:35:51 -07:00
Evan Millar
761739ab71
am 4d3f0fe8
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
...
Merge commit '4d3f0fe8e866184587a483adb9eda682ed64297d'
* commit '4d3f0fe8e866184587a483adb9eda682ed64297d':
Handle IMAP empty bodies more safely
2009-10-12 12:35:47 -07:00
Eric Fischer
bd366261e1
am 12b9d3d4
: (-s ours) am f71577e9
: am 1cd5e5f0
: (-s ours) Merge change I0aba41f9 into eclair
...
Merge commit '12b9d3d4f0f2d4985154389a5828fc0b5926a96a'
* commit '12b9d3d4f0f2d4985154389a5828fc0b5926a96a':
Import revised translations. DO NOT MERGE
2009-10-12 12:30:45 -07:00
Fred Quintana
4412700533
am d0ad7a08
: am df002ccf
: am 2c79efd8
: Merge change I303304ab into eclair
...
Merge commit 'd0ad7a088e4e23e7c1121060601b5ffa5daeecf4'
* commit 'd0ad7a088e4e23e7c1121060601b5ffa5daeecf4':
changes from Sync Manager API Review: bug 2164262
2009-10-12 12:28:18 -07:00
Marc Blank
a6918f8bcd
am f6fda926
: am a39b643d
: am e1b5e857
: Merge change I2b0e3b10 into eclair
...
Merge commit 'f6fda92606ee81b8116270da780d053293c9b575'
* commit 'f6fda92606ee81b8116270da780d053293c9b575':
Help with another push inconsistency edge case (#2131432 )
2009-10-12 12:28:13 -07:00
Mihai Preda
8a55972c59
am 89966059
: am 1a377f09
: MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there\'s no source message, to avoid duplicated email addresses on orientation change.
...
Merge commit '89966059c997a410c0b54be2d56e1259ed99940f' into eclair-mr2-plus-aosp
* commit '89966059c997a410c0b54be2d56e1259ed99940f':
MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
2009-10-12 11:47:33 -07:00
Andrew Stadler
d2bd6617f5
am a79aab29
: am aa32726d
: am eb7752bf
: Fix back-to-back message-id bugs
...
Merge commit 'a79aab29eaa0a9f15372156ed8ab8214bc1a553a'
* commit 'a79aab29eaa0a9f15372156ed8ab8214bc1a553a':
Fix back-to-back message-id bugs
2009-10-12 11:45:53 -07:00
Mihai Preda
562912b4b6
am 3a56fec8
: am 37aa2744
: am 85d718cb
: MessageCompose: quote plain-text body if available, otherwise quote HTML body.
...
Merge commit '3a56fec872c7f65c0491402d9c6697859aec1d9f'
* commit '3a56fec872c7f65c0491402d9c6697859aec1d9f':
MessageCompose: quote plain-text body if available, otherwise quote HTML body.
2009-10-12 11:45:49 -07:00
Mihai Preda
5e91f73113
am 1a377f09
: MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there\'s no source message, to avoid duplicated email addresses on orientation change.
...
Merge commit '1a377f096f3a263bba536355823290db4bba7434' into eclair-plus-aosp
* commit '1a377f096f3a263bba536355823290db4bba7434':
MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
2009-10-12 11:42:46 -07:00
Mihai Preda
89966059c9
am 1a377f09
: MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there\'s no source message, to avoid duplicated email addresses on orientation change.
...
Merge commit '1a377f096f3a263bba536355823290db4bba7434' into eclair-mr2
* commit '1a377f096f3a263bba536355823290db4bba7434':
MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
2009-10-12 11:42:13 -07:00
Marc Blank
49faa06cae
am 5b2a8447
: am 25c7efc8
: Use constants for elements in projections.
...
Merge commit '5b2a84472ea71906677c91bd5e154df89c967282'
* commit '5b2a84472ea71906677c91bd5e154df89c967282':
Use constants for elements in projections.
2009-10-12 11:39:02 -07:00
Mihai Preda
b3aca546a4
am 17d07102
: am 8b003de7
: am 1ef86a50
: MessageView: scroll to (0,0) on message change.
...
Merge commit '17d0710277c596dcd9845640260dd7d5916cd14b'
* commit '17d0710277c596dcd9845640260dd7d5916cd14b':
MessageView: scroll to (0,0) on message change.
2009-10-12 11:38:54 -07:00
satok
361efd4f9c
am 75e17438
: am c5abc6d6
: am d493ba25
: Merge change Ie90b74aa into eclair
...
Merge commit '75e1743874df41079c9e2369b9033d6e981ac088'
* commit '75e1743874df41079c9e2369b9033d6e981ac088':
Avoid NPE at onRefresh in MessageList
2009-10-12 11:36:53 -07:00
Marc Blank
dc991934de
am 5c654c3a
: am 89235946
: Merge change I89c7c5dd into eclair-mr2
...
Merge commit '5c654c3afd09c7dd1706c84b065e2f89604767d1'
* commit '5c654c3afd09c7dd1706c84b065e2f89604767d1':
Add "Do Not Translate" to Debug screen strings (#2163281 )
2009-10-12 11:32:44 -07:00
Marc Blank
e9d0d4f6bf
am 0b094d6c
: am fd883ca5
: am 8647be09
: Merge change Id1c0bc24 into eclair
...
Merge commit '0b094d6c0ffa8cd29fadfe7b1913d3cb2c273dbe'
* commit '0b094d6c0ffa8cd29fadfe7b1913d3cb2c273dbe':
Correct issue with mail change parsing (fixes #2165649 )
2009-10-12 11:32:12 -07:00
Fred Quintana
7b8f607d64
am 7ac20eec
: am afe49c7c
: am 794b7e92
: account manager api review changes
...
Merge commit '7ac20eec5af9991a223cff799c8172c4a3073630'
* commit '7ac20eec5af9991a223cff799c8172c4a3073630':
account manager api review changes
2009-10-12 11:28:33 -07:00
Marc Blank
24bc576b6b
am 54ac1169
: am 5c63b5dd
: am 888ea64f
: Merge change I26bb7b8b into eclair
...
Merge commit '54ac1169103658689526063a012fdce59bd50dd6'
* commit '54ac1169103658689526063a012fdce59bd50dd6':
Handle change from push to other intervals properly (#2165032 )
2009-10-12 11:28:25 -07:00
Marc Blank
19b3ed2789
am 84438972
: am df10dbc2
: am 65aae18d
: Merge change Iaf15ead1 into eclair
...
Merge commit '844389724d4557e7b94b42c6b2a8347e2d76dfae'
* commit '844389724d4557e7b94b42c6b2a8347e2d76dfae':
Add patent disclaimer to appropriate directories (#2079270 )
2009-10-12 11:28:21 -07:00
Ray Chen
fb9a75c63e
am 28ef6753
: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
...
Merge commit '28ef67532042fe2e3262c100dba1da469bec7971'
* commit '28ef67532042fe2e3262c100dba1da469bec7971':
2009-10-12 11:28:17 -07:00
Marc Blank
801c803d8b
am d6951a65
: am c9e05f16
: Merge change I13229d84 into eclair
...
Merge commit 'd6951a657803e909b519a59fe5ca35799dcc384b'
* commit 'd6951a657803e909b519a59fe5ca35799dcc384b':
Change logging command to help debug Moto issue (#2165649 )
2009-10-12 11:09:33 -07:00
Mihai Preda
5e1a6b6806
am 84ae53c8
: am ba7decd8
: Merge change I1197ac76 into eclair
...
Merge commit '84ae53c85014715f9852438305a628824d27dce4'
* commit '84ae53c85014715f9852438305a628824d27dce4':
MessageCompose: allow sending email when started through external intent.
2009-10-12 11:09:29 -07:00