Commit Graph

5617 Commits

Author SHA1 Message Date
Todd Kennedy
2e112b2d12 Add new column to table creation method
Change-Id: I2c6fe80d06e54dbd10eba41f0a0aa758baffb1b0
2011-06-03 16:47:39 -07:00
Marc Blank
741c84de4b am 079b628d: (-s ours) am 49488f81: Merge "DO NOT MERGE: Don\'t use multipart for SmartReply/Forward text" into honeycomb-mr2
* commit '079b628d4b77caba0519ec01a715ae5810aa67bb':
  DO NOT MERGE: Don't use multipart for SmartReply/Forward text
2011-06-03 16:34:58 -07:00
Ben Komalo
35700dfc4b am c0b79a7b: (-s ours) am 5a666cec: Fix HTML escaping to not use '
* commit 'c0b79a7b2a436d939d32af6e6aaa2b73764eadcb':
  Fix HTML escaping to not use '
2011-06-03 16:34:54 -07:00
Makoto Onuki
696fa78cb3 Don't enable FragmentManager logging.
Change-Id: Ie02ece80df7832c609cffb64a4b0626c6b8a77b5
2011-06-03 15:15:01 -07:00
Ben Komalo
769ad5825f am ff162ee2: Merge "Minor fixes to setup screen for 7"" into honeycomb-mr2
* commit 'ff162ee2c0a90c35c2fd33cd2df05f3f29a867ce':
  Minor fixes to setup screen for 7"
2011-06-03 14:54:12 -07:00
Ben Komalo
ff162ee2c0 Merge "Minor fixes to setup screen for 7"" into honeycomb-mr2 2011-06-03 14:45:01 -07:00
Andrew Flynn
ccb4cab3dd am 741c789c: Fix button spacing for smaller tablet screens in portrait.
* commit '741c789c831360856180f81e0d3a97b268d1c549':
  Fix button spacing for smaller tablet screens in portrait.
2011-06-03 14:44:55 -07:00
Ben Komalo
ff269c6d50 Minor fixes to setup screen for 7"
Using a TableLayout and large margins to shrink the input boxes causes
weird artifacts when you type past the size of the input box. Fixing the
padding is also not the right way, since stretching the input the whole
screen length is ugly. Just use a width.

Bug: 4495679
Change-Id: I0e93fdd4f050b193338ca20cef6cba208547c9aa
2011-06-03 14:37:13 -07:00
Makoto Onuki
cc881b744b Remove the hidden newer/older buttons from 1-pane.
We'll implement swipe and this view is not used on 1-pane anyway.

Change-Id: Ib1d9b44dd530159377f3e5f883188832de30482f
2011-06-03 14:25:10 -07:00
Makoto Onuki
03b863d68e Merge "Implement 1-pane navigation." 2011-06-03 14:16:49 -07:00
Makoto Onuki
3d9b8e76f0 Implement 1-pane navigation.
- Now that fragment useage is simplified (e.g. no new fragment
creation for nested mailbox navigation), most of the fragment
operation code for 2-pane is reuseable for 1-pane as well,
so moeved it to the base class.

- Temporarily added "Show all folders" as a menu option on 1-pane.

- Added "opener account id/mailbox id" to the message view fragment.
They are not used by the fragment itself, but they're used
by the UI controller for the back navigation.  (And now the UI
controller doesn't maintain the current IDs by itself; rather
it gets them from the currently-active fragment.)

- Use async fragment transaction on 1-pane too, now that it always
gets the current state from the active fragment.

- Changed the timing when we install fragments from onAttachFragment
to fragments' onActivityCreated.  So now all installed fragments are
created.

TODO Now that all installed fragments are guaranteed to be created,
remove all special trealment for the fragment argument accessor.
(They were meant be safe to call before onCreate, but it's not
necessary any more.)

Change-Id: I0ed100c3f0b460835b164c0dc908ea483a4e46ee
2011-06-03 13:59:50 -07:00
Andrew Flynn
741c789c83 Fix button spacing for smaller tablet screens in portrait.
Change-Id: I3603a4db9798dc91b7f6bdb0a8ff439476149766
2011-06-03 13:49:19 -07:00
Jorge Lugo
8f54b2f135 Merge "Fixed reply-all bug" 2011-06-03 10:23:35 -07:00
Eric Fischer
b7ec2d9d4d Merge "Import revised translations." 2011-06-03 10:22:26 -07:00
Jorge Lugo
15842c522e Fixed reply-all bug
Upon hitting reply all, all email addresses except that of the source message sender
go in the CC: field. Previously they all went in the TO: field. Updated 3 tests
in MessageComposeTests.java (testReplyAllAddresses1(), testReplyAllAddresses2(), and
testReplyAllAddresses3()) to reflect this new behavior.

Bug: 4534058
Change-Id: I852daebdd8843a45f685eecc67f757c87925bb6c
2011-06-03 10:16:05 -07:00
Marc Blank
079b628d4b am 49488f81: Merge "DO NOT MERGE: Don\'t use multipart for SmartReply/Forward text" into honeycomb-mr2
* commit '49488f81811c3b9d59d4e275f074702e3907b899':
  DO NOT MERGE: Don't use multipart for SmartReply/Forward text
2011-06-03 09:41:21 -07:00
Marc Blank
49488f8181 Merge "DO NOT MERGE: Don't use multipart for SmartReply/Forward text" into honeycomb-mr2 2011-06-03 09:33:27 -07:00
Ben Komalo
c0b79a7b2a am 5a666cec: Fix HTML escaping to not use '
* commit '5a666cec7b37948a1f77f5f88cb77d95e657a544':
  Fix HTML escaping to not use '
2011-06-03 09:28:11 -07:00
Todd Kennedy
4c4b088a21 Merge "Add "lastTouchedTime" column to the mailbox table" 2011-06-03 09:26:14 -07:00
Marc Blank
bfbf596a6f DO NOT MERGE: Don't use multipart for SmartReply/Forward text
* Backport of Ie99047b465ed7087e6e0100f7d517ac3fb6b803c

Bug: 4490341
Change-Id: I3d118b6b9c9a9f3940df133e7c05cc79b52395fa
2011-06-03 09:25:55 -07:00
Todd Kennedy
9dcb72e1ec Add "lastTouchedTime" column to the mailbox table
The last touched time will track the last time a message within that mailbox
was read. This will be used for the recent list.

Change-Id: I97a5fda52fd09b416fc3278a11a87b807da05c9c
2011-06-03 08:51:25 -07:00
Marc Blank
aaf12a5e75 Merge "Update searchMessages API" 2011-06-03 08:39:45 -07:00
Marc Blank
75a754660e Update searchMessages API
* Store various search parameters in a new parcelable class

Change-Id: Iadec6a803b1bf17d89cd401c3fca1cb0ad3340d4
2011-06-02 21:41:17 -07:00
Eric Fischer
adec6d51e2 Import revised translations.
Change-Id: Ice7b62851309bb1efd5a18600b69509e6c0a6285
2011-06-02 16:56:11 -07:00
Todd Kennedy
bc7cd16ec2 Fix NPE if message displayName is null
the spannable string builder assumes the given char sequence is non-null.
we now ensure that's always the case.

Change-Id: I12e7081e5348d797feab6ad17452b73a52feaf13
2011-06-02 15:27:48 -07:00
Todd Kennedy
a202567a45 Merge "update UX according to specs" 2011-06-02 15:06:40 -07:00
Marc Blank
1268dfbda2 resolved conflicts for merge of a04a4924 to master
Change-Id: Ib80af1274ccde493411cb5fe92091d36965e6a58
2011-06-02 13:46:51 -07:00
Todd Kennedy
cf772cc8ad update UX according to specs
Display the mailbox name as the widget title and the account name
as the secondary title.

Change-Id: Ibb36d4897e02b8cbc501eae9b27ee8381fe91e1a
2011-06-02 12:03:40 -07:00
Todd Kennedy
b9afe5760c Merge "Fix NPE accessing fragment arguments" 2011-06-02 12:02:50 -07:00
Todd Kennedy
8121876fef Merge "Add proper wording for "all accounts" picker item" 2011-06-02 11:56:05 -07:00
Todd Kennedy
f47255f6fc Fix NPE accessing fragment arguments
Change-Id: I417927568c2407f1d183f3d112d0761f57b5bb12
2011-06-02 11:55:24 -07:00
Todd Kennedy
b19516e248 Add proper wording for "all accounts" picker item
Per discussion w/ UX.

Change-Id: Ida4a11828d2bb157c4bc0c66f84d877013f0e4d7
2011-06-02 11:54:25 -07:00
Makoto Onuki
5dc07ad26c Merge "Rework on inbox lookup" 2011-06-02 11:01:09 -07:00
Eric Fischer
e2091d8210 am 83300be8: (-s ours) am 965569d5: Import revised translations. DO NOT MERGE
* commit '83300be80cc40102044945cbad173df74bc7deeb':
  Import revised translations.  DO NOT MERGE
2011-06-02 10:42:40 -07:00
Todd Kennedy
0cf465738f Merge "filter mailbox list for the widget" 2011-06-02 10:38:00 -07:00
Todd Kennedy
2f5ee8e2d1 filter mailbox list for the widget
The mailbox list for widget configuration should only include two mailboxes --
1. an account's full inbox (both read & unread) and 2. an account's unread
inbox (similar to #1, but, only contains unread messages)

This also applies for the combined account view.

Change-Id: I5640fd8572d385703db04ca613f5b1f35f3952da
2011-06-02 10:36:29 -07:00
Ben Komalo
cd7dce5b39 Merge "Move the custom SSLSocketFactory into emailcommon" 2011-06-02 10:29:41 -07:00
Marc Blank
a613aa18f5 Merge "Add transient to Account (for holding AccountManager account)" 2011-06-02 09:41:28 -07:00
Marc Blank
dcac884697 Add transient to Account (for holding AccountManager account)
Change-Id: I2eba00b4e2f4fe0dfdc71547bfac9159728ea0e9
2011-06-02 09:41:07 -07:00
Ben Komalo
12a3e3e4b9 Move the custom SSLSocketFactory into emailcommon
Change-Id: I48da54a74fd3fe573d20e581b69e35944ba9c8ff
2011-06-01 20:27:02 -07:00
Makoto Onuki
f015cc00ed Rework on inbox lookup
- Moved MailboxFinder logic to UIControllerBase so it can be reused for 1-pane.
- Make sure MailboxFinder runs only while the activity is resumed.
  (we don't want to get callbacks when it's not, because we can't perform
  fragment transactions.)
- Make sure MailboxFinder is restarted if the activity gets re-created
  while it's still running.

Bug 4522010

Change-Id: I4486ecfa44dd700d28c424bc5eb7104d3043cf7d
2011-06-01 19:25:14 -07:00
Makoto Onuki
47d6f782de Merge "Switch to async fragment transaction for two-pane" 2011-06-01 19:16:15 -07:00
Makoto Onuki
61b0605a0b Merge "Change on the mailbox list item background." 2011-06-01 19:16:07 -07:00
Makoto Onuki
2912bed923 Merge "Remove unused method." 2011-06-01 18:41:18 -07:00
Makoto Onuki
3a8a1b451d Change on the mailbox list item background.
- The drawable for the active drop target background was static, and
  shared between items.  But StateListDrawable has inernal state and
  shouldn't be shared.

- Also make sure not to set the same background more than once.

For some reason, they will cause visal glitches when we switch to synchronous
fragment transaction.

Change-Id: I10fede2ad4e595f74d61768907b5b70fd5d4da21
2011-06-01 18:40:50 -07:00
Todd Kennedy
7f4cf3c46b Hook account/mailbox picker to widget
now when adding a widget to the desktop, you can pick the account
and mailbox.

Change-Id: Id3d2c21b349af58459304ac5a068402d67f4d0f7
2011-06-01 18:24:47 -07:00
Makoto Onuki
c7024f73ec Switch to async fragment transaction for two-pane
One-pane will follow too, but not soon.

Change-Id: Ie018f728273e9fa4a7e6cf3116a2a2afebcaecc5
2011-06-01 18:11:12 -07:00
Makoto Onuki
147e41d00a Remove unused method.
This should have been removed in I2c23651d.

Change-Id: I8dd90a0ba55e701225cdaf2e5b7c5fe92a417525
2011-06-01 17:56:16 -07:00
Todd Kennedy
60abc35a72 Merge "Loader query should use mailbox key" 2011-06-01 16:01:51 -07:00
Todd Kennedy
0b4602b5d9 Loader query should use mailbox key
The loader query should be testing against the mailbox key and not the message
id.

Change-Id: Idcc31b4e84db55c8c6a95e1141740371e1390c81
2011-06-01 15:52:15 -07:00