Commit Graph

5595 Commits

Author SHA1 Message Date
Makoto Onuki cfd89da9c3 Make EmailActivity the default activity.
We still go through Welcome when the app is launched from account/mailbox
shortcuts or a widget, to clear all existing activity instances, but
when the app is launched from the launcher we just open EmailActivity.

This will get rid of the flicker.

Change-Id: I9bff31fb96e24c125ddc0a1e30a007e6d6ff036d
2011-06-21 14:11:05 -07:00
Makoto Onuki d7d4954860 Merge "Fix failing tests" 2011-06-21 11:40:26 -07:00
Makoto Onuki ce4cce05b2 Fix failing tests
Fixed activity tests and and activity.setup tests.

Bug 4762098
Bug 4766087
Bug 4590590

Change-Id: Ifbd49f38c59854c65b6c48a1b03ca8153bfa558b
2011-06-21 11:18:32 -07:00
Jorge Lugo 72fad84fc3 Merge "Improved saving of drafts when back key is pressed" 2011-06-21 10:41:21 -07:00
Makoto Onuki 369905c95d Fix crashing tests
Some of the tests are still failing, but at least now we can go through till
the end.

- Fixed NPE in WelcomeTests (caused by the mock context not returning a proper
  layout inflator.)
- Removed the rainy day test from MessageFileViewTest.
  (Not setting a proper intent will result in the argument check in
  MessageFileViewFragment)
- Removed unnecessary null check in EmailProvider.getDatabase()

Bug 4766072

Change-Id: I48b92cc91d0417cd9980c131fda8f63a9a6eb990
2011-06-20 20:01:22 -07:00
Makoto Onuki 09a0e9b5dc Merge "Move restore account to EmailProvider." 2011-06-20 18:46:09 -07:00
Makoto Onuki 9dad9ad973 Move restore account to EmailProvider.
In order to reduce the UI initialization code, move
let EmailProvider restore accounts when it opens the DB.

Backup can be moved too, but I just leave it as a TODO.

Change-Id: Id5c1810904db6abaecbfecbaa8d2d53834ebf07b
2011-06-20 18:19:17 -07:00
Eric Fischer b41602ed94 Merge "Import revised translations." 2011-06-20 16:04:03 -07:00
Jorge Lugo ae95fbf4d0 Merge "Added quick responses." 2011-06-20 15:10:06 -07:00
Ben Komalo 2441dd5cbb Merge "Cleanup and collapse some methods together." 2011-06-20 14:49:47 -07:00
Eric Fischer dbc012db25 Import revised translations.
Change-Id: I18da9c5cb5267e306f3d5af41490027e938d4dbc
2011-06-20 14:46:40 -07:00
Ben Komalo e16d6d7f95 branch message list item XML
This separate the layouts for the message list item so that we can
change the phone and tablet independently.

The visuals weren't really updated except for easy to win padding
reductions.

Change-Id: I92ed6e1bf275551abd77fd788b5c7ac22f639843
2011-06-20 14:41:22 -07:00
Jorge Lugo 5a3888f35b Added quick responses.
Added "Insert quick response" button to MessageCompose's action bar. Clicking
it opens dialog with available quick responses. Selecting one of the responses
will insert it into message body at the current cursor location. Also added
menu in account preferences to create, edit, and delete quick responses.

Change-Id: I85f3f6b36801cf112ec9d7c31135a917456173d7
2011-06-20 13:31:50 -07:00
Jorge Lugo d5fe048224 Improved saving of drafts when back key is pressed
In MessageCompose, pressing reply, reply all, or forward and then selecting
back without writing or modifying any part of the message will no longer
increase the draft count. Additionally, entering the compose window and
immediately rotating the screen before pressing the back key no longer
increases the draft count either.

Bug: 4584605
Bug: 4501806
Change-Id: I74db3f05d696b23fa7d0d64ae87e06fade4c57ee
2011-06-20 11:50:38 -07:00
Ben Komalo a355a4abe2 Cleanup and collapse some methods together.
Change-Id: Ida38b63362c50052064d7a5342febfe9e4a9c89e
2011-06-20 11:30:24 -07:00
Ben Komalo 99401ebea7 Remove a layer of callback in inbox finder.
I'm changing it so that inbox finding happens at an earlier stage so
that the UIController.open() methods can be simpler. Specifically: I
want them to just always accept a mailbox, and not have to deal with an
intermediate state where it's still looking for a mailbox.

Change-Id: I1c5be783859a3bee7e46007e778de13eb1685cbe
2011-06-17 19:44:10 -07:00
Ben Komalo facd131fad Merge "some brain dead typing shortening" 2011-06-17 19:42:06 -07:00
Ben Komalo 36f89da544 some brain dead typing shortening
Change-Id: I9342e8da52b412fd844b98ff76e61a9e4f9c5af7
2011-06-17 19:20:20 -07:00
Marc Blank ed1dc9ee72 Support "Load More" for IMAP search
Change-Id: I47e5fd1fab421026ee52af72ba56338c69e9b467
2011-06-17 15:43:18 -07:00
Ben Komalo ac11e3bb99 Some re-arrangements in UI for search.
This moves the logic for performing the search closer to where it will
actually happen (i.e. on Intent resolution). A lot of this is still
temporary code. I will follow up with some larger changes to extend the
UIController API so it doesn't have to do hacks internally.

Change-Id: I1eb84d26ee3dcbfa0b68dbd37dcb0a6180452962
2011-06-17 11:55:35 -07:00
Ben Komalo f62fd3fd17 ensure that search mailboxes don't have parents
This causes issues in the mailbox list when trying to auto navigate to a
search mailbox

Change-Id: Ie4e43f20ec662a7c9304dd906ba5a58560cba9f5
2011-06-17 11:42:14 -07:00
Marc Blank 0b34643204 Merge "First implementation of IMAP search" 2011-06-16 20:27:16 -07:00
Marc Blank 627bc6ed57 First implementation of IMAP search
* Broke up synchronizeMailboxGeneric into three pieces; it's still
  horrible, but this at least stops my eyes from bleeding
* Remove unused method/tests from Folder interface

Change-Id: Ib4d979536be657137cf70ca535cf429d707be41b
2011-06-16 20:26:52 -07:00
Mindy Pereira 579d8d5da5 Merge "Integrate chips into Email." 2011-06-16 17:43:47 -07:00
Mindy Pereira 87763f0ae8 Integrate chips into Email.
Change-Id: Ice037a55a169037f725a667fad7714c7e9580b86
2011-06-16 17:41:04 -07:00
Ben Komalo cb24e515b7 Add one more error state to certificate process
When the KeyStore fails to give us back a certificate for any reason (it
was removed from the keystore perhaps), propagate the error back up.

Change-Id: I4f0ef783c1665589cc8ccb43d95da43a297a3e9a
2011-06-16 16:14:03 -07:00
Ben Komalo 8401dba404 Merge "Handle upgrade from existing device admins" 2011-06-16 15:06:57 -07:00
Ben Komalo aa0a355397 Handle upgrade from existing device admins
This ensures old admins that can't control the camera doesn't try to do
so

Bug: 4686257
Change-Id: Ia2bb8bf2ccf9fb3d1d45ce1ba0affd2ccc9822a9
2011-06-16 14:40:15 -07:00
Marc Blank 1579b7864a Merge "Fix Store caching" 2011-06-16 13:58:24 -07:00
Ben Komalo 8f00683864 Merge "Actually declare use of new policy in deviceadmin" 2011-06-16 13:44:49 -07:00
Ben Komalo 30e9481e86 Actually declare use of new policy in deviceadmin
oops.

Change-Id: I24a8d32bf6068653a59e4f7217d7beb8d68ca0ed
2011-06-16 13:39:21 -07:00
Makoto Onuki c16d060bda Merge "Switch to synchronous transaction." 2011-06-16 11:48:03 -07:00
Makoto Onuki 2a292e235c Switch to synchronous transaction.
Change-Id: I02639276e4cedd62d288433acb0dfaf34c7a4e76
2011-06-16 11:40:37 -07:00
Ben Komalo f4dbbf1099 Indicate to the user when a cert error happens.
This introduces an exception which needs to be thrown from a KeyManager
when it tries to establish a connection with a server requesting a
certificate.

Change-Id: I06dfad7789ed5d320b630e7e4380e15da42a48df
2011-06-16 11:37:23 -07:00
Ben Komalo f8d8dfac7a Merge "Make "don't allow camera" a supported policy." 2011-06-16 11:17:37 -07:00
Ben Komalo d09cff0888 Make "don't allow camera" a supported policy.
This sends the bit to the DPM. Separate changes have been/will be made
to change the provision parser and support it in the DPM.

Bug: 4185316
Change-Id: I44872ceb095a28539b047a0641cc499c7186a9b3
2011-06-16 10:44:48 -07:00
Eric Fischer 1604adc925 am 10db782d: (-s ours) am 7a2f7800: Import revised translations. DO NOT MERGE
* commit '10db782d8f0d986a856c16bc15fbcb5c87d6082c':
  Import revised translations.  DO NOT MERGE
2011-06-16 09:31:59 -07:00
Marc Blank f65bdbdaf5 Fix Store caching
Bug: 4671090
Change-Id: I07413eb713c564f6dbcac45091357153cfe19a5d
2011-06-16 09:24:44 -07:00
Eric Fischer 10db782d8f am 7a2f7800: Import revised translations. DO NOT MERGE
* commit '7a2f7800123e5efaa7fa26a1abaf9ca77776a5ea':
  Import revised translations.  DO NOT MERGE
2011-06-15 16:47:18 -07:00
Eric Fischer 7a2f780012 Import revised translations. DO NOT MERGE
Change-Id: I9afd9a0654fb45643aafcc96fc9bfa963e6eb72b
2011-06-15 15:09:35 -07:00
Ben Komalo b40bdb17df Merge "Introduce a cert selector in exchange settings UI." 2011-06-15 11:17:40 -07:00
Daisuke Miyakawa 48e977aab6 Merge "Send email usage feedback to ContactsProvider" 2011-06-14 20:57:27 -07:00
Ben Komalo 82e0e1c4c5 Show sync window prefs for EAS only.
Bug: 4651025
Change-Id: I1633a2a94e28466686e90df4ff0cdebaaa1a81df
2011-06-14 19:10:28 -07:00
Daisuke Miyakawa 3975a28918 Send email usage feedback to ContactsProvider
This enables the provider to count the number of contacted
per email address basis, which should improve auto-complete
quality.

Bug: 4371572
Change-Id: I4f0e586d3edff5a460e33dc7d9f9680119a8d568
2011-06-14 19:06:47 -07:00
Ben Komalo e4ca576ab0 Low-cost minimal fixes to make phone UI usable
This is a stopgap fix prior to getting designs in to at least make the
various message view components visible on screen so people can at least
use the app.

Note that this also removes reply all/forward, as per the design (the
idea is you can switch in the compose view, so we don't want to waste
real estate in the message view).

Bug: 4644072
Change-Id: I86f041678373a0fbc79a2e135a47cd1e5b1357c7
2011-06-14 18:07:32 -07:00
Ben Komalo 871d031e4f Merge "Fix ambiguously named getters." 2011-06-14 18:03:42 -07:00
Ben Komalo 913e26180d Fix ambiguously named getters.
Change-Id: Ieec918a520fd291d8d85695d1a86b85a73b266a5
2011-06-14 17:38:19 -07:00
Ben Komalo 7014f7d329 Introduce a cert selector in exchange settings UI.
This simply allows the user to select a certificate from the KeyChain to
use for credentials.

Text and UI not finalized.

Change-Id: Ib86abc3c2e899640218122caa12308dc9646dab6
2011-06-14 17:34:09 -07:00
Makoto Onuki 6f8ed24c09 Merge "Add "search mode" to the action bar" 2011-06-14 15:20:30 -07:00
Makoto Onuki 0f27632749 Add "search mode" to the action bar
- Instead of the search dialog, show the search widget on the action bar.
- Launches a new activity for search, but still uses the temporary search code
- Search still works only on two-pane.

Change-Id: I1d36ad3416c7dff9579cf37e40e49e31c9d99219
2011-06-14 15:13:32 -07:00