Commit Graph

5421 Commits

Author SHA1 Message Date
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
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
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
Marc Blank
7ddc6538d4 Fix Policy-related unit tests (proguard flags)
Bug: 4482579
Change-Id: I321017016a39dc36dea83895c95b6acdb735bf1e
2011-05-27 10:18:08 -07:00
Marc Blank
dfc65c67b0 Merge "Don't use multipart/alternative for SmartReply/Forward text" 2011-05-27 08:45:34 -07:00
Todd Kennedy
6d4f0d8fa0 Merge "Make it clear that args are immutable" 2011-05-26 16:51:10 -07:00
Todd Kennedy
90e08781ca Make it clear that args are immutable
Change-Id: I54657648fc7fcd145689a51acd8f3c27d3611a97
2011-05-26 16:45:33 -07:00
Makoto Onuki
262d18971a Merge "MessageListFragment: Preparing to use back stack" 2011-05-26 16:23:49 -07:00
Makoto Onuki
7cb2376aed MessageListFragment: Preparing to use back stack
with some clean-ups.

Change-Id: Ifd0ce888c6387013bc51237528980605c929279c
2011-05-26 16:22:11 -07:00
Eric Fischer
416fcccd5d Merge "Import revised translations." 2011-05-26 16:05:37 -07:00
Eric Fischer
b5466a122a Import revised translations.
Change-Id: I1200928b2276ac429eb94d9e21fa2a6ac643dfc5
2011-05-26 15:42:34 -07:00
Todd Kennedy
b59b9d04d5 Merge "Don't navigate to a shortcut mailbox" 2011-05-26 14:56:50 -07:00
Makoto Onuki
3a505d8d96 MessageViewFragment: Preparing to use back stack.
Do all the clean-up stuff in onDestroyView() rather than onDestroy(),
so that no callbacks (such as the controller callbacks and
AsyncTask.onPostExecute()s) will work when it doesn't have views.

Change-Id: Ic4aa771d28209ee7b56ac4d228488768ae998dd8
2011-05-26 14:47:13 -07:00
Todd Kennedy
ca6eca0466 Don't navigate to a shortcut mailbox
All shortcuts now have a mailbox associated with them. When launching
the app via shortcut, we want to show the messages within that mailbox, but,
we do not want to navigate into the mailbox; unless the mailbox has children.
Since we don't want to put too much informatin into the shortcut, we must
perform these checks at runtime. So, if ever we try to load a mailbox that
doesn't contain children, we load it's parent instead.

Change-Id: Idb5dbc7cd740b270a0068811abe685f963ca2c0b
2011-05-26 14:21:42 -07:00
Marc Blank
67fefe21b6 Remove change made to workaround DPM issue
Change-Id: I88a9663d513e13ecca5957c61e2e817a8bd847d5
2011-05-26 12:06:28 -07:00
Ben Komalo
fdfeb8d3c3 Prevent NPE in MessageCompose.
New actionBar code makes removeAllTabs() not safe when there are no
tabs.

Change-Id: I9ac09c71872c5f2aaad7b8e3cf5dbe0caac6f8ef
2011-05-26 11:14:05 -07:00
Marc Blank
09a071a879 Don't use multipart/alternative for SmartReply/Forward text
* When confirmed fixed, this should be backported to MR2/MR2

Bug: 4490341
Change-Id: Ie99047b465ed7087e6e0100f7d517ac3fb6b803c
2011-05-26 10:19:01 -07:00
Makoto Onuki
4ade29d6b0 Merge "MailboxListFragment: Preparing to use back stack" 2011-05-26 10:18:14 -07:00
Ben Komalo
d89136e037 am 531f0034: (-s ours) am a40be727: Merge "DO NOT MERGE - Fix some issues with 7" layouts." into honeycomb-mr2
* commit '531f003446910539ca95c1a439f904f2e73dd98a':
  DO NOT MERGE - Fix some issues with 7" layouts.
2011-05-25 21:28:14 -07:00
Marc Blank
40ce9246c6 Merge "Cleanup code in Policy" 2011-05-25 18:52:11 -07:00
Marc Blank
fae5ebbfd2 Cleanup code in Policy
* Use a single method for setting/clearing an account's policy

Change-Id: I90fd97d4a5ba452d4656bbabd06a40797c82e10c
2011-05-25 17:38:12 -07:00
Makoto Onuki
d1b7d43df6 MailboxListFragment: Preparing to use back stack
- Added more lifecycle logs to understand fragment lifecycle better.
- Made sure all code work fine even in the  state where a MailboxListFragment
  is create but doesn't have views.
- Cleaned up list state resoration code.
  Removed the setListAdapter call from onLoadFinished, which lets the
  ListView restore the state by itself, in the case where we're re-loading
  list for DB changes.  We still need to do the restoration manually for
  the orientation change case.

Change-Id: I96bff4ace6d48cc02113c2f5bd6a995260122334
2011-05-25 17:25:44 -07:00
Ben Komalo
51fa1c84b2 Remove an 'xlarge' reference after the 7" split
Change-Id: I9e12dcf28cd69a0859d3d7664e83bf741855ed02
2011-05-25 16:55:31 -07:00
Ben Komalo
529947929c Merge "Step 2 in 7" support for tablets." 2011-05-25 16:54:16 -07:00
Ben Komalo
102a001e96 Merge "Step 1 in - Email support for 7" devices." 2011-05-25 16:43:49 -07:00
Ben Komalo
c1a20e7568 Step 2 in 7" support for tablets.
This is a cherry-pick of f872876699 :
- Use new recommended sw600dp instead of w600dp to avoid having the
"personality" change on configuration change
- remove the use of xlarge/large for specializing values since the
framework team discourages any use of the buckets (and have also changed
the ordering so that they take lower priority)

Change-Id: I645bfb7cddcda8b53569af927f6fa23180e73e1f
2011-05-25 15:44:41 -07:00
Makoto Onuki
3096b4ae18 Add Controller.deleteMessages(long[]) for batch delete
- Also removed the accoundId parameter, which wasn't used.
- Also cleaned up MailboxListFragment.onDrop.
  (the restored Message was only used to get the account id, but
   it's no longer needed.)

Bug 4384642

Change-Id: I8f6635011dae0529a82972617101e1c130090b76
2011-05-25 13:49:40 -07:00