Commit Graph

8640 Commits

Author SHA1 Message Date
Baligh Uddin
596f4d43c0 Import translations. DO NOT MERGE
Change-Id: Iaeb2f5446c872b9d72af83886af5ebb3d4648400
Auto-generated-cl: translation import
2013-06-14 22:36:50 -07:00
Yu Ping Hu
21b2522d7f Remove auto sync windows.
Also includes other DB upgrade code.

Bug: 8668336
Bug: 9226612

Change-Id: Id9664fd8cda466ec34862a793e41cbcce78efb4c
2013-06-14 18:26:42 -07:00
Paul Westbrook
a06e4c8c08 am e16ad492: Merge "Move support for settings menu to UnifiedEmail" into jb-ub-mail-ur10
* commit 'e16ad492a650d9c0485a0b7fa85ec8a957717524':
  Move support for settings menu to UnifiedEmail
2013-06-13 23:36:42 -07:00
Paul Westbrook
e16ad492a6 Merge "Move support for settings menu to UnifiedEmail" into jb-ub-mail-ur10 2013-06-14 06:32:53 +00:00
Baligh Uddin
d40db275a9 am 6e7b1a1d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '6e7b1a1df8d126170e87bec08300cdbe6062a604':
  Import translations. DO NOT MERGE
2013-06-13 09:18:35 -07:00
Baligh Uddin
8603c21043 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-06-13 16:16:46 +00:00
Baligh Uddin
6e7b1a1df8 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-06-13 16:16:31 +00:00
Paul Westbrook
525e8ad321 Move support for settings menu to UnifiedEmail
Move the base settings menu to UnifiedEmail

Bug: 9393150
Change-Id: Ifa69125d84802a0d7dd2275e4704ec7a4d1fb2f1
2013-06-12 23:52:43 -07:00
Baligh Uddin
8a3c28f6b5 Import translations. DO NOT MERGE
Change-Id: If8df314150da80dbb67e20c3951e4a143ac36081
Auto-generated-cl: translation import
2013-06-12 13:58:07 -07:00
Baligh Uddin
29c0418674 Import translations. DO NOT MERGE
Change-Id: I2cdf5897618f805dc6411b92ccc5940c753ef27f
Auto-generated-cl: translation import
2013-06-12 13:57:29 -07:00
Scott Kennedy
79ac12685f am 380985ad: Merge "Move to Inbox" into jb-ub-mail-ur10
* commit '380985add95d003cda6c6d6804292b8a3b4f99e8':
  Move to Inbox
2013-06-12 13:03:26 -07:00
Scott Kennedy
380985add9 Merge "Move to Inbox" into jb-ub-mail-ur10 2013-06-12 20:02:12 +00:00
Yu Ping Hu
64b9335421 am 6d1cfd26: Merge "Add some null checks." into jb-ub-mail-ur10
* commit '6d1cfd2630c48c541950ff8625ea751dbf4dc011':
  Add some null checks.
2013-06-12 11:35:41 -07:00
Yu Ping Hu
6d1cfd2630 Merge "Add some null checks." into jb-ub-mail-ur10 2013-06-12 18:34:20 +00:00
Scott Kennedy
1079b6e962 Move to Inbox
Add a new Account setting field: Uri moveToInbox
This contains the Uri to use for the "move to inbox" action, which
may differ from defaultInbox.

There is no Move to Inbox in Email right now.

Bug: 9256654
Change-Id: I7c81c8115eda83123a09a9b7da7adf97a3c79964
2013-06-11 19:56:44 -07:00
Yu Ping Hu
6fadd5a0bd Add some null checks.
Bug: 9393662
Change-Id: I8c47b701062fb91e0e622644a26b470e78f62014
2013-06-11 16:56:06 -07:00
Andrew Sapperstein
42799f5694 am ae8e0b7a: Export Eml viewer.
* commit 'ae8e0b7ac37a115240ab912796805d69766e11f9':
  Export Eml viewer.
2013-06-11 16:13:27 -07:00
Andrew Sapperstein
ae8e0b7ac3 Export Eml viewer.
There's really no reason why it shouldn't be
and having it exported prevents b/9334785 from occurring.

Change-Id: Icaf9e90bc1f2e7bb35dba27ccb380ffa9ae7acbb
2013-06-11 15:01:05 -07:00
Baligh Uddin
9a6f0902a2 am 6853ff91: (-s ours) Import translations. DO NOT MERGE
* commit '6853ff91c8b4303063022e3129ddaa1db563cc4a':
  Import translations. DO NOT MERGE
2013-06-11 09:43:19 -07:00
Baligh Uddin
f471973482 Import translations. DO NOT MERGE
Change-Id: I7442ad4268ff6f4ab11f6f7fea33ef435415fa90
Auto-generated-cl: translation import
2013-06-10 11:05:18 -07:00
Baligh Uddin
6853ff91c8 Import translations. DO NOT MERGE
Change-Id: Iaa121b50d24ad5ea97e0b95925699eb75da42d36
Auto-generated-cl: translation import
2013-06-10 11:04:38 -07:00
Paul Westbrook
4c9b0a2519 am 38f22dbf: Use "show pictures" code from UnifiedEmail
* commit '38f22dbf08664b885b4cf063ea665c02edfb1c32':
  Use "show pictures" code from UnifiedEmail
2013-06-07 19:34:04 -07:00
Paul Westbrook
38f22dbf08 Use "show pictures" code from UnifiedEmail
Bug: 9320770
Change-Id: I701a93e2f09b8405a2c4bc56f7793f5abadbcd1e
2013-06-07 18:09:57 -07:00
Paul Westbrook
2abfbbaea8 am 0ec8c365: Merge "Fix logging crash" into jb-ub-mail-ur10
* commit '0ec8c365e795d9a73ecae0ba00fa0535e57e528e':
  Fix logging crash
2013-06-06 17:25:42 -07:00
Paul Westbrook
0ec8c365e7 Merge "Fix logging crash" into jb-ub-mail-ur10 2013-06-07 00:24:14 +00:00
Paul Westbrook
5a3fe57f4e Fix logging crash
If the string contains a character that is intrepreted by the
string formatter, this would throw an exception

Change-Id: I60cccb539bf197fa555d8d1f0fa1bdca3e07114e
2013-06-06 17:20:52 -07:00
Andrew Sapperstein
d2d2c1ace6 am 3df361a5: Merge "Add additional eml mime type." into jb-ub-mail-ur10
* commit '3df361a577e2420a1ab8301bdbf5f413dcd6bf97':
  Add additional eml mime type.
2013-06-06 16:08:17 -07:00
Andrew Sapperstein
3df361a577 Merge "Add additional eml mime type." into jb-ub-mail-ur10 2013-06-06 23:07:02 +00:00
Andrew Sapperstein
c035a693e7 Add additional eml mime type.
Still wanna support application/eml even though
I doubt we'll ever see it.

Change-Id: I5dd74e5882b40d136f3849bb2500de0e5cbba24c
2013-06-06 15:51:50 -07:00
Paul Westbrook
6ab29bfed1 am 555bd3c0: Don\'t show search folder
* commit '555bd3c0b7132509421ae181fbdb35995819787c':
  Don't show search folder
2013-06-06 13:03:18 -07:00
Scott Kennedy
9a054c20da am 4c47dadf: Merge "Unify LogTag" into jb-ub-mail-ur10
* commit '4c47dadf1848f34ee3a67caf6faacdb906685645':
  Unify LogTag
2013-06-06 11:08:01 -07:00
Paul Westbrook
555bd3c0b7 Don't show search folder
In folder lists, don't show the search folder

Bug: 9227357
Change-Id: Ic0b8a39929f6d2528f445d3746c4eb1915275593
2013-06-06 11:06:38 -07:00
Scott Kennedy
4c47dadf18 Merge "Unify LogTag" into jb-ub-mail-ur10 2013-06-06 18:03:53 +00:00
Paul Westbrook
569038380d am c1d56928: Add a limit to the Conversation query
* commit 'c1d56928b2185e6a2643eea271a1fbd50e425ca2':
  Add a limit to the Conversation query
2013-06-06 10:30:18 -07:00
Paul Westbrook
c1d56928b2 Add a limit to the Conversation query
Bug: 9294348
Change-Id: Ifedfe657f205adb1c8a12382b908f4b3b4346500
2013-06-06 10:08:22 -07:00
Scott Kennedy
560bfadc31 Unify LogTag
There is now only one LogTag class. The static initializer of
GmailApplication (existing) and EmailApplication (new) will now set
the log tag to "Gmail" and "Email", respectively. Up until that code
is run, it will be "UnifiedEmail".

"setprop log.tag.Gmail VERBOSE" (or .Email) will trigger all logs to
be printed as long as they go through LogUtils, regardless of what tag
is used by that individual log. This lets us still turn on logging
everywhere in one command, but also lets us use more descriptive tags
(like the class name).

And since we no longer have three com.android.mail.utils.LogTag
classes, builds will be much easier.

Also, we now use LogUtils everywhere.

Change-Id: I55f1c7a66ce50ead54877a13e40256422a56dc39
2013-06-05 20:06:15 -07:00
Andrew Sapperstein
8de4595796 am f20ed137: Merge "Refactoring to support eml viewer in UnifiedEmail." into jb-ub-mail-ur10
* commit 'f20ed137654153ad0c6f9c8b3173a008b7fe0f1b':
  Refactoring to support eml viewer in UnifiedEmail.
2013-06-04 15:40:29 -07:00
Andrew Sapperstein
f20ed13765 Merge "Refactoring to support eml viewer in UnifiedEmail." into jb-ub-mail-ur10 2013-06-04 22:38:59 +00:00
Andrew Sapperstein
6be411edd0 Refactoring to support eml viewer in UnifiedEmail.
Moved two files out of Email into UnifiedEmail and
removed their dependencies on EmailContent. As a result,
those classes now return the data directly via a data only
class.

Change-Id: Iaf0618dd6879c9dc2a41943d3d15428904b65768
2013-06-04 15:37:40 -07:00
Yu Ping Hu
0cd57394ab am f849c1c5: Increment Email version.
* commit 'f849c1c50dd262b4b0e4b67dd57040e8da2a688a':
  Increment Email version.
2013-06-04 12:55:38 -07:00
Yu Ping Hu
f849c1c50d Increment Email version.
Change-Id: Id0f4ce9b987f188bcb7a3604efe6df9162a2e4e5
2013-06-04 12:50:35 -07:00
Baligh Uddin
84e96d8f2e am bc15735e: (-s ours) Import translations. DO NOT MERGE
* commit 'bc15735eb8c894a1ff4e35efc026d6ffb9225f9b':
  Import translations. DO NOT MERGE
2013-06-03 14:48:44 -07:00
Baligh Uddin
32fecdbbe8 Import translations. DO NOT MERGE
Change-Id: I8af83bad15c4a530fc8762e18e4f4b7cd2f557dd
Auto-generated-cl: translation import
2013-06-03 12:41:48 -07:00
Baligh Uddin
bc15735eb8 Import translations. DO NOT MERGE
Change-Id: I3b1c94dd1e18f19a2de941018d92b96e8403d7c7
Auto-generated-cl: translation import
2013-06-03 12:41:12 -07:00
Andrew Sapperstein
d52824f8d6 am 91973256: Moved code out of emailcommon to UnifedEmail.
* commit '91973256c283ebc409398bf2cfd747b978bb7b03':
  Moved code out of emailcommon to UnifedEmail.
2013-06-01 08:22:51 -07:00
Andrew Sapperstein
91973256c2 Moved code out of emailcommon to UnifedEmail.
This CL is mostly just deletion since the new code
is in a new project.

Change-Id: I4aee519187a6ed7514c97d2a7a85ed29ea29d25f
2013-05-31 16:28:51 -07:00
Andrew Sapperstein
436f8c1d77 am f5ed3d2c: Merge "Add EmlViewerActivity to AndroidManifest.xml." into jb-ub-mail-ur10
* commit 'f5ed3d2c9d768b053cf218f3ebb70bf239974f0a':
  Add EmlViewerActivity to AndroidManifest.xml.
2013-05-31 11:16:21 -07:00
Andrew Sapperstein
f5ed3d2c9d Merge "Add EmlViewerActivity to AndroidManifest.xml." into jb-ub-mail-ur10 2013-05-31 18:14:18 +00:00
Andrew Sapperstein
7500c15652 Add EmlViewerActivity to AndroidManifest.xml.
Change-Id: I6728999bf3f27b4c0b9c0664775a7b87c97690c1
2013-05-31 10:38:53 -07:00
Paul Westbrook
c6ec8b6f0e am 9d5ed9e7: Added logging, and switch to AsyncTask
* commit '9d5ed9e7a8d87408eb08f3124834e69ae3d9448c':
  Added logging, and switch to AsyncTask
2013-05-29 22:17:24 -07:00