Commit Graph

1572 Commits

Author SHA1 Message Date
Andrew Stadler
b5a29a129b am e90fc949: am d5e7afa1: Remove obsolete resources & code
Merge commit 'e90fc94938f7ba3a4c78296e212021e5864c1a6b'

* commit 'e90fc94938f7ba3a4c78296e212021e5864c1a6b':
  Remove obsolete resources & code
2009-10-13 16:57:41 -07:00
Marc Blank
ce853897f9 am 42336c27: am 8be9b893: am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)
Merge commit '42336c27d3394bb7c2466d6f87981fd5e4b9c915'

* commit '42336c27d3394bb7c2466d6f87981fd5e4b9c915':
  Make sure we hold WakeLock during mail sending (fixes #2180551)
2009-10-13 16:57:37 -07:00
Marc Blank
e91a6d874d am 82aaf28b: am 0fd132d2: Merge change I5de51a43 into eclair-mr2
Merge commit '82aaf28b63179bcf018eca816ad9b57d79a38079'

* commit '82aaf28b63179bcf018eca816ad9b57d79a38079':
  Allow photo changes to be uploaded to Exchange (fixes #2179082)
2009-10-13 16:57:34 -07:00
Mike Cleron
6df0cf27af am 36cb41da: am 4cce00d6: am 479b22a2: Make multiselect buttons update when the list state changes
Merge commit '36cb41da267674faee631a48dbd9eb6dd2cd7c9a'

* commit '36cb41da267674faee631a48dbd9eb6dd2cd7c9a':
2009-10-13 16:52:51 -07:00
Evan Millar
a9203eec40 am 0daaa362: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
Merge commit '0daaa3625c8f02ca2c8b79b9c44f8b3938a43388'

* commit '0daaa3625c8f02ca2c8b79b9c44f8b3938a43388':
  Make multiselect buttons update when the list state changes
2009-10-13 16:52:47 -07:00
Marc Blank
18d8b83986 am ae968df1: am 7a8bbfe0: am 4b59cfc8: Fix problem with timeouts and sending attachments (#2178288)
Merge commit 'ae968df16d331f5bb38b5a861eabf563b032e4fd'

* commit 'ae968df16d331f5bb38b5a861eabf563b032e4fd':
2009-10-13 16:52:29 -07:00
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
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
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
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
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
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
Marc Blank
348e286277 am c0d9120f: am bb7a6c54: Merge change Icb449407 into eclair
Merge commit 'c0d9120ffbfbcd81d5b256a5f02d1d32e910d7c7'

* commit 'c0d9120ffbfbcd81d5b256a5f02d1d32e910d7c7':
  Fix push failure edge case (#2161999)
2009-10-12 11:09:20 -07:00
Eric Fischer
113370451a am 343fe5d8: (-s ours) am 2787f001: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '343fe5d8f86e97acb7918b4651ee2091b6e43f3e'

* commit '343fe5d8f86e97acb7918b4651ee2091b6e43f3e':
  Import revised translations.  DO NOT MERGE
2009-10-12 11:09:16 -07:00
Marc Blank
dec89d97ce am 1eb0af5d: Fix NPE issue w/ Contacts sync (#2160417)
Merge commit '1eb0af5d80514d03acca7ce040a8c01230f3c47e'

* commit '1eb0af5d80514d03acca7ce040a8c01230f3c47e':
  Fix NPE issue w/ Contacts sync (#2160417)
2009-10-12 11:09:01 -07:00
Andrew Stadler
e90fc94938 am d5e7afa1: Remove obsolete resources & code
Merge commit 'd5e7afa1ebd6ffe29338e69e709d7998e6572137' into eclair-mr2-plus-aosp

* commit 'd5e7afa1ebd6ffe29338e69e709d7998e6572137':
  Remove obsolete resources & code
2009-10-12 10:29:44 -07:00
Marc Blank
42336c27d3 am 8be9b893: am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)
Merge commit '8be9b8937be04cc50e7fd2e79d2d91c99aace1b5' into eclair-mr2-plus-aosp

* commit '8be9b8937be04cc50e7fd2e79d2d91c99aace1b5':
  Make sure we hold WakeLock during mail sending (fixes #2180551)
2009-10-12 10:24:41 -07:00
Marc Blank
82aaf28b63 am 0fd132d2: Merge change I5de51a43 into eclair-mr2
Merge commit '0fd132d26c0846c00419cae124fb7f881331418b' into eclair-mr2-plus-aosp

* commit '0fd132d26c0846c00419cae124fb7f881331418b':
  Allow photo changes to be uploaded to Exchange (fixes #2179082)
2009-10-12 10:23:40 -07:00
Andrew Stadler
d5e7afa1eb Remove obsolete resources & code
* FolderMessageList
* Fat title bar (remnants)
* Drawables

Bug # http://b/2071133
2009-10-11 22:09:39 -07:00
Marc Blank
8be9b8937b am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)
Merge commit 'ea878be11729cd793d9183fc264118241cd5a5b6' into eclair-mr2

* commit 'ea878be11729cd793d9183fc264118241cd5a5b6':
  Make sure we hold WakeLock during mail sending (fixes #2180551)
2009-10-10 22:59:05 -07:00
Marc Blank
ea878be117 Make sure we hold WakeLock during mail sending (fixes #2180551)
* Don't runAsleep unless this is a Ping
* Relates to #2178288 in that it's possible that the system could
  sleep while we're trying to send (not sure if this is possible;
  will check), so we prevent it by holding a WakeLock in this case

Change-Id: Ib3f8786501b942e1cfcb7a0bbb07b8e3084e2a86
2009-10-10 22:54:24 -07:00
Android (Google) Code Review
0fd132d26c Merge change I5de51a43 into eclair-mr2
* changes:
  Allow photo changes to be uploaded to Exchange (fixes #2179082)
2009-10-09 21:57:55 -04:00
Marc Blank
59da135e15 Allow photo changes to be uploaded to Exchange (fixes #2179082)
Change-Id: I5de51a4313c43dbe4e3d12d4d0e11b20adedaa8f
2009-10-09 14:34:53 -07:00
Mike Cleron
36cb41da26 am 4cce00d6: am 479b22a2: Make multiselect buttons update when the list state changes
Merge commit '4cce00d6c4c70bfc43409f677556ef07098d3700' into eclair-mr2-plus-aosp

* commit '4cce00d6c4c70bfc43409f677556ef07098d3700':
2009-10-09 13:33:55 -07:00
Evan Millar
0daaa3625c Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp 2009-10-09 13:33:55 -07:00