Commit Graph

13176 Commits

Author SHA1 Message Date
James Lemieux
f3704242ee am 32ce9913: am 2a709716: Merge "Marking conversations read/unread in the TL removes the snippet text" into ub-mail-master
* commit '32ce991317f6a071431c2f55fcf41f5aee9a2759':
  Marking conversations read/unread in the TL removes the snippet text
2014-07-24 23:32:45 +00:00
Tony Mantler
d94423f262 am cfba8f11: am 9ccae204: Merge "Make quick response UI in settings toggleable" into ub-mail-master
* commit 'cfba8f1159ced4ed79174e6423ff03f349cec8e9':
  Make quick response UI in settings toggleable
2014-07-24 23:32:44 +00:00
Tony Mantler
03f725405b am a38f2222: am 46c95eb6: Add new account intent is no longer forwarding
* commit 'a38f22224281ddeed6bcfe3ba8b263fb7d6961d7':
  Add new account intent is no longer forwarding
2014-07-24 23:32:43 +00:00
James Lemieux
32ce991317 am 2a709716: Merge "Marking conversations read/unread in the TL removes the snippet text" into ub-mail-master
* commit '2a70971689ec6e90878fbf39ee5a2f8242c681ef':
  Marking conversations read/unread in the TL removes the snippet text
2014-07-24 18:02:39 +00:00
Tony Mantler
cfba8f1159 am 9ccae204: Merge "Make quick response UI in settings toggleable" into ub-mail-master
* commit '9ccae204cfbb4271ff30d52ae232e6da6730ec2e':
  Make quick response UI in settings toggleable
2014-07-24 18:02:38 +00:00
Tony Mantler
a38f222242 am 46c95eb6: Add new account intent is no longer forwarding
* commit '46c95eb6c91eea4e2e5af42e10554b7c147399c5':
  Add new account intent is no longer forwarding
2014-07-24 18:02:37 +00:00
Baligh Uddin
203a8ce939 am b2e45297: (-s ours) am 32cdf44d: (-s ours) Import translations. DO NOT MERGE
* commit 'b2e452978f4af9a1616b6761c67c5d5553799635':
  Import translations. DO NOT MERGE
2014-07-20 19:41:09 +00:00
Baligh Uddin
b2e452978f am 32cdf44d: (-s ours) Import translations. DO NOT MERGE
* commit '32cdf44dc8ab593eb8c0f9a6df96acc21cdd3bd7':
  Import translations. DO NOT MERGE
2014-07-20 19:37:52 +00:00
Baligh Uddin
32cdf44dc8 Import translations. DO NOT MERGE
Change-Id: I58cb7cd983c8af7db4552f2c0a6b8e2643acbd60
Auto-generated-cl: translation import
2014-07-20 11:37:20 -07:00
Baligh Uddin
4069135ae1 am 91a2961d: am 3bc0e3e8: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '91a2961db25958d3b6c384bd1947efa2ff77dbf7':
  Remove deprecated locales - DO NOT MERGE
2014-07-20 18:08:26 +00:00
Baligh Uddin
585bf491c8 am 552c223f: (-s ours) am bddd285f: (-s ours) Import translations. DO NOT MERGE
* commit '552c223f76060828065c16727644d6ad07f282a0':
  Import translations. DO NOT MERGE
2014-07-20 18:06:20 +00:00
Tony Mantler
4d0b75adc5 am c1ecf693: am 93cf39b4: Add new account intent is no longer forwarding
* commit 'c1ecf693887890abbaa66d83655686b6e5bde17f':
  Add new account intent is no longer forwarding
2014-07-20 18:03:16 +00:00
Baligh Uddin
91a2961db2 am 3bc0e3e8: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '3bc0e3e802f37d03c7c3868690c5c1c7929d540d':
  Remove deprecated locales - DO NOT MERGE
2014-07-20 02:39:55 +00:00
Baligh Uddin
552c223f76 am bddd285f: (-s ours) Import translations. DO NOT MERGE
* commit 'bddd285f36e4eeaf5d91d450b05fe15f8439b77b':
  Import translations. DO NOT MERGE
2014-07-19 21:30:19 +00:00
Baligh Uddin
bddd285f36 Import translations. DO NOT MERGE
Change-Id: I497f38c763804b6aa353d084cd30f0d6382a1d17
Auto-generated-cl: translation import
2014-07-17 15:20:37 -07:00
Baligh Uddin
3bc0e3e802 Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev 2014-07-17 19:26:18 +00:00
Baligh Uddin
8dc49cfc08 Remove deprecated locales - DO NOT MERGE
Change-Id: I609fd54025b7e3962c4a430cbf41e1a03a8662ed
2014-07-19 13:05:22 -07:00
Tony Mantler
c1ecf69388 am 93cf39b4: Add new account intent is no longer forwarding
* commit '93cf39b462b043a1b8407876d19b2e7ceeef9e7f':
  Add new account intent is no longer forwarding
2014-07-17 18:03:57 +00:00
Tony Mantler
93cf39b462 Add new account intent is no longer forwarding
It now launches directly instead of bouncing through settings

b/16309940

Change-Id: I23ab9902f3b02e466626e08b842a5228193a7909
(cherry picked from commit 46c95eb6c9)
2014-07-17 16:35:04 +00:00
Baligh Uddin
d66a37c197 am 284b6bf9: am bf96e543: keep history after reset to ub-mail-master-release
* commit '284b6bf9d0410c11ca5b579ac330d2be3c8a4f5c':
2014-07-16 19:21:22 +00:00
The Android Automerger
df2c6d54b4 am 56391f63: am 5a9c5750: merge in ub-mail-master-release history after reset to 5c93d36616
* commit '56391f6375767470751e2cc73a106b4835b4eb80':
  Upgrade my logging from .e to .wtf
  Add logging to help track down a bug causing invalid credentials
  Increase touch target for adding authentication
  Fix a NPE trying to download an attachment
  Actually install the correct views when credentials fragment is in standalone mode
  Update Email major version number to 6.3 so that it matches EmailGoogle
  Update version
  Fix temporary setup flow on tablets
  Fix a crash bringing up settings
2014-07-16 19:21:21 +00:00
Jay Shrauner
a4b7a2cdfe am fc1eecd7: am 5c93d366: Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master
* commit 'fc1eecd7a8946c9ee078060e0c81b15f8a93c52f':
  Fix NPE in uiSaveDraftMessage
2014-07-16 19:21:21 +00:00
Martin Hibdon
78acb775f1 am 354a881f: am 1fa51773: Merge "Add copyright notice" into ub-mail-master
* commit '354a881f65e359041df3d8d9796bdfe8a02a1bd3':
  Add copyright notice
2014-07-16 19:21:20 +00:00
James Lemieux
98d25359fb am 68f02dec: am 0e7a8dbe: Merge "Replace all references to UnifiedEmail\'s com.android.oldbitmap with equivalent usage of framework\'s com.android.bitmap." into ub-mail-master
* commit '68f02dec16561ed8b97d71ceba4297aa9fd3fe0d':
  Replace all references to UnifiedEmail's com.android.oldbitmap with equivalent usage of framework's com.android.bitmap.
2014-07-16 19:21:19 +00:00
Tony Mantler
94b58a0318 am 237bdba9: am 8f5ca5a7: Rename AccountSettings to EmailPreferenceActivity
* commit '237bdba9c8dafd46a74e282a111675d5ed243102':
  Rename AccountSettings to EmailPreferenceActivity
2014-07-16 19:21:18 +00:00
Martin Hibdon
1198553768 am af0554fc: am bb391e80: Merge "Update IEmailService" into ub-mail-master
* commit 'af0554fcb94d4df263aa42afcd81e2ae028ebacc':
  Update IEmailService
2014-07-16 19:21:17 +00:00
Tony Mantler
e6b472a3a9 am 661fa10a: am 6cf6b5c2: Merge "Remove direct entry points to AccountSettings" into ub-mail-master
* commit '661fa10a960afbe6a25c8707869e57c9fe686b0e':
  Remove direct entry points to AccountSettings
2014-07-16 19:21:16 +00:00
James Lemieux
e8524f4277 am bc0cced0: am f79ed0f5: Merge "Remove attachment previews from Conversation List" into ub-mail-master
* commit 'bc0cced076a628aaae4f436837c5c97ece7b1acd':
  Remove attachment previews from Conversation List
2014-07-16 19:21:15 +00:00
Tony Mantler
db5487f4ae am 27759dc7: am 436a0bde: Merge "Add support for UPDATE_SETTINGS_URI" into ub-mail-master
* commit '27759dc7d865225b7b95f6ab479055dcbdefdc3f':
  Add support for UPDATE_SETTINGS_URI
2014-07-16 19:21:15 +00:00
Milos Stankovic
4c8b9ced68 am c3f7ecdc: am 4fb48202: Moving Previous, Next and Done strings to UnifiedEmail.
* commit 'c3f7ecdc995a957e9936f1f29ace5e85755e7db5':
  Moving Previous, Next and Done strings to UnifiedEmail.
2014-07-16 19:21:11 +00:00
Régis Décamps
40c2ff74db am 00ea75cd: am c3404cca: Better documentation for "Account display name".
* commit '00ea75cda10531b9f4a39f7f37e1a74eda855cfd':
  Better documentation for "Account display name".
2014-07-16 19:21:10 +00:00
Tony Mantler
202d37fa75 am 299aac4a: am f90dbc83: Strings aren\'t Integers
* commit '299aac4a241bd7cf77f061c1539d0644b2043869':
  Strings aren't Integers
2014-07-16 19:21:09 +00:00
Tony Mantler
4b110d6062 am f836f8d0: am 4fb5412e: Switch to material icons for Email
* commit 'f836f8d0b7dc10ae5a18dc6e19836932feb58658':
  Switch to material icons for Email
2014-07-16 19:21:08 +00:00
Tony Mantler
ad9bf31854 am 6b8902c0: am 6c15188a: Merge "Close body input streams" into ub-mail-master
* commit '6b8902c0784e07682d602b442f4abd4209828e4c':
  Close body input streams
2014-07-16 19:21:06 +00:00
Martin Hibdon
457b0941ef am 1595aa33: am 1d8fd9c0: Add communication class for HostAuth
* commit '1595aa33ead5edb055465b0acf8bb84aae1a8a26':
  Add communication class for HostAuth
2014-07-16 19:21:05 +00:00
Baligh Uddin
f4682d2ab5 am 2debaaa2: (-s ours) am c11f7b90: (-s ours) am f6425011: (-s ours) am 7611e3f7: (-s ours) Import translations. DO NOT MERGE
* commit '2debaaa2b915aedd7cb11904c8030f92f8c91ade':
  Import translations. DO NOT MERGE
2014-07-16 19:21:05 +00:00
Baligh Uddin
9f28d0072c am 555c3df8: (-s ours) am fb620b36: (-s ours) am 4f1a919b: (-s ours) Import translations. DO NOT MERGE
* commit '555c3df899347b94ce95065184aa41ae7d376f9f':
  Import translations. DO NOT MERGE
2014-07-16 19:21:04 +00:00
Baligh Uddin
a4b2a8a7c0 am 39aa9d02: (-s ours) am 0a74d7f0: (-s ours) am 6012ef62: (-s ours) Import translations. DO NOT MERGE
* commit '39aa9d02c94c9721b395e4b81ef2cd22be066523':
  Import translations. DO NOT MERGE
2014-07-16 19:21:03 +00:00
Baligh Uddin
1c4481b3dc am 620b6e3c: (-s ours) am acdf3d73: (-s ours) am f7e522a9: (-s ours) Import translations. DO NOT MERGE
* commit '620b6e3c6f8c9b5c5285b33c56dca38260e26988':
  Import translations. DO NOT MERGE
2014-07-16 19:21:02 +00:00
Baligh Uddin
85ad482418 am 3259e209: (-s ours) am 92a5b634: (-s ours) Import translations. DO NOT MERGE
* commit '3259e209ca56f58b05e2f610daff144a8d9cce9a':
  Import translations. DO NOT MERGE
2014-07-16 19:21:01 +00:00
Baligh Uddin
284b6bf9d0 am bf96e543: keep history after reset to ub-mail-master-release
* commit 'bf96e543517fa453d694d8fde7eed65d5b40c6da':
2014-07-16 19:18:02 +00:00
The Android Automerger
56391f6375 am 5a9c5750: merge in ub-mail-master-release history after reset to 5c93d36616
* commit '5a9c5750bc1221c01846470411abd56f58b39914':
  Upgrade my logging from .e to .wtf
  Add logging to help track down a bug causing invalid credentials
  Increase touch target for adding authentication
  Fix a NPE trying to download an attachment
  Actually install the correct views when credentials fragment is in standalone mode
  Update Email major version number to 6.3 so that it matches EmailGoogle
  Update version
  Fix temporary setup flow on tablets
  Fix a crash bringing up settings
2014-07-16 19:18:00 +00:00
Jay Shrauner
fc1eecd7a8 am 5c93d366: Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master
* commit '5c93d3661603843d6bc0b9084a2633c7e3d08ab9':
  Fix NPE in uiSaveDraftMessage
2014-07-16 19:18:00 +00:00
Martin Hibdon
354a881f65 am 1fa51773: Merge "Add copyright notice" into ub-mail-master
* commit '1fa51773bf50fc9a8cb3ee55eeab8e9aec7694b3':
  Add copyright notice
2014-07-16 19:17:59 +00:00
James Lemieux
68f02dec16 am 0e7a8dbe: Merge "Replace all references to UnifiedEmail\'s com.android.oldbitmap with equivalent usage of framework\'s com.android.bitmap." into ub-mail-master
* commit '0e7a8dbed85da44acf8c2646f59e328c03ae248f':
  Replace all references to UnifiedEmail's com.android.oldbitmap with equivalent usage of framework's com.android.bitmap.
2014-07-16 19:17:58 +00:00
Tony Mantler
237bdba9c8 am 8f5ca5a7: Rename AccountSettings to EmailPreferenceActivity
* commit '8f5ca5a790c4c05dd4ee6a8c769ff9817f40123b':
  Rename AccountSettings to EmailPreferenceActivity
2014-07-16 19:17:57 +00:00
Martin Hibdon
af0554fcb9 am bb391e80: Merge "Update IEmailService" into ub-mail-master
* commit 'bb391e8018a56f27bb2025accf5171491e4b2a14':
  Update IEmailService
2014-07-16 19:17:56 +00:00
Tony Mantler
661fa10a96 am 6cf6b5c2: Merge "Remove direct entry points to AccountSettings" into ub-mail-master
* commit '6cf6b5c2921e3dacf389d11f17971742d03e2ad3':
  Remove direct entry points to AccountSettings
2014-07-16 19:17:54 +00:00
James Lemieux
bc0cced076 am f79ed0f5: Merge "Remove attachment previews from Conversation List" into ub-mail-master
* commit 'f79ed0f54fb0cf8ec081d72ccaffdaf18fd7e0dd':
  Remove attachment previews from Conversation List
2014-07-16 19:17:54 +00:00
Tony Mantler
27759dc7d8 am 436a0bde: Merge "Add support for UPDATE_SETTINGS_URI" into ub-mail-master
* commit '436a0bdee550069322013b82c6dcb2edf11cca5f':
  Add support for UPDATE_SETTINGS_URI
2014-07-16 19:17:53 +00:00