The Android Automerger
59b231492b
merge in ub-mail-master-release history after reset to 7063124d1d
2014-07-30 10:40:20 -07:00
Geoff Mendal
7063124d1d
Import translations. DO NOT MERGE
...
Change-Id: I71c2cbaec779d2aa773ba61ece2a303de448e9f8
Auto-generated-cl: translation import
2014-07-30 09:09:33 -07:00
Tony Mantler
751a029c31
Convert server settings to dialog
...
b/8134410
Change-Id: I3c4c9a02a37571a9c7af10971840fbe39458244e
2014-07-29 15:12:04 -07:00
Tony Mantler
6e976f1d05
Update Email with Material icon
...
b/16632858
Change-Id: I611075c836fa8eeb24450aacfbef780af7bedcd2
2014-07-28 15:04:23 -07:00
Anthony Lee
ebe49cfeaf
b/16570506. Only enable alternate EAS authenticator when needed.
...
The old code was turning on both the EAS authenticator and the
alternate EAS authenticator (with the offending string). Now it
turns on the right one depending on the VendorPolicyLoader.
Change-Id: I69945e695f28fdb8bd33bf49ee253a354c05b30c
2014-07-28 14:37:02 -07:00
Martin Hibdon
aaa26e8c3f
Merge "Disable Eas Authenticator if Exchange is not installed" into ub-mail-master
2014-07-24 22:43:15 +00:00
Martin Hibdon
74dc106ae9
Disable Eas Authenticator if Exchange is not installed
...
b/16541219
Change-Id: Ibc2a9608278762e6af4f7c429b08ad38935bfcae
2014-07-24 15:46:15 -07:00
Martin Hibdon
29180e6b36
Merge "Update version" into ub-mail-master
2014-07-24 15:37:54 +00:00
Martin Hibdon
266a7572a9
Update version
...
Change-Id: Ie69a887b0b6cff95cb5f0400788e057e59b312c7
2014-07-24 15:31:39 -07:00
Anthony Lee
20110e6288
Factor out the guts of setupAccountManagerAccount()
...
The new function will be called by the old function but it also allows
me to use it from the Migration code.
Change-Id: If9b2ad82479d60c63e8924d42fb6ce18d7d9a2f8
2014-07-24 13:28:26 -07:00
Andrew Sapperstein
a0389a26b8
Remove unused string.
...
Change-Id: I62a1ab0db1e8dbc80b49cbd16b35f1f1f47b6a6d
2014-07-23 17:27:48 -07:00
The Android Automerger
57c0454d2f
merge in ub-mail-master-release history after reset to a64f39d5a2
2014-07-22 12:40:27 -07:00
Martin Hibdon
ae028b6c70
Add lower res versions of ic_setup_delete.png
...
b/16457587
Change-Id: I4bcb0c9498b680f117923802e68a0d6dc449a7e5
2014-07-21 13:39:25 -07:00
Tony Mantler
14a64cef86
IMAP mailboxes are case-sensitive
...
b/15694346
Change-Id: I4a59979f40d6118bb9c7e27069ea228ba783a4c3
2014-07-21 10:24:32 -07:00
Tony Mantler
cd118b3b61
Add support for launching setup flow via intent action
...
b/16371282
Change-Id: I9ee45d769a6f73fe1e44b7ca7607f8f0b54a703d
2014-07-18 15:35:35 -07:00
Baligh Uddin
a64f39d5a2
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-07-18 22:16:50 +00:00
Ray Chen
045aa05777
Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from
...
EmailProvider.
b/16400882
Change-Id: I2765fa6cea392e07b878fe063c7234582a485b1d
2014-07-22 11:31:37 +02:00
Baligh Uddin
28dacfbbf4
Import translations. DO NOT MERGE
...
Change-Id: I05c450ccc246284ebd339788a4856f9fa8b12511
Auto-generated-cl: translation import
2014-07-21 08:40:46 -07:00
Baligh Uddin
e678e39ece
Remove deprecated locales
...
Change-Id: I163e2b7fbe321fce2ee6b59c2370f109ffc05984
2014-07-17 15:43:12 -07:00
Paul Westbrook
0b060097ed
Merge "Use the prebuilt support library resources" into ub-mail-master
2014-07-16 01:00:53 +00:00
Paul Westbrook
f1212d4181
Use the prebuilt support library resources
...
Change-Id: I70853b5a73aa98e806adffdfceeb365f3949daa0
2014-07-16 11:46:01 +02:00
Ray Chen
7e75afadb1
com.android.mail.providers.Account contructors are no longer public
...
and clients need to use Account.builder().buildFrom(...) instead.
Change-Id: I7559540458ae549c399effc59392930ec914ffcc
2014-07-16 10:06:23 +02:00
Tony Mantler
845001d250
Merge "Add "Add Account" to prefs headers" into ub-mail-master
2014-07-15 16:04:58 +00:00
James Lemieux
2a70971689
Merge "Marking conversations read/unread in the TL removes the snippet text" into ub-mail-master
2014-07-15 16:06:25 +00:00
James Lemieux
b4a9c1e302
Marking conversations read/unread in the TL removes the snippet text
...
b/16322573
EmailConversationCursor was not populating the firstUnreadSnippet and
lastSnippet values in ConversationInfo. When they remain null and are
subsequently set as the snippet text, it effectively removes the snippet.
Change-Id: I1c17508bbc8857d00d8678dca4a7ad791dcae049
2014-07-15 12:39:21 -07:00
Tony Mantler
9ccae204cf
Merge "Make quick response UI in settings toggleable" into ub-mail-master
2014-07-15 16:04:58 +00:00
Tony Mantler
e9e2a21d87
Make quick response UI in settings toggleable
...
b/16302932
Change-Id: I24b289ffbecd4f127e6109b56c0af7f9c4b00879
2014-07-15 10:31:18 -07:00
Tony Mantler
46c95eb6c9
Add new account intent is no longer forwarding
...
It now launches directly instead of bouncing through settings
b/16309940
Change-Id: I23ab9902f3b02e466626e08b842a5228193a7909
2014-07-15 09:56:55 -07:00
The Android Automerger
5a9c5750bc
merge in ub-mail-master-release history after reset to 5c93d36616
2014-07-14 20:00:18 -07:00
Tony Mantler
1dcdc09e03
Add "Add Account" to prefs headers
...
Borrowed + icon from authentication widget
b/16298155
Change-Id: I36d0eb2c7b9e98442d72481254d9a4da2ae3c999
2014-07-14 14:33:32 -07:00
Martin Hibdon
1fa51773bf
Merge "Add copyright notice" into ub-mail-master
2014-07-14 18:38:08 +00:00
Martin Hibdon
30a5e1d461
Add copyright notice
...
Change-Id: I80e074196ca8cb6962d400a756c510c8e3105899
2014-07-14 12:10:20 -07:00
Tony Mantler
8f5ca5a790
Rename AccountSettings to EmailPreferenceActivity
...
Change-Id: I972cdae394081b5ec028c38b9274e64ef5822d4a
2014-07-14 11:44:52 -07:00
Jay Shrauner
5c93d36616
Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master
2014-07-14 18:38:02 +00:00
James Lemieux
0e7a8dbed8
Merge "Replace all references to UnifiedEmail's com.android.oldbitmap with equivalent usage of framework's com.android.bitmap." into ub-mail-master
2014-07-14 18:38:02 +00:00
Jay Shrauner
bcc204dd6f
Fix NPE in uiSaveDraftMessage
...
Verify that restoreMessageWithId returns a non-null result.
Bug:14655866
Change-Id: Ia48d5fd96a4314f4e10e9a8c3764ad52f2aa5eed
2014-07-14 10:51:00 -07:00
Martin Hibdon
bb391e8018
Merge "Update IEmailService" into ub-mail-master
2014-07-14 17:08:38 +00:00
Tony Mantler
6cf6b5c292
Merge "Remove direct entry points to AccountSettings" into ub-mail-master
2014-07-14 16:02:26 +00:00
Martin Hibdon
7afbeee47e
Update IEmailService
...
Add version support
Change deleteAccountPIMData to deleteExternalAccountPIMData.
Data kept inside the EmailProvider can be deleted from within
the Email app. Only external data (e.g. contacts and calendar)
need to be deleted by the service which has protocol specific
knowlege.
Change-Id: I875d3051d0cfdbaf52775ec20eb114a345894a93
2014-07-11 15:49:45 -07:00
Tony Mantler
8c03e2af9f
Remove direct entry points to AccountSettings
...
b/16240332
Change-Id: I9bc3f9a2e0b7faa4d8875a9ac7d6d585a65d9733
2014-07-11 21:34:55 +00:00
James Lemieux
89febdfc3b
Replace all references to UnifiedEmail's com.android.oldbitmap with
...
equivalent usage of framework's com.android.bitmap.
A small refactor of AccountAvatarDrawable.drawBitmap(...) is also included
which produces no functional change.
Change-Id: I223e71a31ada0d9ffb2e4f0458fa1703338ac622
2014-07-11 14:24:42 -07:00
James Lemieux
f79ed0f54f
Merge "Remove attachment previews from Conversation List" into ub-mail-master
2014-07-11 16:34:41 +00:00
Tony Mantler
436a0bdee5
Merge "Add support for UPDATE_SETTINGS_URI" into ub-mail-master
2014-07-11 16:34:41 +00:00
Tony Mantler
b7e0834121
Add support for UPDATE_SETTINGS_URI
...
b/16188467
Change-Id: I6a948292e4406e01d68ed5c961912c492367717d
2014-07-11 11:25:58 -07:00
Milos Stankovic
4fb4820223
Moving Previous, Next and Done strings to UnifiedEmail.
...
Other change: 500164
Change-Id: I2eb4fd00b62d18c523c3ec49eec6748eb602e7cd
2014-07-11 10:54:58 +00:00
James Lemieux
a546307c1d
Remove attachment previews from Conversation List
...
This includes:
- all references to the 3 attachment preview columns in the Gmail
conversation table (except for migration code in MailStoreInitializer)
- all layout and drawing code for attachment previews in conversation list
- all assets related to attachment previews
- all preference and analytics code that aided attachment previews
NOTE: This does not alter, in any way, the display of attachments in
conversation view.
Change-Id: Iccefd2fcf146ccdad927e7911900f370baaf8a1d
2014-07-10 16:56:11 -07:00
Régis Décamps
c3404cca71
Better documentation for "Account display name".
...
Give examples of what the display name is.
Change-Id: I2934dc9e8b95d0b32b9c1e9fab391d7ba9e997da
2014-07-10 19:54:02 +02:00
Tony Mantler
f90dbc83e2
Strings aren't Integers
...
b/16189015
Change-Id: Ife4383b5530956fcca7f7970691e9fdec32007ec
2014-07-09 16:02:01 -07:00
Tony Mantler
4fb5412e1b
Switch to material icons for Email
...
b/15966080
Change-Id: I5d6097e37cb47356fc70a38e1aa2ae0c41e9ae7a
2014-07-08 15:55:40 -07:00
The Android Automerger
9dbdeda3cf
merge in ub-mail-master-release history after reset to 1d8fd9c054
2014-07-07 20:00:16 -07:00