Commit Graph

855 Commits

Author SHA1 Message Date
satok
ec5f83fa7a am 9e7a9801: Rename name of color
Merge commit '9e7a9801c7e08557c1b57433f58c519caf504ccb' into eclair-plus-aosp

* commit '9e7a9801c7e08557c1b57433f58c519caf504ccb':
  Rename name of color
2009-09-17 22:21:45 -07:00
Andrew Stadler
db601c4776 am 27bc3939: Turn off debugging code that was accidentally left on.
Merge commit '27bc39399e47e8f14cbb42834990546eb93851de' into eclair-plus-aosp

* commit '27bc39399e47e8f14cbb42834990546eb93851de':
  Turn off debugging code that was accidentally left on.
2009-09-17 22:21:41 -07:00
satok
9e7a9801c7 Rename name of color
BUG: 1904417
2009-09-18 13:55:02 +09:00
satok
31f6624b84 am a6888d74: Merge change 25459 into eclair
Merge commit 'a6888d7448f27b39cb66a26efedf38b06ff9adae' into eclair-plus-aosp

* commit 'a6888d7448f27b39cb66a26efedf38b06ff9adae':
  Fix sort order of MailboxList
2009-09-17 21:15:24 -07:00
Andrew Stadler
27bc39399e Turn off debugging code that was accidentally left on.
This goes with Change I52e53c4b.

Change-Id: Ife5672af1c0c5cf2b2c279a9a912beb26c64390d
2009-09-17 21:15:17 -07:00
Android (Google) Code Review
a6888d7448 Merge change 25459 into eclair
* changes:
  Fix sort order of MailboxList
2009-09-18 00:06:56 -04:00
satok
7ac694965c am 8b240ed9: Merge change 25691 into eclair
Merge commit '8b240ed9dc57425804ed816265be7a032be21717' into eclair-plus-aosp

* commit '8b240ed9dc57425804ed816265be7a032be21717':
  UI Refulesh of account folder list
2009-09-17 19:49:57 -07:00
Android (Google) Code Review
8b240ed9dc Merge change 25691 into eclair
* changes:
  UI Refulesh of account folder list
2009-09-17 22:45:14 -04:00
satok
d4f5b786ea UI Refulesh of account folder list
BUG:1904417

* rename name
2009-09-18 11:41:58 +09:00
satok
3ffccb0b54 am 925be3bf: Merge change 25462 into eclair
Merge commit '925be3bf76a943375947be8565800c24e4d27a6c' into eclair-plus-aosp

* commit '925be3bf76a943375947be8565800c24e4d27a6c':
  UI Refuresh of account folder list
2009-09-17 19:40:27 -07:00
Android (Google) Code Review
925be3bf76 Merge change 25462 into eclair
* changes:
  UI Refuresh of account folder list
2009-09-17 22:35:29 -04:00
satok
15206a12e8 UI Refuresh of account folder list
BUG: 1904417

* Extend chip
* Add separator between a folder button and account name
2009-09-18 11:33:30 +09:00
Marc Blank
739315b19b am fcdebb69: Merge change 25677 into eclair
Merge commit 'fcdebb69a5f7790c377e11e913536977cff19471' into eclair-plus-aosp

* commit 'fcdebb69a5f7790c377e11e913536977cff19471':
  Revert very bad commit (strange merge problem)?
2009-09-17 19:07:12 -07:00
Android (Google) Code Review
fcdebb69a5 Merge change 25677 into eclair
* changes:
  Revert very bad commit (strange merge problem)?
2009-09-17 22:01:40 -04:00
Marc Blank
4a72c2e726 Revert very bad commit (strange merge problem)?
* This reverts commit 3f224e7efe.
* Use StructuredName.DISPLAY_NAME for Email display name on upload

Change-Id: Ic11713773d0e5b0db452dce3c9c31680ca45dbf5
2009-09-17 18:58:08 -07:00
Andrew Stadler
8b287420c5 am 01f61ef9: Fix acct settings -> inbox checks -> notifications
Merge commit '01f61ef912879c12665d2073917626cb3ee7df0a' into eclair-plus-aosp

* commit '01f61ef912879c12665d2073917626cb3ee7df0a':
  Fix acct settings -> inbox checks -> notifications
2009-09-17 18:47:31 -07:00
Andrew Stadler
01f61ef912 Fix acct settings -> inbox checks -> notifications
This cleans up a number of bugs that could be generically described as
"MailService and Notifications not being updated when accounts or account
settings are changed."

This also fixes a number of race conditions, one of which was causing
accounts to be refreshed in a nearly-endless loop, and another which
could cause an endless loop of alarms to be posted & fired..

Specific changes:
* Update/reschedule any time an account is edited (this was accidentally
    broken and being handled on EAS only.)
* Make sure we reschedule if an account becomes unavailable
* Clear notifications whenever refreshing accounts
* Reload local copy of account settings whenever refreshing accounts
* When restoring prev sync times (this happens when process is killed),
    be sure to also recalculate next sync times.
* Set flags on the pending intents to make sure old pending intents are
    not being reused.
* Set a watchdog each time we check the mail, so if we are killed during
    the mail check, we will be woken up again to retry.
* Fix a 2nd race condition in which a just-created account fails to sync,
    due to not (yet) having an inbox.
* Clean up handling of Controller callback:
  * Fix a minor bug in which refresh of non-inbox mailboxes would delay
      the next timed sync of the inbox for that account.
  * If the checkmail ended in an error (result != null) the service was
      never rescheduled.

Bugs Fixed:
bug 2078149 - Update service and notifications when account settings
   change or accounts are added/deleted.
bug 2084412 - Fix race condition caused by first intent being refired
bug 2071484 - Make sure we wake up later if killed during mail check

Change-Id: I3ee0d1b389c652351de5eb798c32a2daea244067
2009-09-17 18:35:43 -07:00
Marc Blank
725bf7bb85 am 7e89834c: Fix problem w/ SmartReply & SmartForward in Exchange 2003
Merge commit '7e89834cfd920a3c4c3fe29d18fae2f7cf4fcbbc' into eclair-plus-aosp

* commit '7e89834cfd920a3c4c3fe29d18fae2f7cf4fcbbc':
  Fix problem w/ SmartReply & SmartForward in Exchange 2003
2009-09-17 16:00:47 -07:00
Marc Blank
7e89834cfd Fix problem w/ SmartReply & SmartForward in Exchange 2003
* It doesn't like URLEncoded commands; go figure!
* Fixes #2127892

Change-Id: Ibae8cad990ed45accb6699716fda56f45c850939
2009-09-17 15:50:52 -07:00
Marc Blank
77c7e549d5 am f671401a: Merge change 25610 into eclair
Merge commit 'f671401a3abb852862d6f49a279974a78bc0d1b4' into eclair-plus-aosp

* commit 'f671401a3abb852862d6f49a279974a78bc0d1b4':
  Add logging to EasOutboxService to help find sending issues
2009-09-17 15:30:40 -07:00
Android (Google) Code Review
f671401a3a Merge change 25610 into eclair
* changes:
  Add logging to EasOutboxService to help find sending issues
2009-09-17 18:22:49 -04:00
Marc Blank
0d1f7add7d Add logging to EasOutboxService to help find sending issues
Change-Id: I8188fd2977724ae4ee6a8703098b7068c14b92fd
2009-09-17 15:20:00 -07:00
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