Commit Graph

9565 Commits

Author SHA1 Message Date
Martin Hibdon
26913460f1 am 921c04d2: Add some logging
* commit '921c04d2ac5df091fb3c5cfa823e6dc2fc6cdf5a':
  Add some logging
2013-10-01 17:35:38 -07:00
Martin Hibdon
921c04d2ac Add some logging
Change-Id: Ib26ffad0bb6841361b8ee7be4ee2a6255d509ae2
2013-10-01 17:08:16 -07:00
Andrew Sapperstein
ec04b69ae1 am 0d233273: Merge "Update widget photo. Fixes b/10972758." into jb-ub-mail-ur10
* commit '0d233273de995138707ffd8b07d398ba96133397':
  Update widget photo. Fixes b/10972758.
2013-10-01 15:38:51 -07:00
Andrew Sapperstein
0d233273de Merge "Update widget photo. Fixes b/10972758." into jb-ub-mail-ur10 2013-10-01 22:33:46 +00:00
Andrew Sapperstein
cdb89d5de3 Update widget photo. Fixes b/10972758.
Change-Id: I71b30158a9f42da34d38ffb7ad144881646fb4ce
2013-10-01 15:23:44 -07:00
Tony Mantler
61e4a041f2 am 768c6b86: Don\'t show "No messages" when starting a search on Exchange
* commit '768c6b86db854569a687f68c9b8f232e9ebf1573':
  Don't show "No messages" when starting a search on Exchange
2013-10-01 12:16:48 -07:00
Tony Mantler
768c6b86db Don't show "No messages" when starting a search on Exchange
Also clean up some finals

b/11027351

Change-Id: Ib76cc90b04acb531d53b2d6bdc4e3b0ad911f72c
2013-10-01 12:02:47 -07:00
Baligh Uddin
ca32123996 am 1bccfccd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '1bccfccd9adfa4714e87831e5add9495c437a11e':
  Import translations. DO NOT MERGE
2013-09-30 21:44:23 -07:00
Baligh Uddin
ffffdfc87a Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-10-01 04:43:31 +00:00
Baligh Uddin
1bccfccd9a Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-10-01 04:41:39 +00:00
Yu Ping Hu
5817e80821 am 2add3d3c: Increment Email version.
* commit '2add3d3c904f4642b56336b44b1d5238d1ecd27d':
  Increment Email version.
2013-09-30 18:23:37 -07:00
Yu Ping Hu
2add3d3c90 Increment Email version.
Change-Id: I8397ae0ef23a44f1303d22290b7e3a4acbdf5989
2013-09-30 18:01:32 -07:00
Tony Mantler
3ad8fad1a9 am 53ecec0a: Merge "Only return messages that are unread and unseen for an unseen query" into jb-ub-mail-ur10
* commit '53ecec0ad43866b00d28908ba19e67561674591c':
  Only return messages that are unread and unseen for an unseen query
2013-09-30 17:20:20 -07:00
Martin Hibdon
fbb7169011 am 2cf965b8: Merge "Make draft attachments work correctly" into jb-ub-mail-ur10
* commit '2cf965b85fe4daa1046d7d04137c3b24d1e2800b':
  Make draft attachments work correctly
2013-09-30 16:42:03 -07:00
Tony Mantler
7b1a11bb5c am b38c7d1c: Avoid ANR due to looking up account info on the main thread
* commit 'b38c7d1c37bba593b7aaba44a9ffccc8cf3a4108':
  Avoid ANR due to looking up account info on the main thread
2013-09-30 16:42:03 -07:00
Tony Mantler
53ecec0ad4 Merge "Only return messages that are unread and unseen for an unseen query" into jb-ub-mail-ur10 2013-09-30 23:34:19 +00:00
Baligh Uddin
2852d97c93 Import translations. DO NOT MERGE
Change-Id: I7fd5f542f15b6498a90691a20478eecef7600069
Auto-generated-cl: translation import
2013-09-30 15:40:58 -07:00
Baligh Uddin
b4a8872e5b Import translations. DO NOT MERGE
Change-Id: I22cd41a256167e2b378351d4dc37737a40d92b1a
Auto-generated-cl: translation import
2013-09-30 15:40:25 -07:00
Tony Mantler
d4a06f409d Only return messages that are unread and unseen for an unseen query
b/10970849

Change-Id: I23d40fc39987fab35521f1dd75f4631f1fae16d5
2013-09-30 15:32:42 -07:00
Martin Hibdon
2cf965b85f Merge "Make draft attachments work correctly" into jb-ub-mail-ur10 2013-09-30 22:23:42 +00:00
Martin Hibdon
f484751e06 Make draft attachments work correctly
b/10968838
The main problem here is that Ui Attachment was always using
a content Uri that was generated using the attachment's account
Id and rowId. This works correctly for attachments in messages
we have received, but it does not work for drafts: Draft attachments
are not stored in the normal place, rather, they are stored in
the cache directory. There is an additional column in the
Attachment table, called cachedFile, which is not replicated in the
Ui attachment. That's okay though, if we have a cachedFile, then
when we are populating a Ui Attachment, we should just use that
for content Uri.
Also, I discoverd that for draft attachments, we were not correctly
setting the account key. That didn't turn out to be the problem,
but I'm fixing it anyway because it will cause problems later on.

Change-Id: I0143ba824f3a5bfcd77f32828931b94d6977626f
2013-09-30 15:08:45 -07:00
Tony Mantler
b38c7d1c37 Avoid ANR due to looking up account info on the main thread
b/10987175

Change-Id: I7344e2717ab1b9557385eb6eb9e7962461b10c9d
2013-09-30 12:31:52 -07:00
Yu Ping Hu
3e18254326 am 125cbdf9: Make certain we don\'t use a null account.
* commit '125cbdf9d4dbc30127d99b56c9c025fab70aa358':
  Make certain we don't use a null account.
2013-09-29 21:16:21 -07:00
Yu Ping Hu
125cbdf9d4 Make certain we don't use a null account.
Bug: 10965484
Change-Id: I525d32fcbde0fbbe0bec467814cf4f09a3de38fe
2013-09-29 18:09:17 -07:00
Yu Ping Hu
d5706a4872 am 85ad73ae: Pass the correct id to getAccountManagerAccount.
* commit '85ad73aecdec51dcf19ed22ac13af88b8f87f0cf':
  Pass the correct id to getAccountManagerAccount.
2013-09-29 16:25:20 -07:00
Yu Ping Hu
85ad73aecd Pass the correct id to getAccountManagerAccount.
Bug: 10965484
Change-Id: I8e1aab4810da4673313b10231592283736a92ef9
2013-09-29 16:12:52 -07:00
Alon Albert
28dfd2d896 am c4d139c4: Auth Notification
* commit 'c4d139c4f4d924eae0307e8349ae977441dabbed':
  Auth Notification
2013-09-27 20:08:57 -07:00
Alon Albert
c4d139c4f4 Auth Notification
Some changes that allow a notification to open Account Settings for a specific
account

Bug: 10930585
Change-Id: Ib329e339b405ccbc0631d5ce6a23bf8fa6d62b83
2013-09-27 17:52:48 -07:00
Yu Ping Hu
184a1c7c52 am 386c8ccb: Merge "Kick the push once an hour, in case it fails." into jb-ub-mail-ur10
* commit '386c8ccbf9e44a327ce0a58afe08859809fa0d30':
  Kick the push once an hour, in case it fails.
2013-09-27 14:20:10 -07:00
Yu Ping Hu
386c8ccbf9 Merge "Kick the push once an hour, in case it fails." into jb-ub-mail-ur10 2013-09-27 21:18:10 +00:00
Martin Hibdon
dcb0c98640 am 9d3e01c5: Set the client cert from AccountSetup
* commit '9d3e01c589e1f281941cff9abc59aba0b0f33e78':
  Set the client cert from AccountSetup
2013-09-27 14:06:35 -07:00
Martin Hibdon
9d3e01c589 Set the client cert from AccountSetup
b/9661767

Change-Id: I292ff5e190ed56077a04e37869e18a46f5473985
2013-09-27 13:47:16 -07:00
Yu Ping Hu
69418d0460 Kick the push once an hour, in case it fails.
Bug: 10954795
Change-Id: If6325c04b2011fb476f20f1419afaee13a786d3c
2013-09-26 22:20:20 -07:00
Yu Ping Hu
fa98250e38 am b21f6780: Merge "Modify ping on settings changes." into jb-ub-mail-ur10
* commit 'b21f67806103687dcd7f424bbfe0636e84363389':
  Modify ping on settings changes.
2013-09-26 21:43:40 -07:00
Yu Ping Hu
b21f678061 Merge "Modify ping on settings changes." into jb-ub-mail-ur10 2013-09-27 04:41:42 +00:00
Yu Ping Hu
3707223a70 am 5625136f: Increment Email version.
* commit '5625136f752251e3420db0c2423aef797c393eb5':
  Increment Email version.
2013-09-26 21:11:25 -07:00
Yu Ping Hu
5e8d8c1f80 Modify ping on settings changes.
Bug: 9020744
Change-Id: I0dfa2b8e9d999072b8201da61916372ca1a5b08b
2013-09-26 18:33:13 -07:00
Yu Ping Hu
5625136f75 Increment Email version.
Change-Id: Ide1e5f8dceb02f949d5c7c2109b0b16450b9d85a
2013-09-26 18:29:54 -07:00
Yu Ping Hu
5fbcd8bf04 am 6580e500: Fix a bad log message.
* commit '6580e500318a3ee421516364b4a9314403174734':
  Fix a bad log message.
2013-09-26 14:25:47 -07:00
Yu Ping Hu
6580e50031 Fix a bad log message.
Bug: 10950496
Change-Id: I06c5e20eea9090bbfc6d0c12d8ce8e31d47f52a2
2013-09-26 14:15:50 -07:00
Yu Ping Hu
35be08ba86 am 9352f3c5: Merge "Move xxhdpi icons to Email directory." into jb-ub-mail-ur10
* commit '9352f3c52e53ebed0e2a6ec56d79e9f971d06613':
  Move xxhdpi icons to Email directory.
2013-09-26 14:05:27 -07:00
Yu Ping Hu
9352f3c52e Merge "Move xxhdpi icons to Email directory." into jb-ub-mail-ur10 2013-09-26 21:04:08 +00:00
Yu Ping Hu
9c3c7387f0 Move xxhdpi icons to Email directory.
Bug: 10948032
Change-Id: I8594139a110ec7f43c7358134fc1f71bbd2d0a6b
2013-09-26 13:53:13 -07:00
Tony Mantler
78d956a765 am e43fbd05: Merge "Fix account matching at initial screen to match against email address" into jb-ub-mail-ur10
* commit 'e43fbd05de3a7efd43cce2d624d0260ddb2acbaf':
  Fix account matching at initial screen to match against email address
2013-09-26 13:48:16 -07:00
Tony Mantler
e43fbd05de Merge "Fix account matching at initial screen to match against email address" into jb-ub-mail-ur10 2013-09-26 20:45:55 +00:00
Tony Mantler
463584d23f Fix account matching at initial screen to match against email address
b/10210901

Change-Id: I64d60ca33a42a19e085dd98a7a61d68ac30027f9
2013-09-26 13:41:09 -07:00
Martin Hibdon
681f014c93 am 71400959: Merge "reduce the length of a log tag to a legal amount" into jb-ub-mail-ur10
* commit '7140095932297bb404e32648278396a0a8c39ef5':
  reduce the length of a log tag to a legal amount
2013-09-26 13:37:05 -07:00
Martin Hibdon
7140095932 Merge "reduce the length of a log tag to a legal amount" into jb-ub-mail-ur10 2013-09-26 20:35:03 +00:00
Martin Hibdon
67b1be9f20 am 780e92ae: Merge "Handle it if an fetchPart has no content-encoding" into jb-ub-mail-ur10
* commit '780e92aea390873eb11b7a40a9b948dd38a40cfb':
  Handle it if an fetchPart has no content-encoding
2013-09-26 13:29:56 -07:00
Martin Hibdon
fead9986c1 reduce the length of a log tag to a legal amount
Change-Id: I6f18b9aa893cdccfebf24885b4668a50472af802
2013-09-26 13:29:24 -07:00