Commit Graph

9874 Commits

Author SHA1 Message Date
Martin Hibdon
b3d0bda59d am 91eec1a5: Use the correct string for the password label
* commit '91eec1a519562149fff96e37299f492d25a49551':
  Use the correct string for the password label
2014-04-23 00:51:50 +00:00
Martin Hibdon
91eec1a519 Use the correct string for the password label
b/14257168

Change-Id: I08a73bbb91bd4f897617617b67cf51fe4f0c2b7f
2014-04-22 17:31:47 -07:00
Martin Hibdon
6bc254d0ed am 8b063aa9: Fix a typo I introduced in a previous change
* commit '8b063aa9797dae585b98be97ad6f503404bc78f7':
  Fix a typo I introduced in a previous change
2014-04-23 00:24:33 +00:00
Martin Hibdon
8b063aa979 Fix a typo I introduced in a previous change
b/14257168
In this CL I changed the name of a string, but missed one
place where it was references.
https://googleplex-android-review.git.corp.google.com/#/c/453472/

Change-Id: I7d943a2209f2defb6f0eb846b6f361a08f40f756
2014-04-22 17:19:33 -07:00
Martin Hibdon
8e4d5b7e6d am 2883e37f: Update labels to be upper case
* commit '2883e37f0aa0ce6583772a26d02d4db4ae680b14':
  Update labels to be upper case
2014-04-22 22:01:42 +00:00
Martin Hibdon
bd51bc5c6a am 0dae4d3f: Update a bunch of layouts
* commit '0dae4d3ffb65eb23d5a2ea19acd4603cfba914cd':
  Update a bunch of layouts
2014-04-22 21:55:32 +00:00
Martin Hibdon
2883e37f0a Update labels to be upper case
b/14257168

Change-Id: I1de342636aafb3778fee470d98d821abc76cfb37
2014-04-22 14:54:33 -07:00
Martin Hibdon
0dae4d3ffb Update a bunch of layouts
b/14169396
Swap the positions of the headline text and email image
on account setup basics
b/14257403
Swap the positions of the password and "signed in with XXX"
button on the credentials fragment
b/14255447
Adjust padding to fix a number of alignment issues.

Change-Id: I011e259a86123cf205d86407def2ff774744e005
2014-04-22 14:46:32 -07:00
Anthony Lee
1355b30577 Merge "b/14075613. Treat empty strings the same as null strings." into ub-mail-master 2014-04-22 21:21:48 +00:00
Anthony Lee
dc6bb6aa41 b/14075613. Treat empty strings the same as null strings.
Found this issue when addressing the root problem for this bug and testing
with various mixes of text and html content in emails.

Change-Id: I875fd9fac85b07484c27db383e3ac4a3cb935ee6
2014-04-22 14:12:20 -07:00
James Lemieux
8cfbfb50bb Inline images are not displayed for IMAP and POP emails
b/11998344

This solution covers these use cases:

1) Inline images in the Email app.
2) Inline images in .eml attachments in the Email and Gmail apps.

The solution here was to override shouldInterceptRequest(...) in
the WebViewClients and resolve any cid urls that are encountered
within the email body.

EmailProvider and EmlAttachmentProvider both gained the ability to
query for an Attachment object using a message ID and cid (which
is stored in the database column: contentId).

With this new query in place, it was straightforward to fetch the
Attachment in the WebViewClient and then obtain an InputStream to
the file that backs the Attachment to return back to the WebView.

Change-Id: I865a74fc291915c0d66a7492763a5f5682365b92
2014-04-22 11:29:19 -07:00
Anthony Lee
7e4d99c6d4 Merge "Fixed the id vs messageKey confusion in the code based on caller. Also make sure that we split the code that reads the HTML vs text body into seperate try-catch blocks because they can fail seperately." into ub-mail-master 2014-04-22 17:15:19 +00:00
Anthony Lee
80b26f9f4c Fixed the id vs messageKey confusion in the code based on caller. Also
make sure that we split the code that reads the HTML vs text body into
seperate try-catch blocks because they can fail seperately.

Change-Id: I55bdac469840e8ff84f7c00ccb34d188da072a8e
2014-04-22 10:14:23 -07:00
Martin Hibdon
bf63dbb3ac am 93345dcd: Update version number
* commit '93345dcd83d6db7ec15b36fb0aa75031d5e326c7':
  Update version number
2014-04-21 22:53:23 +00:00
Martin Hibdon
93345dcd83 Update version number
Change-Id: I53de96340d7584009103b2870d04616a075fc889
2014-04-21 15:13:56 -07:00
Martin Hibdon
01e7c6829b am d623aee9: Merge "Make the manual button into a normal button" into ub-mail-algol
* commit 'd623aee90ea53cc0092396cb91dc2e0420dbc201':
  Make the manual button into a normal button
2014-04-21 20:00:26 +00:00
Martin Hibdon
1922ba4132 am 89a03e8e: Merge "Change the side background color" into ub-mail-algol
* commit '89a03e8e8327a93bb85d12e85973f7d3fd72c0d5':
  Change the side background color
2014-04-21 20:00:25 +00:00
Martin Hibdon
d623aee90e Merge "Make the manual button into a normal button" into ub-mail-algol 2014-04-21 19:59:12 +00:00
Martin Hibdon
89a03e8e83 Merge "Change the side background color" into ub-mail-algol 2014-04-21 19:59:10 +00:00
Martin Hibdon
590c14b585 Make the manual button into a normal button
b/14226801

Change-Id: I51aecf8761b7c689b0c9efd094592bfc24f372fc
2014-04-21 12:36:21 -07:00
Martin Hibdon
07296e9e60 Change the side background color
b/14170786

Change-Id: I99da56e9a5c2203b79b6c8be951f8859dbc866ef
2014-04-21 12:22:27 -07:00
Tony Mantler
8c91d2e34b am f501d41c: Merge "Add cross-fade to setup flow" into ub-mail-algol
* commit 'f501d41c7b652ec82f077ad90e11544dc02d0563':
  Add cross-fade to setup flow
2014-04-18 22:39:34 +00:00
Tony Mantler
f501d41c7b Merge "Add cross-fade to setup flow" into ub-mail-algol 2014-04-18 22:37:32 +00:00
Tony Mantler
b5fd6b8905 Add cross-fade to setup flow
b/14164262

Change-Id: I41fe0bf5661d9f7a2b5051604c0b6dbfc4506414
2014-04-18 14:54:55 -07:00
Tony Mantler
42a4dbbf93 Refactor addMailbox() a bit and clean up warnings
Change-Id: I8497f74ec61c380ae4e69487121c50933f568965
2014-04-18 14:28:28 -07:00
Tony Mantler
3c73a04bec Continue purging the unused reply parts
Change-Id: I47b5bbe50ba36e68ad7ba80647f401b992660ba1
2014-04-18 14:04:23 -07:00
Tony Mantler
f0db9ce9ab Clean up LegacyConversions
Change-Id: I9cb9bf8a08663004a497af9f52e3ab0647bd2168
2014-04-18 13:36:18 -07:00
Tony Mantler
a5ba759443 am b2fd4d25: Merge "Make AccountSettings implement callbacks for check settings dialog" into ub-mail-algol
* commit 'b2fd4d25767938bf693aba12f73f1dd0ee462427':
  Make AccountSettings implement callbacks for check settings dialog
2014-04-18 19:03:26 +00:00
Tony Mantler
abf887ff22 am 0d70ee2c: Merge "Fix layout of standalone credential activity" into ub-mail-algol
* commit '0d70ee2cb9bc4bc1c515e69b00825972b2ced9d3':
  Fix layout of standalone credential activity
2014-04-18 19:03:25 +00:00
Tony Mantler
b2fd4d2576 Merge "Make AccountSettings implement callbacks for check settings dialog" into ub-mail-algol 2014-04-18 18:21:21 +00:00
Tony Mantler
0d70ee2cb9 Merge "Fix layout of standalone credential activity" into ub-mail-algol 2014-04-18 18:17:53 +00:00
Tony Mantler
1c594b8050 Make AccountSettings implement callbacks for check settings dialog
b/14120112

Change-Id: I9834a772e90d2d13f16a84a70651286759bc9dbc
2014-04-18 11:16:57 -07:00
Tony Mantler
7b350f101c Fix layout of standalone credential activity
b/14144228

Change-Id: Ic75f2444b74e101d25afd312ba94f5df3e8204c3
2014-04-18 11:06:24 -07:00
Tony Mantler
502f6ad7ea Tidy up saveAttachmentBody
Change-Id: I1852ad7d94eec15feb661a87f81869a554d595af
2014-04-17 16:19:23 -07:00
Tony Mantler
fd69e5b036 Purge unused/obsolete body fields
Change-Id: Idafa09b58f5753e4cb3cad754c861cc8e3d80c34
2014-04-17 14:32:10 -07:00
Tony Mantler
0e26184ac7 am 6529f2c9: Add some null-checks
* commit '6529f2c99d24f0dd801ed142ce946b46c92d5e9f':
  Add some null-checks
2014-04-17 18:56:23 +00:00
Tony Mantler
6529f2c99d Add some null-checks
b/14117436
b/14120112

Change-Id: I0f56e036ec1a78887523d90ab4e6cda3a05accdf
2014-04-17 11:50:25 -07:00
Andrew Sapperstein
592a85d97d am 1bb18931: Send PLID with message instead of conversation.
* commit '1bb18931e29dfe55a9b3368bd2393ac57c5fdebb':
  Send PLID with message instead of conversation.
2014-04-17 17:20:04 +00:00
Tony Mantler
9caaebb142 Bypass the cursor completely when passing message within EmailContent contexts
We should investigate using PFDs when passing to the UI layer too, for consistency

Change-Id: I21ad1987926b93af20287ae8e49bfc7a4ad99570
2014-04-16 16:49:29 -07:00
Andrew Sapperstein
1bb18931e2 Send PLID with message instead of conversation.
Fixes b/13748439. Sending with conversation required
server-side changes and wasn't actually more memory efficient.
Arguably it would be less efficient.

Change-Id: I8e1be03e183c65e169da5152a4763d5f80460bb9
2014-04-16 11:48:59 -07:00
Tony Mantler
1b8cb007ba am cdfffcf4: Merge "Don\'t re-add fragment if it\'s already been added" into ub-mail-algol
* commit 'cdfffcf4609336445cbaade49581d07ad10e7bf1':
  Don't re-add fragment if it's already been added
2014-04-16 17:46:34 +00:00
Tony Mantler
cdfffcf460 Merge "Don't re-add fragment if it's already been added" into ub-mail-algol 2014-04-16 17:44:04 +00:00
Tony Mantler
4822b266ef Don't re-add fragment if it's already been added
b/14088388

Change-Id: Ie86220f2ab3bf6286ba206248b79291a51b04fad
2014-04-16 10:31:45 -07:00
Tony Mantler
131baa26a1 am 75d60f04: Merge "Null check mCheckFrequency before using" into ub-mail-algol
* commit '75d60f045b8344f7a894e895c1bd95957f5e24bf':
  Null check mCheckFrequency before using
2014-04-16 17:20:17 +00:00
Tony Mantler
75d60f045b Merge "Null check mCheckFrequency before using" into ub-mail-algol 2014-04-16 17:17:15 +00:00
Tony Mantler
8a12526a7f am 91ad2631: Be more blunt about saving the right fragment reference
* commit '91ad26315a8769f92af469b06e24033ffd9e6caf':
  Be more blunt about saving the right fragment reference
2014-04-16 17:17:03 +00:00
Tony Mantler
0151a6af62 Null check mCheckFrequency before using
b/14091609

Change-Id: I796774b7133ec68382d2580d0b1cde347aa143f8
2014-04-16 10:11:55 -07:00
Tony Mantler
91ad26315a Be more blunt about saving the right fragment reference
Apparently fragment IDs get recycled so storing the fragment reference
in a bundle can return the wrong fragment later, so that's great.

b/14094356

Change-Id: I7ce4ae46f51371b4179c7e85c343ab86162b5a95
2014-04-16 10:05:44 -07:00
Baligh Uddin
1ad024e722 am 03d600ca: (-s ours) Import translations. DO NOT MERGE
* commit '03d600caac8da57eaff578018f7d97554bc46b76':
  Import translations. DO NOT MERGE
2014-04-16 15:44:48 +00:00
Baligh Uddin
fcc325e01f Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-04-16 15:42:47 +00:00