Commit Graph

5916 Commits

Author SHA1 Message Date
Ben Komalo
6b256f1fa1 Wire through results count in search header.
Change-Id: I817236d9c3294acb25b62724cc8c99d47df7f354
2011-06-28 17:11:16 -07:00
Makoto Onuki
ecd9c93cfa Fix one-pane navigation/UI bugs
- Back from the starred mailbox now works.
- Combined view now has the "show all folders" in the spinner.
- Null-out the list context when opening the mailbox list.
- Properly restore the list context when popping from the back stack.
- Disable the account spinner dropdown on the mailbox list.
- Hide the little triangle thing at the right bottom corner of the spinner
  when it's not selectable.

Bug 4836064
Bug 4689313

Change-Id: I41d1b6c7024953407b260f5b4b63fbc366e538ca
2011-06-28 16:30:28 -07:00
Marc Blank
06421df25d Merge "Return total number of results from IMAP search" 2011-06-28 14:19:18 -07:00
Marc Blank
00e53ede39 Fix NPE
Bug: 4969186
Change-Id: I27fbdf7a496ee73caf36a90bf56b91c90133b3b7
2011-06-28 13:52:30 -07:00
Marc Blank
5a9c95f94e Return total number of results from IMAP search
Change-Id: I44eb83042774294aa5aaa8f45a46b82dd78b0141
2011-06-28 12:14:25 -07:00
Ben Komalo
2213a79c36 Merge "Prevent monkey crash on attachment load." 2011-06-28 11:32:07 -07:00
Marc Blank
c0a9fa9c68 Fix NPE
Bug: 4969186
Change-Id: I27fbdf7a496ee73caf36a90bf56b91c90133b3b7
2011-06-28 11:05:02 -07:00
Ben Komalo
efbb408dbb Prevent monkey crash on attachment load.
Bug: 4969655
Change-Id: Ie1cbeaab4b9335aa4b0c2c972647072df21fccec
2011-06-28 09:44:48 -07:00
The Android Automerger
e4e6990e24 merge in ics-release history after reset to master 2011-06-28 06:44:22 -07:00
Marc Blank
5d7ff8577d Synchronize access to mailbox type map
Bug: 4967543
Change-Id: I71380d0d2d5664cf92a9b698bfdad516eeb5c80f
2011-06-27 20:23:40 -07:00
Ben Komalo
8935f6d39e Merge "Show a search results header." 2011-06-27 20:02:44 -07:00
Ben Komalo
9b4f11a4ed Show a search results header.
The count will be wired in and shown in here.

Change-Id: I2f496dcd86d748ee1c17c8e819b65c61c098a8ba
2011-06-27 19:59:23 -07:00
Makoto Onuki
257c037bb5 Use DelayedOperations in ABC
Change-Id: Iadb4def22176cf28bc3a0b78f95b1c7cc9f52f69
2011-06-27 17:56:49 -07:00
Makoto Onuki
a08fd4c74d Merge "Introducing DelayedOperations" 2011-06-27 17:42:01 -07:00
Ben Komalo
f8acc29628 Merge "Introduce a SearchCursorLoader" 2011-06-27 17:32:25 -07:00
Makoto Onuki
6b968c1dce Introducing DelayedOperations
This helps post runnable to the handler and cancel pending runnables
at once.

It'll be used for delay-call methods that initiate a fragment transaction,
and cancel then in onSaveInstanceState().

Change-Id: Ib8bdb0e676e756854ab067a27e5e0f397219a4b4
2011-06-27 17:00:50 -07:00
Ben Komalo
37c8a70d64 Introduce a SearchCursorLoader
This loader will abstract away the waiting for the controller to cleanup
the existing contents of the search mailbox

After some additional, to-be-done plumbing, I'd like
Controller.searchMessages to return some results info (like # of results
at the least) so that the SearchCursor returned can relay that
information to the client (which can then do a lot more interesting
things at that point).

Change-Id: Ifcba0ddf7170c56dac9f3b44128988a5aa4ca887
2011-06-27 15:43:21 -07:00
Marc Blank
bc1fa23031 Merge "Clean up/simplify ExchangeUtils/ExchangeStore" 2011-06-27 14:27:25 -07:00
The Android Automerger
a11db637f8 merge in ics-release history after reset to master 2011-06-27 14:24:57 -07:00
Makoto Onuki
d538d4bce1 2pane: Show/hide fragments *before* animation starts
To fix "IllegalStateException: Can not perform this action after
onSaveInstanceState".

Bug 4522010

Change-Id: I640fab0d51b02467f2f91d0d33091e1daac356fd
2011-06-27 14:10:11 -07:00
Makoto Onuki
569083fab3 Merge "New account spinner" 2011-06-27 13:22:41 -07:00
Makoto Onuki
4689cb7100 New account spinner
- Don't use the action bar spinner.
  Instead use a custom view to show the current account.
  (It's not a spinner; now we show the dropdown list by ourselves,
  which gives us more detailed control.)

- Also show the current mailbox name/unread count with the account name.

- Removed the mailbox info loader in ABC.
  Instead, now the AccountSelectorAdapter loader loads the current
  account/mailbox name, and the unread count as extras.

- Now ABC.Callback.onMailboxSelected passed an account ID as well
  as a mailbox ID.

- There's new code paths that can cause the "fragment transaction in
  onLoadFinished" exception.  We need to fix this properly, but
  for now we just use commitAllowingStateLoss().

Bug 4948352

Change-Id: I73bb8b7530f8328ca1c86382ac0a54086ad061d7
2011-06-27 13:19:27 -07:00
Marc Blank
66a47b8dac Clean up/simplify ExchangeUtils/ExchangeStore
* Rename ExchangeUtils to EmailServiceUtils
* Create calls for Exchange to use (eventually remove these)
* Get rid of lots of nonsense in ExchangeStore

Change-Id: Ic538cfe1de57eca24088ee1f590264283d12f511
2011-06-27 12:14:04 -07:00
Ben Komalo
9e4a4149c8 Merge "Persist trusted sender set to preferences" 2011-06-27 10:00:53 -07:00
Ben Komalo
b1f3c2d73f Merge "Improved "show pictures" support." 2011-06-27 10:00:49 -07:00
Ben Komalo
ca22a51a9c Merge "Replace details dialog with expando subheader" 2011-06-27 09:58:30 -07:00
The Android Automerger
9eeee53b50 merge in ics-release history after reset to master 2011-06-27 06:51:02 -07:00
Makoto Onuki
ad6c48b2d3 Merge "Fix log spew: Attempt to retrieve bag ..." 2011-06-26 18:42:22 -07:00
Brian Carlstrom
8f1da98063 Merge "Replace KeyChainActivity placeholder UI with more polished dialog (4 of 5)" 2011-06-26 15:30:43 -07:00
Makoto Onuki
178e2930e7 Supress the usual mime warnings from mime4j
Supress "Body part ended prematurely" and "Unexpected end of headers detected".
I believe these happens because we feed partial messages to the parser.

We've kept these logs only "just in case", but I don't think it's ever been
usueful...

Change-Id: I29e5e48abf71612eed656ce6569246caf8a320bc
2011-06-26 14:02:52 -07:00
Makoto Onuki
679ab33ed5 Fix log spew: Attempt to retrieve bag ...
Bug 4949998

Change-Id: I8b6c88b16ad7657c3e5c247c28fc026129cb86f3
2011-06-26 13:21:39 -07:00
Ben Komalo
04795828d9 Persist trusted sender set to preferences
This makes it so that "always show pictures" from a sender works

Change-Id: I6e6c6d8dc78746d0828428b6c6256c4fff3eb111
2011-06-25 17:48:20 -07:00
Ben Komalo
66282fb6ff Improved "show pictures" support.
This is the UI part for remembering to show images based on senders.
It does not persist anything yet.

Change-Id: Iec40d9d1ace3661dabca2eed31ea6d0893be71e0
2011-06-25 16:54:09 -07:00
Brian Carlstrom
312b2fb561 Replace KeyChainActivity placeholder UI with more polished dialog (4 of 5)
frameworks/base

    Extended KeyChain.chooserPrivateKeyAlias to allow caller to supply
    preferred choice to be selected in chooser. This allows Email
    settings to highlight the current choice when allowing user to
    change settings.
	keystore/java/android/security/KeyChain.java
	api/current.txt

    Implemented KeyChain functionality to pass host and port
    information to KeyChainActivity for display.
	keystore/java/android/security/KeyChain.java

    KeyChain now sends a PendingIntent as part of the Intent it sends
    to the KeyChainActivity which can be used to identify the caller
    in reliable way.
	keystore/java/android/security/KeyChain.java

    Moved .pfx/.p12/.cer/.crt constants to Credentials for reuse.
    Added Credentials.install variant with no value for use from KeyChainActivity
	keystore/java/android/security/Credentials.java

packages/apps/CertInstaller
    Source of extension constants now in Credentials
	src/com/android/certinstaller/CertFile.java

packages/apps/Browser
    Have browser supply host and port information to KeyChain.choosePrivateKeyAlias
    Tracking KeyChain.choosePrivateKeyAlias API change
	src/com/android/browser/Tab.java

packages/apps/Email
    Tracking KeyChain.choosePrivateKeyAlias API change
	src/com/android/email/view/CertificateSelector.java

packages/apps/KeyChain

    KeyChain now depends on bouncycastle X509Name for formatting
    X500Principals, since the 4 X500Principal formatting options could
    not format emailAddress attributes in a human readable way and its
    the most important attribute to display for client certificates in
    most cases.
	Android.mk

    Changing the UI to a dialog, make the activity style transparent.
	AndroidManifest.xml
	res/values/styles.xml

    Layout for chooser dialog
	res/layout/cert_chooser.xml

    Layout for list items in chooser
	res/layout/cert_item.xml

    New resources for dialog including comments for translators.
	res/values/strings.xml

    New dialog based KeyChainActivity. Now also shows requesting app
    and requesting server. Now can preselect a specified alias. New
    link directly to CertInstaller.

	src/com/android/keychain/KeyChainActivity.java

    Fix KeyChainTestActivity to work with TestKeyStore changes that
    were causing network activity on the UI to look up the name of
    localhost. Also track KeyChain.choosePrivateKeyAlias API change.

	tests/src/com/android/keychain/tests/KeyChainTestActivity.java

Change-Id: I131f7708cede39669491a23ead3860907460d31f
2011-06-25 16:48:38 -07:00
Ben Komalo
5cba9c10ac Replace details dialog with expando subheader
Change-Id: I7b0f63b7b5ce7172ac32b8c00891005b9f2e28ee
2011-06-25 16:34:37 -07:00
Makoto Onuki
f9a9f52897 Fix header text on mailbox list fragment
Bug 4946676

Change-Id: I829c8df4a4e268e8807a3ec686dca5afdd173713
2011-06-24 18:57:47 -07:00
Makoto Onuki
6390b06e3b Merge "Add debug log to investigate bug 4905749" 2011-06-24 18:45:28 -07:00
Makoto Onuki
d8a2e33998 Add debug log to investigate bug 4905749
Change-Id: I1cfe12b0150490ec08caa02332bcca88521ff5fd
2011-06-24 18:44:31 -07:00
Makoto Onuki
329ca184e7 Merge "Yet another action bar fix..." 2011-06-24 18:43:49 -07:00
Ben Komalo
94c002349f Merge "Set list context through a central place." 2011-06-24 17:29:41 -07:00
Marc Blank
12b7932996 Merge "Clean up search handling in Controller" 2011-06-24 17:04:06 -07:00
Marc Blank
bad39b2e00 Clean up search handling in Controller
* Use same code for handling search mailbox for IMAP and EAS
* Allow "Load More" for EAS search mailbox

Change-Id: Id4a009c79a95302d627ff25f85e9c65bc461826f
2011-06-24 17:03:27 -07:00
Makoto Onuki
f4622a8ac7 Yet another action bar fix...
It's a temporary fix.  Proper fix underway...

Change-Id: I225e04168f7fae6a3b411659a27e79b28022ac40
2011-06-24 15:26:52 -07:00
Ben Komalo
78c450ab14 Set list context through a central place.
Bug: 4946658
Change-Id: I3f283088697b282b98a1c4e15ddf1f9641991806
2011-06-24 15:26:04 -07:00
Gilles Debunne
a8779053e5 Merge "Changed unknown source setting link" 2011-06-24 14:39:49 -07:00
The Android Automerger
f2a7134057 merge in ics-release history after reset to master 2011-06-24 14:22:51 -07:00
Makoto Onuki
3c76df4f1f Workaround for bug 4946695
Proper fix on the way.

Change-Id: I22549d0e90b521d27271a8160fe8e43dae18defa
2011-06-24 14:21:27 -07:00
The Android Automerger
c41af37c39 merge in ics-release history after reset to master 2011-06-24 13:30:28 -07:00
Gilles Debunne
9722c1bfed Changed unknown source setting link
This settings has been moved to Security.

Change-Id: Ifbb6edf28d258303bad5b39e0df34b9e8ea20d99
2011-06-24 12:31:02 -07:00
Ben Komalo
3db7f76fef Merge "Update notification text according to design" 2011-06-24 10:02:50 -07:00