Commit Graph

983 Commits

Author SHA1 Message Date
Eric Fischer
5b803250cf am 4abd6de5: Merge change 25578 into eclair
Merge commit '4abd6de5f8c38ec4827f15ca37cb96a3659b8b15' into eclair-plus-aosp

* commit '4abd6de5f8c38ec4827f15ca37cb96a3659b8b15':
  Import revised translations.  DO NOT MERGE
2009-09-17 15:08:55 -07:00
Android (Google) Code Review
4abd6de5f8 Merge change 25578 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-09-17 18:02:16 -04:00
Marc Blank
c9f830d9e7 am b9213876: Fix issue with older messages not getting deleted properly from device
Merge commit 'b9213876f6a233baca501d3502c3ed868c32a2e6' into eclair-plus-aosp

* commit 'b9213876f6a233baca501d3502c3ed868c32a2e6':
  Fix issue with older messages not getting deleted properly from device
2009-09-17 14:38:48 -07:00
Eric Fischer
468c2dedfc Import revised translations. DO NOT MERGE 2009-09-17 14:31:25 -07:00
Marc Blank
b9213876f6 Fix issue with older messages not getting deleted properly from device
Change-Id: I3c3a7b6c7c6983cad47826543f9ac4291c6b2a69
2009-09-17 14:19:44 -07:00
Marc Blank
7b73b440b7 am 3f224e7e: Use StructuredName.DISPLAY_NAME for Email display name on new contacts
Merge commit '3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b' into eclair-plus-aosp

* commit '3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b':
  Use StructuredName.DISPLAY_NAME for Email display name on new contacts
2009-09-17 10:23:13 -07:00
Marc Blank
b4b87a343f am 492e8498: Merge change 25427 into eclair
Merge commit '492e8498e75c8f3faec17cc89bcabc8c5d7d1ca9' into eclair-plus-aosp

* commit '492e8498e75c8f3faec17cc89bcabc8c5d7d1ca9':
  Don't add backslash if there already is one; fixes #2124974
2009-09-17 10:23:09 -07:00
Marc Blank
2aa9724ea0 am e7e1ca43: Change AccountManager username for Exchange to the user\'s login credential
Merge commit 'e7e1ca432e1aace5b7f11a3f1684a4abc503e6b2' into eclair-plus-aosp

* commit 'e7e1ca432e1aace5b7f11a3f1684a4abc503e6b2':
  Change AccountManager username for Exchange to the user's login credential
2009-09-17 10:23:05 -07:00
Marc Blank
3f224e7efe Use StructuredName.DISPLAY_NAME for Email display name on new contacts
* Fixes #2115514

Change-Id: Ib9c437a1cbcbcf1069692e8d5d17d29e80369418
2009-09-17 10:14:12 -07:00
Android (Google) Code Review
492e8498e7 Merge change 25427 into eclair
* changes:
  Don't add backslash if there already is one; fixes #2124974
2009-09-17 13:07:59 -04:00
Marc Blank
e7e1ca432e Change AccountManager username for Exchange to the user's login credential
* This is not a backward-compatible change (sorry)
* Existing AccountManager EAS accounts and contacts are deleted
* Existing EmailProvider data is deleted
* Change works with new code (stadler) to avoid account duplication

Change-Id: Ife09c51fa714d91054d017b497bce603add5375a
2009-09-17 10:06:27 -07:00
Marc Blank
51e02f3ef8 am c0228398: Implement HOME/WORK phones as multiple typed rows
Merge commit 'c022839861c26b8f073144b32a7527ba842c1181' into eclair-plus-aosp

* commit 'c022839861c26b8f073144b32a7527ba842c1181':
  Implement HOME/WORK phones as multiple typed rows
2009-09-17 08:45:20 -07:00
Marc Blank
a380b1a2e8 am 767ea863: Merge change 25344 into eclair
Merge commit '767ea863986c1d03332ca43591106510de0c8725' into eclair-plus-aosp

* commit '767ea863986c1d03332ca43591106510de0c8725':
  Add "Sync Contacts" to Account preferences screen (part of #2106733)
2009-09-17 08:42:01 -07:00
Andrew Stadler
6da8c4bb60 am b734bfc0: Merge change 25320 into eclair
Merge commit 'b734bfc08b28ea87c507ddcbce4487aa96a73fee' into eclair-plus-aosp

* commit 'b734bfc08b28ea87c507ddcbce4487aa96a73fee':
  Fix NumberFormatException in POP3 message sync
2009-09-17 08:40:08 -07:00
satok
3449b3184c Fix sort order of MailboxList
BUG: 2083746
2009-09-17 17:33:19 +09:00
Marc Blank
c022839861 Implement HOME/WORK phones as multiple typed rows
Change-Id: I7e1c885e7735022026df9599babd48f5dbf71af9
2009-09-16 19:57:19 -07:00
Marc Blank
acfd155c12 Don't add backslash if there already is one; fixes #2124974
Change-Id: If5fa8369ee4c52449047d5134f3bf28feb88de1a
2009-09-16 18:55:28 -07:00
Android (Google) Code Review
767ea86398 Merge change 25344 into eclair
* changes:
  Add "Sync Contacts" to Account preferences screen (part of #2106733)
2009-09-16 19:11:28 -04:00
Marc Blank
e428f94161 Add "Sync Contacts" to Account preferences screen (part of #2106733)
* Also added some checks for null Accounts and HostAuth

Change-Id: Ia4ae68d0e8a62abdaf002519766b6685b6947e9e
2009-09-16 16:07:27 -07:00
Android (Google) Code Review
b734bfc08b Merge change 25320 into eclair
* changes:
  Fix NumberFormatException in POP3 message sync
2009-09-16 17:54:03 -04:00
Marc Blank
b8ed678308 am ec11b965: Merge change 25348 into eclair
Merge commit 'ec11b9658b162c8abcf9757591df4fc49639565f' into eclair-plus-aosp

* commit 'ec11b9658b162c8abcf9757591df4fc49639565f':
  Fix "reloadFolderList" service call in SyncManager
2009-09-16 14:33:28 -07:00
Android (Google) Code Review
ec11b9658b Merge change 25348 into eclair
* changes:
  Fix "reloadFolderList" service call in SyncManager
2009-09-16 17:28:31 -04:00
Marc Blank
5ebdc0efeb Fix "reloadFolderList" service call in SyncManager
* Fixes #2118439

Change-Id: Iee75c5902940fb7f38f19717306708809fa06dd5
2009-09-16 14:27:39 -07:00
Andrew Stadler
092d35c98d Fix NumberFormatException in POP3 message sync
* Write unit test to replicate failure(s) in POP3 use of parseInt.  All
    calls to parseInt must be guarded by try/catch NumberFormatException.
* Fix the failures

Bug # 2115586
2009-09-16 12:20:38 -07:00
Andrew Stadler
2077e5efa2 am 0c4dc851: Harden against crashes caused by account deletes
Merge commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313' into eclair-plus-aosp

* commit '0c4dc85190028f389f0dcbc3dbed0b344d20a313':
  Harden against crashes caused by account deletes
2009-09-16 11:05:35 -07:00
Andrew Stadler
0c4dc85190 Harden against crashes caused by account deletes
The basic failure mode is to delete an account while it is being
synced or some other background activity.  The fixes in this CL will
harden against this, but it will not be a perfect solution; That
will require shutting down all sync, which is difficult in the current
too-many-threads implementation.

Primary bug# 2112564
2009-09-16 10:58:54 -07:00
Marc Blank
a3a60bc1b4 am fc7dfddf: Merge change 25130 into eclair
Merge commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af' into eclair-plus-aosp

* commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af':
  Support StructuredName.DISPLAY_NAME for Exchange contacts
2009-09-15 20:17:17 -07:00
Android (Google) Code Review
fc7dfddf19 Merge change 25130 into eclair
* changes:
  Support StructuredName.DISPLAY_NAME for Exchange contacts
2009-09-15 23:12:24 -04:00
satok
a3e8386f98 am 2aa3e92f: Merge change 25041 into eclair
Merge commit '2aa3e92fe3b4dde20f388ccf2a9502d12ad6969c' into eclair-plus-aosp

* commit '2aa3e92fe3b4dde20f388ccf2a9502d12ad6969c':
  show message list selection
2009-09-15 19:02:11 -07:00
Android (Google) Code Review
2aa3e92fe3 Merge change 25041 into eclair
* changes:
  show message list selection
2009-09-15 21:56:59 -04:00
satok
5569ec9c9d show message list selection
BUG: 2117057

* add styles for items in MessageListView
* reduce color diff of Read/Unread
2009-09-16 10:55:28 +09:00
Marc Blank
16e4608ab5 am ac37c5c1: Change Exchange username validation to exclude bare backslash
Merge commit 'ac37c5c15a3fd4f91f264800966da8e28f338c87' into eclair-plus-aosp

* commit 'ac37c5c15a3fd4f91f264800966da8e28f338c87':
  Change Exchange username validation to exclude bare backslash
2009-09-15 18:10:12 -07:00
Marc Blank
ac37c5c15a Change Exchange username validation to exclude bare backslash
* Fixes #2121422

Change-Id: Id55dfa365b83d725926e3e7dcd7b646256863aa1
2009-09-15 18:05:16 -07:00
Andrew Stadler
59ce4670b5 am da8836a7: Give warnings if dupe account created:
Merge commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066' into eclair-plus-aosp

* commit 'da8836a76cd8a6eaa7e3693eeacc6393870b2066':
  Give warnings if dupe account created:
2009-09-15 16:43:26 -07:00
Andrew Stadler
da8836a76c Give warnings if dupe account created:
* Check for existing accounts with matching servername + username
* Show a dialog and block account creation
* Triggers in three cases:
  * After input of an auto-setup account (e.g. Gmail or AOL)
  * After input of manual setup (incoming) parameters
  * After changing incoming parameters of *any* existing account
* Made some notes in EmailContent regarding fields in HostAuth that we
    are not actually using.
* Added HostAuth unit tests

Primarily fixes bug # 1964449
Bonus fix for bug # 1594408

Change-Id: I49310faf6654280582e0ab3d3e40f2701bfcd21d
2009-09-15 16:33:44 -07:00
Marc Blank
1fd13dc9fb am f2147b18: Merge change 25159 into eclair
Merge commit 'f2147b183414d4ffc754c95e101c9a64a53c4a40' into eclair-plus-aosp

* commit 'f2147b183414d4ffc754c95e101c9a64a53c4a40':
  Fix EAS sending (#2122221)
2009-09-15 16:28:42 -07:00
Android (Google) Code Review
f2147b1834 Merge change 25159 into eclair
* changes:
  Fix EAS sending (#2122221)
2009-09-15 19:23:40 -04:00
Marc Blank
a84a0e9a0d Fix EAS sending (#2122221)
Change-Id: I92ea4b1a77d96bf7992ea34026a2c5d30f33c317
2009-09-15 16:20:34 -07:00
Andrew Stadler
0ef15157e2 am c21d326e: Merge change 25145 into eclair
Merge commit 'c21d326ef00b6fdbf01d69c32d57bc55b9109a9e' into eclair-plus-aosp

* commit 'c21d326ef00b6fdbf01d69c32d57bc55b9109a9e':
  Disable testResolveInlineImage
2009-09-15 16:08:39 -07:00
Android (Google) Code Review
c21d326ef0 Merge change 25145 into eclair
* changes:
  Disable testResolveInlineImage
2009-09-15 19:03:06 -04:00
Andrew Stadler
1761234fc6 Disable testResolveInlineImage
This test depends on LocalStore and is thus deprecated.

It very much needs to be be rewritten and reestablished.

Bug # 2121424
2009-09-15 15:55:23 -07:00
Marc Blank
bb618d8892 am 2d5691ca: Support bcc in Exchange (Fixes #2117849)
Merge commit '2d5691cac1874eb3491353ab608a84c2a75e2b62' into eclair-plus-aosp

* commit '2d5691cac1874eb3491353ab608a84c2a75e2b62':
  Support bcc in Exchange (Fixes #2117849)
2009-09-15 15:24:58 -07:00
Marc Blank
2d5691cac1 Support bcc in Exchange (Fixes #2117849)
* Must send the bcc header for EAS

Change-Id: I38d119beed334c6bb23a09b87375804f8c03ea76
2009-09-15 15:18:46 -07:00
Marc Blank
71177c5375 Support StructuredName.DISPLAY_NAME for Exchange contacts
* Fixes #2115514

Change-Id: Iac348c4ecac3bf8f895c32fff7077bc36d385bc9
2009-09-15 14:34:03 -07:00
Marc Blank
42e18b2edb am ffc681a4: Handle the case of no body being present (happens in unit tests)
Merge commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0' into eclair-plus-aosp

* commit 'ffc681a4da85c82c80d819ab8afb4442577c52a0':
  Handle the case of no body being present (happens in unit tests)
2009-09-15 14:21:01 -07:00
Fred Quintana
8831da7a24 am 3bef6101: Merge change 24991 into eclair
Merge commit '3bef61019605176b3397b5ae659205ac324689ed' into eclair-plus-aosp

* commit '3bef61019605176b3397b5ae659205ac324689ed':
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-15 13:46:15 -07:00
Marc Blank
ffc681a4da Handle the case of no body being present (happens in unit tests)
* Fixes #2121403
2009-09-15 13:08:55 -07:00
Android (Google) Code Review
3bef610196 Merge change 24991 into eclair
* changes:
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-15 15:26:50 -04:00
satok
7355f0fab1 am 0cc0e709: Rename adding/removing star strings
Merge commit '0cc0e7094165a40291fbfd7c0f9cbdfcb78d30fd' into eclair-plus-aosp

* commit '0cc0e7094165a40291fbfd7c0f9cbdfcb78d30fd':
  Rename adding/removing star strings
2009-09-15 01:12:24 -07:00
satok
0cc0e70941 Rename adding/removing star strings
BUG: 2116258
2009-09-15 16:05:14 +09:00