Commit Graph

5651 Commits

Author SHA1 Message Date
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
Todd Kennedy
5c453db639 Merge "Save widget config to shared preferences" 2011-06-01 15:19:53 -07:00
Todd Kennedy
fa1b3a8f37 Save widget config to shared preferences
The way the config activity communicates with the widget will be through
shared preferences. We now read / write shared preferences for widget
configuration. One step closer to the configuration activity...

Change-Id: I7c54259d84ad8d304a61652af5b3edff4c7d67db
2011-06-01 15:14:55 -07:00
Makoto Onuki
3bfd5734b8 Merge "MailboxListFragment: In-place nested mailbox navigation" 2011-06-01 15:11:09 -07:00
Makoto Onuki
844bf74504 MailboxListFragment: In-place nested mailbox navigation
Now we reuse the same instance of the fragment for nested mailbox
navigation.  (Don't use fragment transaction)

"CursorWithExtras" now only has the child count, so I removed the
bundle version and added a concrete class to MailboxFragmentAdapter.

With this CL the nested mailbox navigation on 1-pane should work, but
not back navigation.  (Back press event isn't connected to the
fragment yet.)

Change-Id: I2c23651d9c8edb5fe062c68bbb9b462c8949ded4
2011-06-01 15:06:42 -07:00
Marc Blank
9634d2d88c Merge "Workaround bug 4520517" 2011-06-01 13:21:20 -07:00
Makoto Onuki
e50a6fb48b Workaround bug 4520517
To test bug 4490341

Change-Id: I93127a8ed1579184b0ae9c1fc0ce51bae7927f76
2011-06-01 13:18:36 -07:00
Todd Kennedy
44f5cd67c9 Remove widget views
The new widget UX allows for a single display mode for the widget. This can
be configured when the widget is added or at a later time during widget
re-configuration.

We don't have the configuration activity (yet). We first need to restructure
the widget to take a single account / mailbox combination. Hooking up the
configuration activity will occur in a future CL.

Change-Id: I38a5796c44938a6abd0d2bb50ac77241cc86a497
2011-06-01 10:46:32 -07:00
Ben Komalo
5a666cec7b Fix HTML escaping to not use '
' is not a supported HTML entity in Exchange servers as well as the
rendering engines MS use, so it doesn't get properly interpreted.
This changes makes us use the safer XML/unicode equivalent of
escape entities.

Bug: 4495370
Change-Id: Id6cc544a4765e72d44cc874841e2f70d8e3af468
2011-05-31 13:42:37 -07:00
Todd Kennedy
0f84ff2c08 Add meta options in the picker
With this CL, we have "All accounts" in the account list and "Inbox" & "Unread"
in the mailbox list. "All" + "Unread" doesn't play very well, so, we should
seriously consider whether it's worth the effort to support it right now.

Change-Id: Ia1c07c89a535a68ffe6f3ae5009b5b6591a9acdb
2011-05-27 16:06:33 -07:00
Todd Kennedy
dc6f61a4c2 Merge "Use standard widget call backs" 2011-05-27 12:16:05 -07:00
Todd Kennedy
98108f2e0e Use standard widget call backs
Instead of overriding onReceive() and processing messages ourselves, we should
be overriding the standard widget call back methods, onUpdate(), etc...

Also added a deleteWidgets() method in the widget manager to maintain beter
symetry between create & delete.

Change-Id: Idc84bf220a1e14776a080cfee0b28df39f9a1450
2011-05-27 12:15:09 -07:00
Makoto Onuki
88b5e296e0 Merge "MessageViewFragment: Preparing to use back stack." 2011-05-27 10:44:22 -07:00
Todd Kennedy
7956e76e18 Merge "Make callbacks from shortcut picker" 2011-05-27 10:40:58 -07:00
Todd Kennedy
ae8e612ed5 Make callbacks from shortcut picker
We need to move some of the calls from shortcut picker to the activity (such
as creating the actual shortcut and terminating the activity). This should
let us to reuse the picker fragment from the widget code.

Maybe other callbacks are needed, but, this is a first pass to get something
that "should" work.

Change-Id: I6467979951ad73b5817ba543683f62f831ac73a4
2011-05-27 10:36:10 -07:00
Marc Blank
da3442ca6d Merge "Fix Policy-related unit tests (proguard flags)" 2011-05-27 10:35:54 -07:00
Ben Komalo
6d44569356 Merge "Prevent NPE in MessageCompose." 2011-05-27 10:33:29 -07:00