Commit Graph

3322 Commits

Author SHA1 Message Date
Marc Blank
dfd0094f0e am 898dfae0: (-s ours) am 4e03d94c: DO NOT MERGE: Set HAS_ATTENDEE_DATA to 0 for exceptions
Merge commit '898dfae072c9e2f103391889a8eba63e3da6744b'

* commit '898dfae072c9e2f103391889a8eba63e3da6744b':
  DO NOT MERGE: Set HAS_ATTENDEE_DATA to 0 for exceptions
2010-09-20 12:08:22 -07:00
Marc Blank
898dfae072 am 4e03d94c: DO NOT MERGE: Set HAS_ATTENDEE_DATA to 0 for exceptions
Merge commit '4e03d94cccc2e798a08162c270b39233f39be093' into gingerbread-plus-aosp

* commit '4e03d94cccc2e798a08162c270b39233f39be093':
  DO NOT MERGE: Set HAS_ATTENDEE_DATA to 0 for exceptions
2010-09-20 12:05:45 -07:00
Marc Blank
4e03d94ccc DO NOT MERGE: Set HAS_ATTENDEE_DATA to 0 for exceptions
Bug: 2891708
Change-Id: I4eb26a6fe7be13dda34ba39a766a03c901276b73
2010-09-20 11:12:29 -07:00
Makoto Onuki
0435a0775e Let MessageViewFragment own bottom buttons.
Create a custom view containing the bottons below MVF
(delete, move, reply, etc) and let MVF own this.

These buttons used to be owned by the XL activity itself, because
the UI for these commands will most likely be totally different
from the tablet UI, so the fragment having them looked wrong.

However, this made it harder to make changes suggested by the latest
mock, such as "put reply/forward in the message header".
I think the buttons are semantically part of the message view anyway,
so the fragment owning UI for these commands is probably the way to go.
(And let's worry about the phone UI later.)

Reason for the use of a custom view is that it will make it easier
to make non-trivial UI changes, e.g. "combine reply, reply-all and
forward and make it dropdown."

Also removed obsolete TODOs from MessageListXL.

Change-Id: Ibf93f4c70fe07bdbbe33d2adb6bbd2b96812830d
2010-09-17 14:23:56 -07:00
Makoto Onuki
2039cba065 Merge "Make "load more" work" 2010-09-16 09:56:10 -07:00
Makoto Onuki
8a79d2ab4f Merge "Show account names (nickname) on action bar" 2010-09-16 09:55:58 -07:00
Marc Blank
517c4f39b7 HTML support for EAS 2.5 email
* Load MIME data for these messages and parse, looking for a body either
  in HTML or plain text or both
* If the MIME data had been trunctated and we can't find text, mark the
  message as partially loaded and load the body text as we did before
  (i.e. get the plain text body); this should be a rare case

TODO: Consider what is testable in the new EmailSyncAdapter code

Change-Id: I00a3066a373a0596431335593de356a4dda7f036
2010-09-15 20:20:15 -07:00
Marc Blank
626e2180be Merge "Remove GAL lookup dependency on running ExchangeService" 2010-09-15 18:25:33 -07:00
Marc Blank
74444e73c2 Remove GAL lookup dependency on running ExchangeService
Change-Id: I4ff4017bcbb29862e07fde63e2ac01e3552ccd83
2010-09-15 17:57:03 -07:00
Makoto Onuki
130c7bdec1 Fix "Sent outgoing messages"
sendPendingMessages() takes account IDs.  Don't pass mailbox IDs.

Bug 2985577

Change-Id: Id4abce6de67f55809aad9d4bd2aa6419b4530e3a
2010-09-15 16:49:36 -07:00
Makoto Onuki
0d21aa395a Make "load more" work
Wasn't implemented...

Bug 3004954

Change-Id: Id44bcf936fab2965b032bbc5621045825aab5292
2010-09-15 16:28:35 -07:00
Makoto Onuki
a209096420 Show account names (nickname) on action bar
if available, instead of email addresses.
Also make sure the change to the display name will be reflected to
the UI.

Bug 2149083
Bug 3002398

Change-Id: I4aa4ffcec3a81688b3fb11182aacd546c310f117
2010-09-15 16:20:01 -07:00
Andrew Stadler
0b24baa130 Merge "Fix debug logging controls" 2010-09-15 11:07:21 -07:00
Andrew Stadler
e36b6ff4fa Fix debug logging controls
* Assign "enable exchange parser logging" from Eas.PARSER_LOG instead
  of from EAS.USER_LOG.
* Reorder setup to assign listeners last;  This avoids unnecessary calls
  to Email.updateLoggingFlags() during setup.

Note:  The bug exists as far back as eclair, but the fix will need to be
made in a different file in earlier versions (pre DebugFragment)

Bug: 3003813
Change-Id: I5d8f66747a86139dd593ac16ea421ab1e33b8795
2010-09-15 11:06:03 -07:00
Makoto Onuki
d701ff131f Merge "Fix potential NPE" 2010-09-15 10:56:09 -07:00
Makoto Onuki
261d6c3f0c Notify only account cursors when resetting new msg count
- Resetting the new message count is now correctly done on a BG thread.
- Added special content provider URI to reset the count.
  (/resetNewMessageCount)
- This URI only supports update, which will notify only account
  cursors.
- Fixed a problem that an insert with MAILBOX_ID/MESSAGE_ID/ACCOUNT_ID
  triggers two notifications.

- This CL changes how we use notification URIs, but unfortunately
  no tests for this part.  It turned out MockContentResolver doesn't
  support the notification mechanism, which made it very hard
  to write tests.

Bug 2911646

Change-Id: I35b30a7e6bf2d57510486c7ed19b9f263d8c9b58
2010-09-15 10:53:17 -07:00
Makoto Onuki
1ed2c7a15d Fix potential NPE
Happened to find this.

Change-Id: I0b71d80a421adad196d8cd113001f2f9fe5a9445
2010-09-14 17:26:13 -07:00
Makoto Onuki
cc91619b6a Kick syncMailboxStatus callback when syncing Trash/Drafts
Drafts/Trash are not syncable on EAS, but let's kick the callbacks
as the UI is expecting them.

Bug 2989403

Change-Id: I4feac1f0e5471995c14260be6d12329659385e23
2010-09-14 10:43:14 -07:00
Dianne Hackborn
a2cc46c810 Fix issue #2967969: Crash rotating screen on "delete account" dialog
Update settings to use to PreferenceActivity APIs to retain its
current state across instances.  Removes
inheritance of Header (to work well with new framework impl that
retains these across instances), avoid resetting the current header
after a state change (we want to keep showing whatever the user
last viewed), put the dialog on the back stack (so it will get
removed if the back stack is cleared).

Change-Id: Ie35b1c0eb9b06277165f2b9cadb0e2999bb8af47
2010-09-13 18:25:00 -07:00
Makoto Onuki
40b2d92851 Make sure "refresh" button animation refrects actual state
When selecting a different mailbox, start/stop the refresh button animation
as necessary.

Bug 2997302

Change-Id: If29d7ec37348d527698685503b7b4fbf0ed0c35f
2010-09-13 16:51:09 -07:00
Makoto Onuki
52930bfda3 Merge "Enable "auto-refresh" for EAS accounts as well." 2010-09-13 16:38:58 -07:00
Makoto Onuki
fe7dd2df56 Enable "auto-refresh" for EAS accounts as well.
bug 2990997

Change-Id: Ia8481c806ee6f2e8d9308dacee67c982e1caaa69
2010-09-13 16:16:28 -07:00
Makoto Onuki
599cc11e9e Merge "Use the auto-advance setting after move." 2010-09-13 15:29:58 -07:00
Andrew Stadler
5b2424bf6f Cleanup of Account setup flows
* Remove AccountSetupCheckSettings and related resources
* Remove all handling of EDIT flow in setup activities

Change-Id: I7b87d87978533b52b9c974d006920749389418d8
2010-09-13 14:39:36 -07:00
Makoto Onuki
00d5cf97c6 Use the auto-advance setting after move.
Change-Id: I835211589897410be7003a276a3278d43d940c38
2010-09-13 14:27:13 -07:00
Andrew Stadler
2731aef45c Convert exchange setup to use checker fragment
* AccountCheckSettingsFragment now supports AutoDiscover
* Clean up callbacks for account check & autodiscover errors
* AccountSetupExchange now supports rotation
* Remove dead code in SetupData & AccountSetupBasics

TODO next CL: Remove all edit flows from setup activities
TODO next CL: Remove old CheckSettings activity

Change-Id: I3c9884856ca6e70226374fdb28400bfb3588387e
2010-09-13 14:04:45 -07:00
Makoto Onuki
d4aac1e847 Always show Combined Inbox
Even if unread count == 0.

Bug 2992923

Change-Id: I2c2bd9781630e7664a7bd4b6fcb5012e9ebe2dc6
2010-09-13 10:59:35 -07:00
Makoto Onuki
ff110a30ca Merge "EmailProvider related clean up" 2010-09-13 10:33:45 -07:00
Eric Fischer
e0544175fc Merge "Import revised translations." 2010-09-13 10:07:07 -07:00
Marc Blank
11d37a7fa9 Check file name before allowing attachment save
Bug: 2992710
Change-Id: I56893366226168669788b78b53bfd3f996dd96cd
2010-09-11 15:34:28 -07:00
Andrew Stadler
fd14496c49 Convert setup to use checker fragment
* Activities modified to use new check-settings fragment:
  * AccountSetupBasics (auto-setup for imap/pop)
  * AccountSetupIncoming
  * AccountSetupOutgoing

Next CL: Same work for exchange, and terminate old CheckSettings activity.

Change-Id: If5c5bfe331161b2429f7d7a4bd13290932f03c47
2010-09-10 15:51:37 -07:00
Eric Fischer
c03136f8c9 Import revised translations.
Change-Id: Ife9aec319e0c3e6c95c69b8f04884beea7c4dadd
2010-09-10 15:44:25 -07:00
Makoto Onuki
7bcf1882bc EmailProvider related clean up
- Removed unused URI definitions.
- Added SuppressWarnings to CONTENT_URI's in EmailContent

Change-Id: Id1e746ef5ab86dd76dc1b7dd38a5a00d052bddab
2010-09-10 15:26:48 -07:00
Makoto Onuki
ad0c1253c7 Merge "Fix tests broken by I2bf5de4e (Clean-ups for EmailProvider)" 2010-09-10 15:04:40 -07:00
Makoto Onuki
07fc10ae22 Merge "Implement "auto-advance" on two-pane" 2010-09-10 14:45:46 -07:00
Makoto Onuki
8f78d57a1f Implement "auto-advance" on two-pane
- Two-pane now respects the auto-advance setting.
- Added another TODO for one-pane.
- Removed unused method.

Change-Id: If2cfb8cc1de04c48cd2f6075bc01bef830425662
2010-09-10 14:40:37 -07:00
Makoto Onuki
5b0c2c7f34 Fix tests broken by I2bf5de4e (Clean-ups for EmailProvider)
My previous CL broke some tests.
- make sure to set 0 to unreadCount when adding a new row
- when updating messageCount in the tests, directly manipulate
  the DB.  (the provider no longer allows this)

Change-Id: Ib569349707007badf4f23600fbca37110c78fa6d
2010-09-10 14:37:01 -07:00
Marc Blank
9e9113b9b8 Fix MessageList formatting bug when subject is empty
Change-Id: Ia2ab247935a4882a308fb393f5484bfe3ea10d86
2010-09-10 14:21:52 -07:00
Makoto Onuki
f678a8e67a Clean-ups for EmailProvider
- Don't allow manual modification of unreadCount/messageCount
  (We used to check only unreadCount in update().)
- Do the integrity check at the very first in update().
  I think the old place was really problematic because we opened
  the database in a few lines above and kept it in a local variable.

Change-Id: I2bf5de4e4e45b40c11b951dd2255f8193c26f1aa
2010-09-10 13:27:12 -07:00
Makoto Onuki
7183724276 Don't check flagLoaded for outbox message list
We found a case where messages in outbox have flagLoaded=FLAG_LOADED_UNLOADED,
where it should be FLAG_LOADED_COMPLETE.  Haven't found the root problem, but
remove the flagLoaded test to mitigate the problem.

Also moved the buildMailboxIdSelection call to a worker thread.
(this method issues some queries.)

Bug 2984285

Change-Id: I2a5be300fb3da703698512262cc38bea75d0f7ba
2010-09-10 11:12:46 -07:00
Marc Blank
6d51b7eb63 Properly report EAS protocol version failures
Bug: 2528554
Change-Id: I9ac2520528ebe23dc0d465aee65ab470f8f429a7
2010-09-10 08:33:40 -07:00
Makoto Onuki
0f52e546ef Implement General Preferences
- Removed the place holder setting
- Added "auto-advance" setting, which has "newer",
  "older" (original behavior, default) and "message list"
- Strings were copied from Gmail

This CL has preference change only (i.e. the setting isn't used yet).
The actual implementation will come later.

Change-Id: I9f90a723c67e066fdc536a73490101817a127933
2010-09-09 17:02:02 -07:00
Makoto Onuki
6a461a9d46 Merge "Launch AccountSecurity if the account is on security hold." 2010-09-09 17:01:35 -07:00
Makoto Onuki
4c5aaaecef Merge "Add quick contact badge to MessageView." 2010-09-09 16:55:08 -07:00
Andrew Stadler
c7fd6f2a93 Merge "Cosmetic cleanup of exchange setup" 2010-09-09 16:08:26 -07:00
Andrew Stadler
c164444784 Cosmetic cleanup of exchange setup
* Remove nonfunctioning Next button
* Enable Next button on name screen

Bug: 2988925
Change-Id: I9de7d8dc5b6f48b6c11676b7eef478495afcc889
2010-09-09 15:49:21 -07:00
Makoto Onuki
2012ceff64 Launch AccountSecurity if the account is on security hold.
Change-Id: Icac5de3259c66cac87e2a36d95d53a4f63ea94f1
2010-09-09 14:13:47 -07:00
Makoto Onuki
b1ea9c3c12 Add quick contact badge to MessageView.
- Added "quick contact badge" to MessageView
- Removed PresenceUpdater, and added new implementation based
  on Loader, which is much simpler.
- Changed some text color, so they're visible now.

Bug 2988625

Change-Id: I688a3217178ee8fd0b7245c0ab36a633687ea525
2010-09-09 13:57:31 -07:00
Makoto Onuki
02c0f95734 Fix the build
Turned out we *are* using android-common.

Change-Id: Iafaee8d85014ab8f325c8d48b969985352d85a9a
2010-09-09 12:00:47 -07:00
Makoto Onuki
27e35d47af Merge "Add a flag to check the current thread on db accesses" 2010-09-09 11:24:41 -07:00