Commit Graph

10043 Commits

Author SHA1 Message Date
Baligh Uddin
67889cd041 am 4eda266d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-algol
* commit '4eda266dfd2b2b3e6ff75db8009fc7e046d45292':
  Import translations. DO NOT MERGE
2014-04-23 23:18:21 +00:00
Baligh Uddin
4eda266dfd Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-04-23 23:14:58 +00:00
Baligh Uddin
970ff11689 Import translations. DO NOT MERGE
Change-Id: I2e1aea8e6e9ae1ecee943ce1f0104d8f1260c52d
Auto-generated-cl: translation import
2014-04-23 15:30:45 -07:00
Baligh Uddin
ab0a3e2440 Import translations. DO NOT MERGE
Change-Id: I0c41c8f62dcf28de327411ed622a7ddcb4e1ee95
Auto-generated-cl: translation import
2014-04-23 15:28:03 -07:00
Martin Hibdon
71fcfbc7f0 am bd799429: Merge "Update more padding and layouts" into ub-mail-algol
* commit 'bd7994295ddede1321b577ed5971174a50cfac3b':
  Update more padding and layouts
2014-04-23 22:27:53 +00:00
Martin Hibdon
bd7994295d Merge "Update more padding and layouts" into ub-mail-algol 2014-04-23 22:24:17 +00:00
Martin Hibdon
fefeddeaf0 Update more padding and layouts
b/14255447
The password label, edit text, and clear button were not
lining up correctly. Also, there needed to be more space
around the password edit text.

Change-Id: I71864733457b3b599160a6d9a44d48d2e23961ce
2014-04-23 15:17:09 -07:00
Martin Hibdon
2c2009eb46 am 6e85bca6: Merge "Update strings in account_setup_options" into ub-mail-algol
* commit '6e85bca6602d5551b79cc2350c0d354fcf3844a9':
  Update strings in account_setup_options
2014-04-23 22:12:33 +00:00
Martin Hibdon
fa50e32f87 am b84087e6: Update font size for device Id
* commit 'b84087e641fd5c061d2f1954b81d06953b35fe21':
  Update font size for device Id
2014-04-23 22:12:33 +00:00
Martin Hibdon
6e85bca660 Merge "Update strings in account_setup_options" into ub-mail-algol 2014-04-23 22:08:39 +00:00
Martin Hibdon
b84087e641 Update font size for device Id
b/14255447

Change-Id: I4d994a934e1691c9bc8d2554df797fdba72d3767
2014-04-23 14:20:48 -07:00
Martin Hibdon
10267247d2 Update strings in account_setup_options
Change-Id: I02f4eee523b921aff4b0d548a03186b6bdd8426e
2014-04-23 13:57:40 -07:00
Martin Hibdon
aab3e02df5 am 18e65df1: Fix some alignment issues on the certificate selector
* commit '18e65df13a18597863041452be4dc838572b1b66':
  Fix some alignment issues on the certificate selector
2014-04-23 20:30:45 +00:00
Martin Hibdon
18e65df13a Fix some alignment issues on the certificate selector
b/14255447

Change-Id: Ic17b9ca2ff5c8196ddbed7e70d1eee0de941823f
2014-04-23 13:16:16 -07:00
Martin Hibdon
5d288ac98a am e0364574: Merge "Update padding on some buttons, and adjust font size" into ub-mail-algol
* commit 'e0364574dc64321a6619145f8d933536bc3ac9be':
  Update padding on some buttons, and adjust font size
2014-04-23 18:21:48 +00:00
Martin Hibdon
e0364574dc Merge "Update padding on some buttons, and adjust font size" into ub-mail-algol 2014-04-23 18:18:53 +00:00
Martin Hibdon
6c7b413097 Update padding on some buttons, and adjust font size
b/14255447

Change-Id: I641820217df3fa3953a5c88e04870d9596224392
2014-04-23 11:17:49 -07:00
Martin Hibdon
70d7473fb9 am 92581f78: Move the setup nav buttons to the bottom on tablets
* commit '92581f78207a23b0777795f5d5ffcff683aa1e21':
  Move the setup nav buttons to the bottom on tablets
2014-04-23 17:38:10 +00:00
Martin Hibdon
92581f7820 Move the setup nav buttons to the bottom on tablets
b/14187851
Now the bars on the sides for tablet landscape setup are actually
in the activity, not the fragment. The setup fragment template
is identical between tablet and phone, with any differences between
them contained in different styles or dimensions.

Change-Id: Id7005f73aa29ed6010e629873155eb5fdc8e818f
2014-04-23 10:34:16 -07:00
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