Commit Graph

6182 Commits

Author SHA1 Message Date
The Android Automerger
6fd92997c5 merge in ics-release history after reset to master 2011-08-01 07:00:09 -07:00
Marc Blank
27a04fecfb Fix EmailProvider database upgrades
* Two of the upgrades (v21->v22 and v25->v26) need to be fixed so
  that they don't reference columns that might not exist.
* Oops

Bug: 4439595
Change-Id: I4a8c556be22bb85fb78807416cd1d6b81c6ef118
2011-07-29 21:53:44 -07:00
Ben Komalo
8bdfee9eec Merge "Update assets" 2011-07-29 10:24:38 -07:00
Ben Komalo
d9e8dcae2f Update assets
- updated checkboxes (new ones for sw600dp and phone)
  ones for phone)
- updated stars (new ones for sw600dp and phone)
- added existing cc/bcc icon to menu item
- updated reply/replyall/forward actions to dark themed items (renames
involved)
- update message list backgrounds (new ones for hdpi,xhdpi, renamed
  everything so that there is no message_ or conversation_
  suffixes, also added missing states for some of the selectors)

Change-Id: I1b4f49f206b846566870f5b430e3c6386e621a0c
2011-07-28 14:40:02 -07:00
Marc Blank
1f825aa538 Merge "Catch NPE in AttachmentDownloadService" 2011-07-28 14:22:44 -07:00
Marc Blank
d9b2a8f237 Make "security required" notification ongoing
* While investigating the referenced bug, it was discovered that
  canceling the "security required" notification (with "X", rather
  than the "cancel" option in the dialog) causes the notification
  to be unavailable until a reboot
* This puts the account needing a security update in the position
  of being unsyncable, and might explain the referenced bug (we
  have no confirmation of that step; on the other hand, the tester
  can't now reproduce the problem, so an unusual action like this
  is to be expected)
* The fix consists of making this particular notification "ongoing",
  which prevents the user from dismissing it; arguably, this should
  always have been the case anyway...
* Consider this fix for backport into LTE and MR2 branches

Bug: 5072343
Change-Id: Ia7419236cf9389380d1e079b1a9a6f425015c487
2011-07-28 13:59:16 -07:00
The Android Automerger
098d42f68f merge in ics-release history after reset to master 2011-07-28 06:38:57 -07:00
Marc Blank
0306da14e3 Correct recently added EmailProvider logging
Change-Id: Ica61b7bcbe455448a1a261c83defa840ab1abf3e
2011-07-27 21:57:06 -07:00
Ben Komalo
f64fd6fe71 Merge "Search delay fixes." 2011-07-27 20:28:17 -07:00
Ben Komalo
afc49730e4 Merge "Let Data Usage settings jump to Email settings" 2011-07-27 20:27:41 -07:00
Marc Blank
7390b18776 Log return of null from query()
* This shouldn't happen, but ... log it just in case

Change-Id: I8b8df3fec84c9dd14ebb222ee665b0712f63f213
2011-07-27 16:48:35 -07:00
Marc Blank
41c63a05eb Catch NPE in AttachmentDownloadService
%$!@#*&%

Bug: 5055519
Change-Id: Ie155c8d0f9931b51613f7d77e4545531bc148964
2011-07-27 15:53:51 -07:00
Ben Komalo
f653fdf7bf Let Data Usage settings jump to Email settings
Bug: 4725602
Change-Id: Ic343e046007859326f3f3314ac79f826617b21f5
2011-07-27 12:31:22 -07:00
Ben Komalo
391b9d4abd Search delay fixes.
- adds a loading state to search so the user isn't left with a blank
screen for several seconds
- adds a timeout so that a warning message is shown for results that
take over 10 seconds
- use default loading/no message views in ListFragment so we don't have
to manager our own stuff

Bug: 5014107
Bug: 5037618
Change-Id: I8b03fa0967055989156c7777901affc777c4fae7
2011-07-27 11:37:54 -07:00
The Android Automerger
7ea80e36b4 merge in ics-release history after reset to master 2011-07-27 06:48:50 -07:00
Ben Komalo
786285b3a6 Merge "Hide irrelevant options in mailboxlist." 2011-07-26 13:41:32 -07:00
Ben Komalo
1340b2f82b Hide irrelevant options in mailboxlist.
Bug: 5080327
Change-Id: Ief9544b9d8a70a16b90f268bca1342b697fc6962
2011-07-26 13:32:05 -07:00
Eric Fischer
31d2aad3bd Merge "Import revised translations." 2011-07-26 13:11:11 -07:00
Martijn Coenen
c34e2dcb3d Merge "NFC zero-click sharing for Email." 2011-07-26 11:32:05 -07:00
Marc Blank
1278df63de Merge "Ignore watchdog alarms for stopped service" 2011-07-26 10:22:21 -07:00
Marc Blank
cb2f0a8bb9 Ignore watchdog alarms for stopped service
Bug: 5055519
Change-Id: I35352364f3f2842932ad40e47d70646bb6d42349
2011-07-26 09:59:10 -07:00
Martijn Coenen
e5b15cd3c8 NFC zero-click sharing for Email.
This shares the e-mail address of the currently shown account
over P2P NFC links. Note that the currently set account must
be updated actively, because the callback to create the message
comes from one of the NFC threads, which don't have permissions
to retrieve the account and the correspondig e-mail address.

Change-Id: I12e48a3787d469179e7ca074429106ed24e3a212
2011-07-26 11:45:11 -05:00
The Android Automerger
ab22c7babf merge in ics-release history after reset to master 2011-07-26 06:37:58 -07:00
Eric Fischer
f8eca7fd09 Import revised translations.
Change-Id: Ibbf3359c44301209ec1bbb286caa74f7c22b821a
2011-07-25 17:40:34 -07:00
Ben Komalo
1f02d123d2 Merge "Fix mailbox finding and unit tests." 2011-07-25 17:15:36 -07:00
Ben Komalo
cb1d65c478 Fix mailbox finding and unit tests.
We seemed to not properly fallback to querying the database if the cache
did not contain a mailbox of a specific type. We may want to consider
caching mailboxes related to PIM data, but for now this is a quick fix.

Also fixes unit tests.

Bug: 5019661
Change-Id: Idcac0a6f15aa7f174890ae586f478fbb8f6e05b7
2011-07-25 16:51:47 -07:00
Mindy Pereira
79198b913f chips: Use view instead of string.
This allows us to get the correctly styled more view.

Change-Id: Ifebea40eb2b0a27a5aba772c628cf95d22445e38
2011-07-25 14:39:17 -07:00
Ben Komalo
50f4fbf2f6 Merge "Add in settings menu in Welcome." 2011-07-25 13:41:48 -07:00
Mindy Pereira
32181d2d23 Merge "chips: the seperator methods are no longer needed." 2011-07-25 13:36:45 -07:00
Ben Komalo
74acf8d9de Add in settings menu in Welcome.
This will avoid cases where the user is permanently stuck, if we fail to
error out when a failed sync occurs or for any reason.

Bug: 5032763
Change-Id: Ib82a62add767d13dc844a90e5ea4147d3ada59dd
2011-07-25 13:32:48 -07:00
Mindy Pereira
ec44a47940 chips: the seperator methods are no longer needed.
Check this in after:
https://android-git.corp.google.com/g/#change,123745

Change-Id: I3228251debfd4a81cd2dc16f05636d64533f9c6d
2011-07-25 13:26:58 -07:00
Mindy Pereira
2fe624cf47 make shorter chips views for landscape where we are turning off extract mode.
per UX.
Also, uses the chips RecipientEditTextView style as a base
so that it automatically gets styling for no extract mode.
Change-Id: Icc60944880b1d104766faee18f05960dd5089394
2011-07-25 10:06:22 -07:00
The Android Automerger
210e9d36d1 merge in ics-release history after reset to master 2011-07-25 06:47:32 -07:00
Ben Komalo
df4dfa570a Settings/Setup style cleanup.
This is not an attempt to cleanup the code that much - minimal amount of
work was done to reduce the copy/pasting that is rampant in this part of
the codebase.

This basically just does visual fixes to:
- not make the buttons illegibly tiny
- not make the buttons overlap
- make the padding consistent on phones

Bug: 5039509
Bug: 5011325
Change-Id: Id31dee84a54a5dce9644b6f37fb41ac2c2ce89b9
2011-07-22 20:26:00 -07:00
Ben Komalo
30183e536e Merge "Always show from field in compose" 2011-07-22 16:10:24 -07:00
Ben Komalo
72a24f12a2 Misc settings UX fixes.
Bug: 5068602
Change-Id: I02acf3690e98ce747ddb4d3a745ac2fa59948c70
2011-07-22 16:04:10 -07:00
Ben Komalo
2903be7f3e Always show from field in compose
This info used to be shown in the top right of the status bar in GB but
that is no longer there. So before this change there was no way to tell
who you were sending as.

Bug: 5069124
Change-Id: I10d687a5fd221e65ecfc71b61cccf306492e27b8
2011-07-22 15:52:38 -07:00
Ben Komalo
b275e4c9d9 Prevent crash when composing a message on tablets.
We were hiding the cc/bcc menu option, but on tablets that is a visible
button on the UI and not in the menu. whoops.

Bug: 5067057
Change-Id: I10ecaf115b589b9200529f6ea7703428456b8f0f
2011-07-22 13:57:59 -07:00
The Android Automerger
16a96413b9 merge in ics-release history after reset to master 2011-07-22 13:52:44 -07:00
Ben Komalo
48a3a1c51c Ignore notifications for unloaded messages
Seems like POP envelopes could get into the database and tickle the
NotificationController even before we got the full subject/sender. Just
ignore those things until the basic info is loaded.

Bug: 5061271
Change-Id: Iadfbff8a1615d2644880f5cae3727768f4f9549a
2011-07-22 13:31:47 -07:00
Ben Komalo
ccb70fcad9 Merge "Fix notification issues." 2011-07-22 13:23:42 -07:00
Ben Komalo
23a4b15e08 Fix notification issues.
- use title as ticker text
- also properly play notification sounds on new messages. Before, if you
left a notification unread, and a new message comes in, no sound would
be played. Since fixing that, it introduces another issue where on
initial sync, tons of new messages come in (and the sync could take > 1
min). We throttle them with a 15 second interval. The notification is
always updated to reflect the most up to date information, but sounds
will never be played closer than 15 seconds together.

Bug: 5020191
Bug: 5067059
Change-Id: I5ca474fd3b210ee856035bd78bd72931da80fe40
2011-07-22 12:06:11 -07:00
Ben Komalo
a10d4a8e45 Prevent crash when composing a message on tablets.
We were hiding the cc/bcc menu option, but on tablets that is a visible
button on the UI and not in the menu. whoops.

Bug: 5067057
Change-Id: I10ecaf115b589b9200529f6ea7703428456b8f0f
2011-07-22 10:00:39 -07:00
Ben Komalo
6a902861e9 Merge "Don't touch the cursor in the background" 2011-07-21 20:45:52 -07:00
Ben Komalo
b30d635dd0 Merge "Guard against null items in NotificationController" 2011-07-21 20:35:00 -07:00
Jorge Lugo
a926c32aa2 Merge "Improved shortcut name" 2011-07-21 19:46:44 -07:00
Jorge Lugo
7496b5ba2b Merge "Display message when no quick respones available" 2011-07-21 19:44:31 -07:00
Ben Komalo
5fb6c5d4de Don't touch the cursor in the background
This prevents accessing a potentially closed cursor when doing batch
operations that will inevitable cause the the list to be reloaded (and
cursor to be invalidated) as the first of the messages are
touched

Bug: 5051730
Change-Id: I90328ee02eafe6ad238d8c57e88a3d96259f6547
2011-07-21 19:41:07 -07:00
Jorge Lugo
4ca1ca8622 Display message when no quick respones available
When editing quick responses, displays an appropriate
message letting users know that there are no quick responses.
Additionally, the MessageCompose activity will only show "insert quick
responses" when at least one exists.

Bug: 4948180
Change-Id: I1191bd54d6e64f990b6d6830f0837579d7a6918c
2011-07-21 19:06:17 -07:00
Jorge Lugo
79fab5ae62 Improved shortcut name
Shortcut name is now the name of folder when it's a non-inbox
folder; otherwise it's the account name. Previously was
always account name.

Bug: 4903490
Change-Id: I15b4024d28db6a48464e423db887bdca99132423
2011-07-21 18:39:10 -07:00