Commit Graph

4952 Commits

Author SHA1 Message Date
Todd Kennedy
2b82c3f0a3 Add columns to cursor to allow for proper layout
The layout requires different indentation. Although the exact layout may
change, we will likely always need to differentiate between the different
mailbox types.

Change-Id: Ia2ff84b552873f92fa45563b2dc0868c29bec3e3
2011-04-12 15:09:51 -07:00
Todd Kennedy
57dc03acec Merge "Add current nested folder to list" 2011-04-12 15:08:00 -07:00
Makoto Onuki
0efbee2bd0 Merge "Fix bug that prevents from accepting 2 invites in a row." 2011-04-12 13:56:59 -07:00
Makoto Onuki
5dceaa5b5e Fix bug that prevents from accepting 2 invites in a row.
mPreviousMeetingResponse is tied to the current response state, so it
should be reset too when we clear the response checkboxes.

Bug 4132763

Change-Id: If816706f47f8500441330882fb4f372b31465ff5
2011-04-12 11:08:16 -07:00
Todd Kennedy
7f139f14b9 Add current nested folder to list
When selecting a nested folder, the currently selected folder should be listed
along with "All Folders" and sub-folders

Change-Id: I7c6f726a0355a13d3e7b59aa4707bd92473283b4
2011-04-12 09:47:56 -07:00
Ben Komalo
7dc1e86d91 Less aggressive selection change in msg content.
All focus changes to the message body content was pushing the selection
to the end, which is wrong if state restoration happens, and is just
non-standard behavior if the user explicitly taps on a particular spot
on the text view. Make this slightly less aggressive.

Misc other changes in compose view.

Bug: 3076256
Change-Id: I9edb9c3c4edb5ddec12207f4136f3ca73cabf89d
2011-04-12 09:23:40 -07:00
Ben Komalo
2577842269 Misc fixes and dead code removal.
Change-Id: I48b2fa5f7bf619197d882c71e8b174d31d130e26
2011-04-11 14:01:01 -07:00
Marc Blank
cd5da3c445 Remember to clear query in MessagesAdapter if we're not searching
Change-Id: I3b16f080c66f6ce025e41a7c459aa3cb94dbecd0
2011-04-08 14:01:35 -07:00
Marc Blank
18d3b3de1e Merge "Improve temporary mailbox settings UI" 2011-04-07 20:04:18 -07:00
Marc Blank
f047c7cfd1 Improve temporary mailbox settings UI
* Start dialogs with current setting selected
* Add Cancel/OK buttons

Change-Id: Ia3d28eec558a8af8d3826b70cb313b68a5efc533
2011-04-07 20:03:23 -07:00
Joe Onorato
7af1ad3b58 Remove the deprecated things from Config.java. These havent been working since before 1.0.
Change-Id: Iea671dc01ff45f1009f6fbb22cf7259e0fc1d4f1
2011-04-07 18:41:11 -07:00
Todd Kennedy
df3133bf3d Merge "Always use the same loader id" 2011-04-07 15:03:59 -07:00
Marc Blank
983a624549 Merge "Temporary UI for setting mailbox sync frequency/lookback" 2011-04-07 14:53:48 -07:00
Marc Blank
d4a1500ae9 Temporary UI for setting mailbox sync frequency/lookback
* Just in MessageListXL for now, as with search
* This allows us to test functionality within EAS, and confirm that
  it's all working w/ unbundled Exchange (API 1)

Change-Id: I4f062ae871a28d2b57a23a269d6ec65903181d26
2011-04-07 14:53:08 -07:00
Todd Kennedy
5965b23909 Always use the same loader id
There's no need to use a different loader ID for each mailbox. Just use
one loader ID to keep things simple.

Change-Id: I46cf0a9ad48c8e0badf72ee73e2d5edadda66912
2011-04-07 14:48:21 -07:00
Todd Kennedy
c5ea3f522a Using the wrong selection for Exchange accounts
Exchange accounts support nested folders, so, we need to use the selection
that excludes any mailboxes with IDs greater than 0. Otherwise, we see all
mailboxes on the account.

Change-Id: If8c2085458176e8bd87013e3b598bd7740c652b2
2011-04-07 14:42:39 -07:00
Todd Kennedy
007d0be4ed First pass at nested folder support
currently only really works for exchange accounts. legacy accounts (imap
or pop) do not build a folder heirarchy.

Change-Id: Idb7c622b64a599a0776233a076359869f4ab4a4f
2011-04-07 14:23:21 -07:00
Marc Blank
fc0f42d6dc Merge "Temporary search UI" 2011-04-06 15:53:09 -07:00
Eric Fischer
8afe058c2a am 5255bd6c: (-s ours) am c7ae9f4b: Import revised translations. DO NOT MERGE
* commit '5255bd6cda542ebdff7f88ef0e035fbcc688352c':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:21:49 -07:00
Eric Fischer
5255bd6cda am c7ae9f4b: Import revised translations. DO NOT MERGE
* commit 'c7ae9f4b469aaa4788ddce02ae83db1d0229a9b1':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:19:32 -07:00
Eric Fischer
c7ae9f4b46 Import revised translations. DO NOT MERGE
Change-Id: Ib613c0438c34b07dfdf725a14eda10954f6a183f
2011-04-06 13:49:57 -07:00
Makoto Onuki
0b28cce4b5 Merge "Fix message view for phone" 2011-04-06 10:32:09 -07:00
Marc Blank
78684ccc79 Temporary search UI
Change-Id: Ia138ca93f0b28fd0915aa79c965f752f7c08ee90
2011-04-06 08:51:14 -07:00
Makoto Onuki
96332096ca Fix message view for phone
- All layouts are still temporary, but at least they're usable now.
- Removed reply/forward button from the bottom panel.
  There're buttons in the layout.
- Switched to getView().
- removed the unnecessary LinearLayout from the xlarge layout.
- removed some backgrounds that'll probably not be used.

Change-Id: I3aa27c63ab139ae30e5714ac3d9a1eadce74b0e8
2011-04-05 19:20:41 -07:00
Ben Komalo
2a2e42b7d8 Remove dead resources.
Change-Id: I8ccbf1e2770199765b3bd73261c4c7982ff8683b
2011-04-05 18:25:43 -07:00
Todd Kennedy
3659fdf5af Don't use hidden API
AndroidTestCase#getTestContext() is decorated with @hide. Instead, use
InstrumentationTestCase#getContext(). This gives us the same functionality
[i.e. the ability to load a test-only XML resource] without using a hidden
API.

Change-Id: I866234e227d975bac62c12e6a2e8efe90de0261c
2011-04-05 14:40:10 -07:00
Makoto Onuki
e553c6ec0b Merge "Store UUIDs in account shortcuts, rather than IDs." 2011-04-05 10:41:25 -07:00
Makoto Onuki
0b6cb1c330 Store UUIDs in account shortcuts, rather than IDs.
Bug 4192836

Change-Id: I1d6349ed3ad70867f113b9a9f7eb8717b88b24c1
2011-04-04 14:12:05 -07:00
Marc Blank
3d1bb65eec Merge "Add searchMessages command to EmailService" 2011-04-04 11:29:31 -07:00
Marc Blank
c60b8d0529 Add searchMessages command to EmailService
* Also, document service methods in EmailServiceProxy

Change-Id: I46cc68c8c2aa870ea82474c70d944640bb66b0ef
2011-04-04 11:28:25 -07:00
Todd Kennedy
22f06c371b Merge "Define roles for fragment manager and activity" 2011-04-04 10:50:19 -07:00
Makoto Onuki
bd5933d4a1 Merge "Clean up MessageCompose for phone" 2011-04-04 09:56:00 -07:00
Makoto Onuki
449b4d106f Merge "Changed text color for phone" 2011-04-04 09:55:47 -07:00
Todd Kennedy
2d76cca19a Define roles for fragment manager and activity
The roles between MessageListXLFragmentManager and MessageListXL was confusing
and not well defined. Now, the activity (MessageListXL) is responsible for
managing the application "chrome" (such as the action bar) and
MessageListXLFragmentManager is responsible for managing the content area.

Change-Id: I9a36d962bae5263f17fc7dccf133a6711229821c
2011-04-04 09:46:54 -07:00
Marc Blank
924a13cf42 Merge "Fix HTML highlighting" 2011-04-04 09:26:59 -07:00
Marc Blank
1e7e2829d8 Fix HTML highlighting
* We need to "and" off the alpha bits from the Color constant

Change-Id: I2e30bd9df74fffed82c637c79927993a49447e23
2011-04-04 09:26:34 -07:00
Todd Kennedy
ae5806ab3a Merge "Update method parameters" 2011-04-04 08:24:57 -07:00
Makoto Onuki
2d380e4504 Clean up MessageCompose for phone
- +cc/bcc and "add attachment" are now menu options.
- layout clean up
- switch to getView()

Change-Id: I5efb6d0fd7b6d1265fed0173463adce2c6d652ba
2011-04-01 15:37:10 -07:00
Todd Kennedy
c33054f9e4 Merge "use non-deprecated async task method" 2011-04-01 12:00:05 -07:00
Todd Kennedy
ef844d86f1 Update method parameters
Only pass along the things we need. For the message dialog, we were passing
in an Activity that was not needed. In the ActivityHelper, we were passing
in an Activity when all we needed was a Context.

Change-Id: I9a93ae07ff2bbdce9466c7e991410c87fb610673
2011-04-01 11:57:52 -07:00
Todd Kennedy
ad7dc464db update mailbox adapter callback
the callback method name was not appropriate in all situations. This has been
renamed to just "onBind()" and will still be invoked whenever data is bound to
the adapter. also, create an empty callback that can be used if the adapter
doesn't need to be informed when a bind occurs.

Change-Id: Ifaa4aea3a59734557651270330ca9439e3ea4ab4
2011-04-01 11:47:35 -07:00
Todd Kennedy
629b93d67d use non-deprecated async task method
Change-Id: I7c798542b478c0d3817bb3dde243da402d4236c4
2011-04-01 11:27:28 -07:00
Todd Kennedy
b9ca15982b Merge "Create separate adapters for mailbox lists" 2011-04-01 10:56:20 -07:00
Makoto Onuki
18f98261a4 Changed text color for phone
... assuming we're going to use the holo light on the phone as well.

Now the text on MailboxList is clearly visible.

Also updated/added some comments.

Change-Id: I280db2b82cbd1627c78a305dd31bbf1b1bb34d1d
2011-03-31 17:29:11 -07:00
Makoto Onuki
a10c709873 Merge "MessageList rework for phone." 2011-03-31 17:28:52 -07:00
Andy Stadler
059224afc5 am 31d56153: (-s ours) am d6e4e0c3: (-s ours) am 6c6f1491: Merge "DO NOT MERGE - Update version number for GB-MR2 update." into gingerbread
* commit '31d5615373c905c0f89652b52c23651931c691ea':
  DO NOT MERGE - Update version number for GB-MR2 update.
2011-03-31 16:51:41 -07:00
Andy Stadler
b48cb13fec am f0764cf3: (-s ours) am 22306fa2: (-s ours) am 188fb8d6: Merge "DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe" into gingerbread
* commit 'f0764cf319f14f3b0c57a0eac40b0939bea33aff':
  DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe
2011-03-31 16:51:38 -07:00
Andy Stadler
31d5615373 am d6e4e0c3: (-s ours) am 6c6f1491: Merge "DO NOT MERGE - Update version number for GB-MR2 update." into gingerbread
* commit 'd6e4e0c3edf2e66ab3b37065544b91f8f5333e3a':
  DO NOT MERGE - Update version number for GB-MR2 update.
2011-03-31 16:41:55 -07:00
Andy Stadler
f0764cf319 am 22306fa2: (-s ours) am 188fb8d6: Merge "DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe" into gingerbread
* commit '22306fa2f569f58ebc8dcc1347eaa9f5cc6a298f':
  DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe
2011-03-31 16:41:52 -07:00
Andy Stadler
d6e4e0c3ed am 6c6f1491: Merge "DO NOT MERGE - Update version number for GB-MR2 update." into gingerbread
* commit '6c6f14919822bb8bf45a40bd66f2514bfaaf70b1':
  DO NOT MERGE - Update version number for GB-MR2 update.
2011-03-31 16:33:58 -07:00