Commit Graph

5131 Commits

Author SHA1 Message Date
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
Andy Stadler
22306fa2f5 am 188fb8d6: Merge "DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe" into gingerbread
* commit '188fb8d6d6c483fddd94eacbce804c38039efe17':
  DO NOT MERGE - Clear cached CalendarObservers after Calendar wipe
2011-03-31 16:33:55 -07:00
Todd Kennedy
00b4e00944 Fix typos in providers.xml
bug 4090086

Change-Id: I257410357306495f842a02a94337c5e554d08ed5
2011-03-31 15:39:28 -07:00
Todd Kennedy
74bf57cfaf Create separate adapters for mailbox lists
There are currently two places where we use a mailbox list -- in the main
view and in the "move to" dialog. We've replaced the single, modally
configured adapter with two specialized subclasses.

Change-Id: I5dfd5ccd435fefbab4b7647c2bd7a14818f73bf3
2011-03-31 15:27:12 -07:00
Makoto Onuki
acef8061ff Merge "More use of EmailAsyncTask" 2011-03-31 14:30:16 -07:00
Makoto Onuki
26cfb38042 MessageList rework for phone.
Change-Id: I1cc86c0282f0f3cbe9b78ed97ab3fb8f8d1e7c0f
2011-03-31 14:28:46 -07:00
Todd Kennedy
5e4f1c3872 Allow globals in the providers.xml
There are two ways globals can be specified. There can be only one global
character ['*'] and/or multiple wildcard characters ['?']. The global
will match zero or more characters. The wildcard will match any character.

bug 4090086

Change-Id: I07e3edebd1fe989094c68cf047ce5bc9fb91aba0
2011-03-31 14:28:43 -07:00
Marc Blank
566c4f9117 Merge "Highlight utility for HTML and text" 2011-03-31 14:07:50 -07:00
Marc Blank
76f614720d Highlight utility for HTML and text
* Add utilities for adding highlighting markup to HTML and
  highlighting spans to plain text (for Webview and UI,
  respectively)
* Rename Snippet.java to TextUtilities.java and move to utility
  package

Change-Id: Ic443ab5ce9c0199fa82a68e1592bf259494cadd2
2011-03-31 13:49:52 -07:00
Makoto Onuki
44f45f4221 Merge "Don't use findViewById (part 1 -- account setup)" 2011-03-31 11:06:15 -07:00
Makoto Onuki
af6079c823 More use of EmailAsyncTask
... for Welcome and EmailWidget.  So that now it's safe for onDestroy()
to be called while a task is running.  (onDestroy cancels it.)

Change-Id: I660b471465170e1d1d0ce153571fb924ae703d7d
2011-03-31 11:05:22 -07:00
Gilles Debunne
f2bcb222ca Merge "Unused assets removed from Email" 2011-03-30 18:07:54 -07:00
Andy Stadler
6c5106181b am 28107dda: (-s ours) am 2daecc7a: (-s ours) am dc43877b: Merge "DO NOT MERGE - Don\'t sync messages moved from the sent folder" into gingerbread
* commit '28107ddadf7c3cd8c1b120c1655e061ae6176f37':
  DO NOT MERGE - Don't sync messages moved from the sent folder
2011-03-30 16:41:23 -07:00
Andy Stadler
15d338deb6 am 4c6f8b55: (-s ours) am 8252c305: (-s ours) am 07a85746: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
* commit '4c6f8b55bb2fc308623e0b820c36b7015f37e643':
  DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 16:41:21 -07:00
Andy Stadler
c8d181602c am 7bead5e3: (-s ours) am 3f8c081d: (-s ours) am aba60dfb: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
* commit '7bead5e3b8ebf1305ebd44b31b492fb8dd2ee49b':
  DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 16:41:19 -07:00
Andy Stadler
b40375195d am b9e46a68: (-s ours) am 4fed8653: (-s ours) am 064c1870: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
* commit 'b9e46a68601a7b35a6d0377d44142627c8708cd8':
  DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 16:41:13 -07:00
Andy Stadler
5e0e67adb9 am 7b62ac18: (-s ours) am 07eb4bdc: (-s ours) am 8f0a79c2: DO NOT MERGE - Add 55 roadrunner email setups
* commit '7b62ac184598bba04bea984fea1a26ae2e4ae5f9':
  DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 16:41:07 -07:00
Andy Stadler
28107ddadf am 2daecc7a: (-s ours) am dc43877b: Merge "DO NOT MERGE - Don\'t sync messages moved from the sent folder" into gingerbread
* commit '2daecc7a54d55177835ab9cfc5a4fde589f35f03':
  DO NOT MERGE - Don't sync messages moved from the sent folder
2011-03-30 15:30:17 -07:00
Andy Stadler
4c6f8b55bb am 8252c305: (-s ours) am 07a85746: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
* commit '8252c305993f9a1e78307be989f3947c16c44617':
  DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 15:30:15 -07:00
Andy Stadler
7bead5e3b8 am 3f8c081d: (-s ours) am aba60dfb: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
* commit '3f8c081d2b985915dd6585f4ef13d964bf8580c2':
  DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 15:30:13 -07:00
Andy Stadler
b9e46a6860 am 4fed8653: (-s ours) am 064c1870: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
* commit '4fed865309b1f601e61ece38caa3fd4c622eb928':
  DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 15:30:11 -07:00
Andy Stadler
7b62ac1845 am 07eb4bdc: (-s ours) am 8f0a79c2: DO NOT MERGE - Add 55 roadrunner email setups
* commit '07eb4bdc018888e018163da901a54dd15f65671c':
  DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 15:30:07 -07:00