087ace34ea
am 03d80363: Merge "Update the font for account setup basics" into ub-mail-algol
...
* commit '03d80363fa397aa79f4b587e120e6072bd3e270f':
Update the font for account setup basics
2014-04-29 17:48:35 +00:00
03d80363fa
Merge "Update the font for account setup basics" into ub-mail-algol
2014-04-29 17:46:37 +00:00
c70c1b5267
Merge "Make sure that queries against the Body table have ID columns." into ub-mail-master
2014-04-29 16:49:05 +00:00
533093abd7
Make sure that queries against the Body table have ID columns.
...
Performed some cleanup and updated the source key projection
to include an ID to make sure that EmailMessageCursor works
properly.
Change-Id: I272fac474de876fdd2a08136e0ba97b3f5dc2c7e
2014-04-28 16:11:04 -07:00
d8ffbc2798
am f318cac8: Merge "Update version" into ub-mail-algol
...
* commit 'f318cac84f9e455e24d5c48dc4ad3ec5baa961e2':
Update version
2014-04-28 22:33:32 +00:00
f318cac84f
Merge "Update version" into ub-mail-algol
2014-04-28 22:31:13 +00:00
de437fcc32
Update version
...
Change-Id: I3683df2afb2d973a067668a2caf1d66e24813ba1
2014-04-28 15:20:24 -07:00
3264276e6c
Update the font for account setup basics
...
b/14386385
Change-Id: Ica54796333b48bb04822406a6e2a719570840949
2014-04-28 14:58:50 -07:00
07e5d791e8
Import translations. DO NOT MERGE
...
Change-Id: I4c7f2d5f6667d749260bcd5c17e6f8cbeb771c32
Auto-generated-cl: translation import
2014-04-28 13:32:00 -07:00
31f72d0343
Import translations. DO NOT MERGE
...
Change-Id: Ia8463964cff67d2bd1d1b39c2555c20ad06b3cdc
Auto-generated-cl: translation import
2014-04-28 13:30:43 -07:00
2ac92114ad
Merge "Fix cancel handling in account settings screens" into ub-mail-master
2014-04-25 00:41:28 +00:00
294593c5f5
Fix cancel handling in account settings screens
...
- Don't loop on the confirmation dialog
- Do a deep copy of the initial hostauth state
- Save the initial hostauth state on configuration changes
- Collect the user input before comparing the old state with the new
b/14285245
Change-Id: Ibc033fac525be2a4cb03c6a0d1e92254a2236b4c
2014-04-24 16:12:55 -07:00
d4088d1b8a
am 241eeec2: Remove save to drive from eml viewer. b/14277510
...
* commit '241eeec2b3f7f5a0159d1a313c31d6682c439511':
Remove save to drive from eml viewer. b/14277510
2014-04-24 21:53:40 +00:00
241eeec2b3
Remove save to drive from eml viewer. b/14277510
...
Change-Id: I918e66fb009976543bcb8a58b1b4597a5b268062
2014-04-24 10:39:58 -07:00
1ba8ba8033
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-04-24 14:42:44 +00:00
ff0f768fe9
am eecebc3f: Fix a a problem in some button padding
...
* commit 'eecebc3fe76bc7a32a22283a481f57b9cbd51c59':
Fix a a problem in some button padding
2014-04-24 01:06:32 +00:00
eecebc3fe7
Fix a a problem in some button padding
...
I was using "10sp" instead of "10dp", and it needs to be
20dp anyway.
Change-Id: I31b1f770571968547f02920be90b05e27dd5419b
2014-04-23 17:54:18 -07:00
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
4eda266dfd
Merge "Import translations. DO NOT MERGE" into ub-mail-algol
2014-04-23 23:14:58 +00:00
970ff11689
Import translations. DO NOT MERGE
...
Change-Id: I2e1aea8e6e9ae1ecee943ce1f0104d8f1260c52d
Auto-generated-cl: translation import
2014-04-23 15:30:45 -07:00
ab0a3e2440
Import translations. DO NOT MERGE
...
Change-Id: I0c41c8f62dcf28de327411ed622a7ddcb4e1ee95
Auto-generated-cl: translation import
2014-04-23 15:28:03 -07:00
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
bd7994295d
Merge "Update more padding and layouts" into ub-mail-algol
2014-04-23 22:24:17 +00:00
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
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
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
6e85bca660
Merge "Update strings in account_setup_options" into ub-mail-algol
2014-04-23 22:08:39 +00:00
b84087e641
Update font size for device Id
...
b/14255447
Change-Id: I4d994a934e1691c9bc8d2554df797fdba72d3767
2014-04-23 14:20:48 -07:00
10267247d2
Update strings in account_setup_options
...
Change-Id: I02f4eee523b921aff4b0d548a03186b6bdd8426e
2014-04-23 13:57:40 -07:00
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
18e65df13a
Fix some alignment issues on the certificate selector
...
b/14255447
Change-Id: Ic17b9ca2ff5c8196ddbed7e70d1eee0de941823f
2014-04-23 13:16:16 -07:00
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
e0364574dc
Merge "Update padding on some buttons, and adjust font size" into ub-mail-algol
2014-04-23 18:18:53 +00:00
6c7b413097
Update padding on some buttons, and adjust font size
...
b/14255447
Change-Id: I641820217df3fa3953a5c88e04870d9596224392
2014-04-23 11:17:49 -07:00
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
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
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
91eec1a519
Use the correct string for the password label
...
b/14257168
Change-Id: I08a73bbb91bd4f897617617b67cf51fe4f0c2b7f
2014-04-22 17:31:47 -07:00
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
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
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
bd51bc5c6a
am 0dae4d3f: Update a bunch of layouts
...
* commit '0dae4d3ffb65eb23d5a2ea19acd4603cfba914cd':
Update a bunch of layouts
2014-04-22 21:55:32 +00:00
2883e37f0a
Update labels to be upper case
...
b/14257168
Change-Id: I1de342636aafb3778fee470d98d821abc76cfb37
2014-04-22 14:54:33 -07:00
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
1355b30577
Merge "b/14075613. Treat empty strings the same as null strings." into ub-mail-master
2014-04-22 21:21:48 +00:00
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
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
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
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
bf63dbb3ac
am 93345dcd: Update version number
...
* commit '93345dcd83d6db7ec15b36fb0aa75031d5e326c7':
Update version number
2014-04-21 22:53:23 +00:00
Martin Hibdon