Commit Graph

5508 Commits

Author SHA1 Message Date
Makoto Onuki
4431a74be5 Merge "Message list: Hide CAB when in back stack." 2011-06-07 18:46:59 -07:00
Makoto Onuki
ab2dba417a Message list: Hide CAB when in back stack.
Because isViewCreated() is used by updateSelectionMode() which is called from
onDestroyView(), we can't use getView() to determine if the CAB should be
shown.

Change-Id: I8d868998031115800766000fb0128f1d1d3541cd
2011-06-07 18:23:47 -07:00
Todd Kennedy
32d45f6669 Merge "update account spinner properly" 2011-06-07 17:52:32 -07:00
Ben Komalo
261ea5125b am 1c53a128: (-s ours) am c379ebe3: DO NOT MERGE Revert "Enable SD card encryption policy when emulated"
* commit '1c53a1287f1f6b9448b24931a313ffd21120bdc9':
  DO NOT MERGE Revert "Enable SD card encryption policy when emulated"
2011-06-07 17:17:31 -07:00
Todd Kennedy
7305cf5c8e update account spinner properly
Fixes two issues:
1. if a recent folder was selected from the spinner, the user could not
re-select it (even if they navigated to another mailbox using the mailbox
list) unless they manually selected another element in the spinner
2. the recent item "show all folders" did not set the associated account
position, so, when selecting that item, the spinner was not showing the
correct view.

Change-Id: I469f9f28aebd36a348534def28a4c476c0df366d
2011-06-07 17:12:34 -07:00
Todd Kennedy
dc6928d798 Add recent mailboxes to the mailbox list
Change-Id: I84ee9d0da43ccac4d10e5122f57583c4b39cf65d
2011-06-07 16:40:12 -07:00
Todd Kennedy
1b404f4fff Collapse MailboxAdapter & MailboxFragmentAdapter
MFA was the only subclass of MA and the abstraction no longer made sense.
Collapse the two into a single adapter class.

Change-Id: I32c6f027bc37f3da08626f743c3f494e5f48c3f0
2011-06-07 14:34:16 -07:00
Todd Kennedy
96e44859cf Merge "Always add "recent" header for one pane view" 2011-06-07 14:23:50 -07:00
Makoto Onuki
f329665e10 Merge "Remove "Show all folders" menu item." 2011-06-07 14:18:05 -07:00
Makoto Onuki
f1097ba7e9 Merge "Revive message view specific menu options" 2011-06-07 14:17:18 -07:00
Makoto Onuki
ed14960af5 Merge "New method to see whether 1-pane or 2-pane UI..." 2011-06-07 14:06:57 -07:00
Makoto Onuki
c6bb2ab553 Revive message view specific menu options
Revive the delete, move, mark unread options

This was lost during the refactoring.

Bug 4483764

Change-Id: Ic8d79f926aac303b3ff7477019cd05c29d614627
2011-06-07 14:00:43 -07:00
Makoto Onuki
101f929b3c Remove "Show all folders" menu item.
Now the account spinner has this.

Change-Id: I95e771e512f6c70ea9ddd8084c29a2f99b4cd758
2011-06-07 13:50:44 -07:00
Makoto Onuki
347ae23b69 New method to see whether 1-pane or 2-pane UI...
should be used.

From now on, UiUtilities.useTwoPane() should be used to see which UI
should be used.

You can pass the DEBUG_PANE_MODE extra when launching Welcome
to force which UI mode to use.  (See the comment inside Welcome.)

Change-Id: Iefa3737e4979eb55f7986a9033ff9c6266d32f52
2011-06-07 13:41:42 -07:00
Todd Kennedy
132307281d Always add "recent" header for one pane view
The one pane view will always have something in the recent list (either the
default recent list or the "all folders" item).

Change-Id: Ic264b59dc25504a8ce75bea6efae53a0d5dede87
2011-06-07 13:28:01 -07:00
Todd Kennedy
da3d04ea31 Add ability to create headers in the mailbox list
Change-Id: I9d1054056db7b6ac993570adcc4adc4cc6699e9c
2011-06-07 12:01:35 -07:00
Makoto Onuki
ab40c98821 More work on fragment install/uninstall.
- Now we "uninstall" a fragment in Fragment.onDestroyView.
  i.e. a fragment transaction is actually executed.
- Maintain our own "about to be removed" fragment list to avoid
  double removal of a fragment.

Change-Id: I61328e0a09a7af00cbb0e6ba10a2d39c11b5c3dc
2011-06-07 11:13:37 -07:00
Makoto Onuki
cb530b4e91 Merge "Use the CursorWithExtras pattern for the message list." 2011-06-07 11:12:31 -07:00
Todd Kennedy
99c1da2642 Merge "Implement account spinner recent list for one pane" 2011-06-07 10:44:12 -07:00
Jean-Baptiste Queru
eaf4f04a02 Reconcile with gingerbread-release
Change-Id: I157c5ff640aa9e4c862a3f4c0903c323ec064921
2011-06-07 10:42:35 -07:00
Todd Kennedy
a09ac7d417 Implement account spinner recent list for one pane
This adds the default recent list and 'show all folders' to the one pane UI.

Change-Id: I877f854ff4f9c7440cbd40f2a9ded8aba4002656
2011-06-07 10:04:59 -07:00
Todd Kennedy
a757aaa055 Properly display spinner when necessary
Previously, we were deciding whether to show the spinner if the returned cursor
had more than 1 element. However, the cursor would _always_ have more than one
element because it contains a header in addition to the account information.

We now save away the number of accounts and the size of the recent list into the
cursor so we can use those counts to determine if the spinner should be shown.
Both of these counts are necessary as we want to show the spinner even if there
is only a single account as long as it has at least one recent mailbox.

Change-Id: If428c496a548a25f6b5cd7301ddb5c0d6876750c
2011-06-07 09:33:19 -07:00
Todd Kennedy
e392418840 Add recent mailboxes to the account spinner
The ability to change mailboxes using the spinner is currently only implemented
for the two-pane UI. one-pane implementation will come in a future CL.

Change-Id: If72e9d9d607508553c918f5523e748e8a481ff84
2011-06-07 08:48:37 -07:00
Ben Komalo
1c53a1287f am c379ebe3: DO NOT MERGE Revert "Enable SD card encryption policy when emulated"
* commit 'c379ebe3722b5d21201246a714eeea99d8679b96':
  DO NOT MERGE Revert "Enable SD card encryption policy when emulated"
2011-06-06 18:18:27 -07:00
Makoto Onuki
63a206ea56 Merge "Manually restore list view state." 2011-06-06 17:14:04 -07:00
Makoto Onuki
41878c2813 Use the CursorWithExtras pattern for the message list.
This will make the message list a lot snappier.

We were using two different loaders for the message list; one is to load
the meta information and the other to load the actual message list.

Unify them using the CursorWithExtras pattern.

Change-Id: I02957bbca1b1fb74ca6eca14ad2535dfdbf03a5a
2011-06-06 16:34:03 -07:00
Eric Fischer
32bf4dd757 Merge "Import revised translations." 2011-06-06 16:21:45 -07:00
Makoto Onuki
345a61d0b9 Manually restore list view state.
Bug 4532222

Change-Id: I6f3394b7ffd55b32e1932e3e425cc0d0ae720e27
2011-06-06 16:13:16 -07:00
Eric Fischer
f56757fa52 Import revised translations.
Change-Id: Id0b238a8d86062a59411bce6c7bf0f3e7bb28a39
2011-06-06 15:58:30 -07:00
Todd Kennedy
47806a2244 Merge "Fix filtered query" 2011-06-06 15:11:29 -07:00
Todd Kennedy
3a1e874a9c Fix filtered query
we need to return 5, post filtered, results. previously, we were returning
5, pre filtered, results. Also add a test to catch this condition.

Change-Id: Id25f4bf79081c42a2012e0e51b36142120c83b20
2011-06-06 14:58:39 -07:00
Makoto Onuki
d42b3222fb Merge "Make message list behave nicely when it's in back stack" 2011-06-06 14:33:19 -07:00
Todd Kennedy
69461503fb Add "Accounts" header to the AB spinner
Change-Id: I35e4b7295db16db803ede084cf65fa3f2115f770
2011-06-06 14:11:09 -07:00
Ben Komalo
c379ebe372 DO NOT MERGE Revert "Enable SD card encryption policy when emulated"
This reverts commit 7fd14be804

The introduction of proper SD cards breaks the invariant that "external"
storage can be encrypted. Unfortunately, this means that accounts with
that policy bit set will have to be removed for now.

Accounts with the security policy set will be forced to go through
security provisioning on the next sync, using the regular mechanisms of
showing a notification with "Security update required", and then having
it fail. :(

Bug: 4466311
Change-Id: I68119b14f8d198779c2073296e228bc6772136ee
2011-06-06 12:32:23 -07:00
Makoto Onuki
296d7d3614 Make message list behave nicely when it's in back stack
- Hide CAB when it has no views.
- Stop pending tasks and refresh callbacks when it's paused.

Change-Id: Idaae9061237ce9f923c002d659e8e12407e4bad1
2011-06-06 10:39:05 -07:00
Todd Kennedy
49e424c60f Merge "Add ability to track mailbox recency" 2011-06-06 10:30:50 -07:00
Todd Kennedy
f04c832f23 Add ability to track mailbox recency
Change-Id: I1bcc7928ea7065a5daa262b7cea7ee3e21981675
2011-06-06 10:30:01 -07:00
Ben Komalo
cd1f3d33a9 Cherry-pick ff269c6d50 - Minor fixes to setup screen for 7"
(this conflicted and the automerger situation was a disaster, so I
  opted to skip immediately to help clear the backlog, now I'm
  cherry-picking manually)

 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.

Change-Id: I3009e7c66f729a96f404263d79e77d3ab4d831ae
2011-06-03 18:06:46 -07:00
Ben Komalo
a04e65226e am 769ad582: (-s ours) am ff162ee2: Merge "Minor fixes to setup screen for 7"" into honeycomb-mr2
* commit '769ad5825f8ec03d98d6c6b63a0174ba3fa571cb':
  Minor fixes to setup screen for 7"
2011-06-03 18:01:42 -07:00
Andrew Flynn
bb05c6a2c0 am ccb4cab3: am 741c789c: Fix button spacing for smaller tablet screens in portrait.
* commit 'ccb4cab3dd4d78eb80b130728ffb5e6a88f3f22a':
  Fix button spacing for smaller tablet screens in portrait.
2011-06-03 17:56:13 -07:00
Todd Kennedy
7d9d3a220a Merge "Add new column to table creation method" 2011-06-03 16:48:54 -07:00
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