Commit Graph

1042 Commits

Author SHA1 Message Date
satok
9613fa32e1 am b0d5ff7d: am 666dd867: Move chip in mailbox to the left
Merge commit 'b0d5ff7df6121487c66ab3dbeb69a357d972cbe7'

* commit 'b0d5ff7df6121487c66ab3dbeb69a357d972cbe7':
  Move chip in mailbox to the left
2009-09-18 00:04:57 -07:00
satok
b0d5ff7df6 am 666dd867: Move chip in mailbox to the left
Merge commit '666dd867625d52c26d42e68e837f2e5234efb1bd' into eclair-plus-aosp

* commit '666dd867625d52c26d42e68e837f2e5234efb1bd':
  Move chip in mailbox to the left
2009-09-17 23:59:49 -07:00
satok
666dd86762 Move chip in mailbox to the left 2009-09-18 15:54:03 +09:00
satok
b7ea5f44db am ec5f83fa: am 9e7a9801: Rename name of color
Merge commit 'ec5f83fa7a55c1dda7303d3da7bbeb3b785f44df'

* commit 'ec5f83fa7a55c1dda7303d3da7bbeb3b785f44df':
  Rename name of color
2009-09-17 22:27:23 -07:00
Andrew Stadler
673c6cd908 am db601c47: am 27bc3939: Turn off debugging code that was accidentally left on.
Merge commit 'db601c4776d7baed4fd66b4aad2188e50c1d4007'

* commit 'db601c4776d7baed4fd66b4aad2188e50c1d4007':
  Turn off debugging code that was accidentally left on.
2009-09-17 22:27:18 -07:00
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
cc14df13c7 am 31f6624b: am a6888d74: Merge change 25459 into eclair
Merge commit '31f6624b84f9422da25c1ce5d5d42cf9c139c7de'

* commit '31f6624b84f9422da25c1ce5d5d42cf9c139c7de':
  Fix sort order of MailboxList
2009-09-17 21:20:16 -07: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
d58d21624f am 7ac69496: am 8b240ed9: Merge change 25691 into eclair
Merge commit '7ac694965c3f1d0d609b7143b1d06e208d856702'

* commit '7ac694965c3f1d0d609b7143b1d06e208d856702':
  UI Refulesh of account folder list
2009-09-17 19:54:32 -07: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
24926a46e7 am 3ffccb0b: am 925be3bf: Merge change 25462 into eclair
Merge commit '3ffccb0b54c62c8f23383f485d9a423262e5a193'

* commit '3ffccb0b54c62c8f23383f485d9a423262e5a193':
  UI Refuresh of account folder list
2009-09-17 19:44:58 -07: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
e199b21091 am 739315b1: am fcdebb69: Merge change 25677 into eclair
Merge commit '739315b19b75f3c48e680a3773d187d26054b8d5'

* commit '739315b19b75f3c48e680a3773d187d26054b8d5':
  Revert very bad commit (strange merge problem)?
2009-09-17 19:12:36 -07: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
c81b769aa3 am 8b287420: am 01f61ef9: Fix acct settings -> inbox checks -> notifications
Merge commit '8b287420c533e08ce4ec7a8ab93e3626d99ff931'

* commit '8b287420c533e08ce4ec7a8ab93e3626d99ff931':
  Fix acct settings -> inbox checks -> notifications
2009-09-17 18:52:16 -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
3932cf2ee3 am 725bf7bb: am 7e89834c: Fix problem w/ SmartReply & SmartForward in Exchange 2003
Merge commit '725bf7bb85c8358656c3c1775dc65b14af709f2a'

* commit '725bf7bb85c8358656c3c1775dc65b14af709f2a':
  Fix problem w/ SmartReply & SmartForward in Exchange 2003
2009-09-17 16:06:03 -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
37d49643bf am 77c7e549: am f671401a: Merge change 25610 into eclair
Merge commit '77c7e549d5b972de182b619b79d2fe6d13567731'

* commit '77c7e549d5b972de182b619b79d2fe6d13567731':
  Add logging to EasOutboxService to help find sending issues
2009-09-17 15:35:35 -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
5f57f4eea2 am 5b803250: (-s ours) am 4abd6de5: Merge change 25578 into eclair
Merge commit '5b803250cf5edda5bdba90285b4da92c3738d982'

* commit '5b803250cf5edda5bdba90285b4da92c3738d982':
  Import revised translations.  DO NOT MERGE
2009-09-17 15:14:16 -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
47d53db631 am c9f830d9: am b9213876: Fix issue with older messages not getting deleted properly from device
Merge commit 'c9f830d9e7560af42864ea47e512b677a080dfc7'

* commit 'c9f830d9e7560af42864ea47e512b677a080dfc7':
  Fix issue with older messages not getting deleted properly from device
2009-09-17 14:58:37 -07: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
84d4acfb73 am 7b73b440: am 3f224e7e: Use StructuredName.DISPLAY_NAME for Email display name on new contacts
Merge commit '7b73b440b78e157d641b68ece4101d23b4213fd9'

* commit '7b73b440b78e157d641b68ece4101d23b4213fd9':
  Use StructuredName.DISPLAY_NAME for Email display name on new contacts
2009-09-17 12:17:33 -07:00
Marc Blank
0941e7e844 am b4b87a34: am 492e8498: Merge change 25427 into eclair
Merge commit 'b4b87a343fb98478cc0c87ebe7b27595d1e95534'

* commit 'b4b87a343fb98478cc0c87ebe7b27595d1e95534':
  Don't add backslash if there already is one; fixes #2124974
2009-09-17 12:17:29 -07:00
Marc Blank
5d758e26e3 am 2aa9724e: am e7e1ca43: Change AccountManager username for Exchange to the user\'s login credential
Merge commit '2aa9724ea02979e9ddbde4c570949f3de4e75987'

* commit '2aa9724ea02979e9ddbde4c570949f3de4e75987':
  Change AccountManager username for Exchange to the user's login credential
2009-09-17 12:17:25 -07:00
Marc Blank
9b54f316a0 am 51e02f3e: am c0228398: Implement HOME/WORK phones as multiple typed rows
Merge commit '51e02f3ef865e1fc8a2637f1b17b0e9beee4a7b4'

* commit '51e02f3ef865e1fc8a2637f1b17b0e9beee4a7b4':
  Implement HOME/WORK phones as multiple typed rows
2009-09-17 12:17:21 -07:00
Marc Blank
12478ba6a3 am a380b1a2: am 767ea863: Merge change 25344 into eclair
Merge commit 'a380b1a2e89688d7bb8bb64d5096399f59e452ea'

* commit 'a380b1a2e89688d7bb8bb64d5096399f59e452ea':
  Add "Sync Contacts" to Account preferences screen (part of #2106733)
2009-09-17 12:17:17 -07:00
Andrew Stadler
ca79851fe7 am 6da8c4bb: am b734bfc0: Merge change 25320 into eclair
Merge commit '6da8c4bb60679ddd08ffb91d9db421e2b4597ca6'

* commit '6da8c4bb60679ddd08ffb91d9db421e2b4597ca6':
  Fix NumberFormatException in POP3 message sync
2009-09-17 12:17:13 -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