Commit Graph

7959 Commits

Author SHA1 Message Date
Yu Ping Hu
7aa8da86e4 am fed62611: am c534638b: Disable notification prefs until folder prefs are loaded.
* commit 'fed62611c144a32a0a59e752757ac9597e4b3228':
  Disable notification prefs until folder prefs are loaded.
2013-03-27 17:48:25 -07:00
Yu Ping Hu
fed62611c1 am c534638b: Disable notification prefs until folder prefs are loaded.
* commit 'c534638b7aeb1f4bd65852bbcff6b2c78f21d566':
  Disable notification prefs until folder prefs are loaded.
2013-03-27 17:46:44 -07:00
Yu Ping Hu
c534638b7a Disable notification prefs until folder prefs are loaded.
Bug: 8485354
Change-Id: Id56c2634a16274e9340ad6ecb96661ee8a489d49
2013-03-27 17:40:38 -07:00
Yu Ping Hu
640d144a5c am 36ce0bbd: am b1792d72: Increment version number.
* commit '36ce0bbd5aa9dae0585049fff2d434014d982632':
  Increment version number.
2013-03-26 18:53:37 -07:00
Yu Ping Hu
36ce0bbd5a am b1792d72: Increment version number.
* commit 'b1792d725ae9e5b8158f423ac0a2f5f8082d9b00':
  Increment version number.
2013-03-26 18:52:01 -07:00
Yu Ping Hu
b1792d725a Increment version number.
Change-Id: I6a27aa4ee4de9d83e60fb226fcf838b127522f36
2013-03-26 18:46:54 -07:00
Yu Ping Hu
e48a0545ca am 1b9f89a5: am e46d4457: Change the notification action strings.
* commit '1b9f89a5800f558e695c2eb14c62597ce8f2dd5d':
  Change the notification action strings.
2013-03-26 18:35:05 -07:00
Yu Ping Hu
1b9f89a580 am e46d4457: Change the notification action strings.
* commit 'e46d4457a06f200f2328d5dc343f07f049f332dc':
  Change the notification action strings.
2013-03-26 18:33:32 -07:00
Yu Ping Hu
e46d4457a0 Change the notification action strings.
Multi-project change with:

I86b368de45533faa3f639f631d56e16f5cbca36e (UnifiedEmail)
I407b8900220e7dbdda81d6572f0ee374ae3d3833 (UnifiedGmail)

Bug: 8483722

Change-Id: If514cfed9538f0c2433a9427f15608ba5878ee05
2013-03-26 17:37:46 -07:00
Yu Ping Hu
7aaef75130 am 1cd4294a: am 1dd937bf: Prevent NPE when getting a bad mailbox id.
* commit '1cd4294a97ca6d195a26a21d003cf2d791ebbcd0':
  Prevent NPE when getting a bad mailbox id.
2013-03-26 17:35:37 -07:00
Yu Ping Hu
1cd4294a97 am 1dd937bf: Prevent NPE when getting a bad mailbox id.
* commit '1dd937bf18fbd9c4967fbfdb5179508dd0a823fd':
  Prevent NPE when getting a bad mailbox id.
2013-03-26 17:33:57 -07:00
Yu Ping Hu
1dd937bf18 Prevent NPE when getting a bad mailbox id.
The mailboxNotification query apparently can return bogus
mailbox ids. This underlying bug still needs fixing.

Bug: 8482721
Change-Id: Icfbd0d986ab32fe878a0dbe09a3276322c75cafe
2013-03-26 15:00:30 -07:00
Paul Westbrook
3f08d327ed am fa28657b: am 28a34404: Prevent NPE
* commit 'fa28657b5051688f1d04913a9e7db27e1670c3df':
  Prevent NPE
2013-03-23 01:35:56 +00:00
Paul Westbrook
fa28657b50 am 28a34404: Prevent NPE
* commit '28a344042d0f8353d2e5c15fe3951c1e0520f1b7':
  Prevent NPE
2013-03-23 01:32:28 +00:00
Paul Westbrook
28a344042d Prevent NPE
Also add additional logging for this case

Bug: 8372753
Change-Id: I87aa9ee46f0ca866745d62d27f4b40913f2e9b97
2013-03-22 18:21:19 -07:00
Paul Westbrook
6713e56d73 am dd1ac4d7: am 7b44f1cd: Fixed missing resource on phone
* commit 'dd1ac4d783b6194414b2f79e760610fef5781d4f':
  Fixed missing resource on phone
2013-03-23 00:54:21 +00:00
Paul Westbrook
dd1ac4d783 am 7b44f1cd: Fixed missing resource on phone
* commit '7b44f1cd91df2978990aba51d6663dd913f361d3':
  Fixed missing resource on phone
2013-03-23 00:53:00 +00:00
Paul Westbrook
7b44f1cd91 Fixed missing resource on phone
Bug: 8435176
Change-Id: Idf1df53ba80af13922b984e6a6997c8e576de0ee
2013-03-22 17:43:42 -07:00
Yu Ping Hu
9a691ef64b am 3b1ad703: am 861c5c8c: Guard against potential NPE.
* commit '3b1ad7034d0925c9377d58336647e3f98ca623ab':
  Guard against potential NPE.
2013-03-22 02:31:43 +00:00
Yu Ping Hu
3b1ad7034d am 861c5c8c: Guard against potential NPE.
* commit '861c5c8c9e054a4562af44805c57f39e7121ca43':
  Guard against potential NPE.
2013-03-22 02:29:29 +00:00
Yu Ping Hu
861c5c8c9e Guard against potential NPE.
Change-Id: I379da1f478b1b1fd1e488dbeff249cc10e3d48d5
2013-03-21 19:25:14 -07:00
Paul Westbrook
c1c656ff5f am 21ddbd07: am 5a3aebbd: Fix problem with sending attachments in Exchange
* commit '21ddbd07bb57d3586b206a31109ad30409638793':
  Fix problem with sending attachments in Exchange
2013-03-22 00:43:40 +00:00
Paul Westbrook
21ddbd07bb am 5a3aebbd: Fix problem with sending attachments in Exchange
* commit '5a3aebbd2dd8cdd4d7c1a76ce3085cd6a314c0d0':
  Fix problem with sending attachments in Exchange
2013-03-22 00:42:50 +00:00
Paul Westbrook
5a3aebbd2d Fix problem with sending attachments in Exchange
The problem was that when the attachment was attempted to be opened
from the Exchange process, it didn't have access to the cached file.
Instead, use a content provider uri to reference the cached file.

Bug: 8400456

Change-Id: I80abd66642e938cf09f73bf0e9bd049aa8d7ba1d
2013-03-21 17:34:19 -07:00
Yu Ping Hu
5db35bbcf5 am 4172219b: am 68a8e212: Merge "Always create system folders during sync." into jb-ub-mail-ur9
* commit '4172219ba50d358f826a372e8f56f87e1900cb5a':
  Always create system folders during sync.
2013-03-21 16:07:01 +00:00
Yu Ping Hu
2ff7b17d64 am 1cd14f3f: am 8a11cb8f: Merge "Always show the starred folder." into jb-ub-mail-ur9
* commit '1cd14f3f95b308bcfadac2f57af4cb604dd16e53':
  Always show the starred folder.
2013-03-21 16:07:00 +00:00
Yu Ping Hu
4172219ba5 am 68a8e212: Merge "Always create system folders during sync." into jb-ub-mail-ur9
* commit '68a8e21248313582f2dbf820c275f6807b4fa715':
  Always create system folders during sync.
2013-03-21 16:06:05 +00:00
Yu Ping Hu
1cd14f3f95 am 8a11cb8f: Merge "Always show the starred folder." into jb-ub-mail-ur9
* commit '8a11cb8fd1b52cbcc413be04970e38e738617b54':
  Always show the starred folder.
2013-03-21 16:06:04 +00:00
Yu Ping Hu
68a8e21248 Merge "Always create system folders during sync." into jb-ub-mail-ur9 2013-03-21 16:05:03 +00:00
Yu Ping Hu
8a11cb8fd1 Merge "Always show the starred folder." into jb-ub-mail-ur9 2013-03-21 16:04:53 +00:00
Scott Kennedy
3b113f3410 am 9dcc001d: am f16a7612: Exclude all inbox labels when we\'re viewing an inbox
* commit '9dcc001d587c7b69db3b3954a59bc1f0651492df':
  Exclude all inbox labels when we're viewing an inbox
2013-03-21 01:23:58 +00:00
Scott Kennedy
9dcc001d58 am f16a7612: Exclude all inbox labels when we\'re viewing an inbox
* commit 'f16a7612c0bc4b4f03c9f8ba982c7723a5f33e17':
  Exclude all inbox labels when we're viewing an inbox
2013-03-21 01:21:58 +00:00
Scott Kennedy
f16a7612c0 Exclude all inbox labels when we're viewing an inbox
Bug: 8426563
Change-Id: I7707c9ebf9ebcb73be73ef82f5f2212514671bfe
2013-03-20 17:51:59 -07:00
Yu Ping Hu
a5a963321d Always show the starred folder.
Bug: 8383232
Change-Id: I8a5fa0dbdd9f4f2000c5b7d3347eb4946af0ae80
2013-03-20 15:34:56 -07:00
Yu Ping Hu
2192bf01e0 Always create system folders during sync.
Change-Id: I8ff6eb4f65d4207d7a2768c5fd837fad8cd47269
2013-03-20 15:23:51 -07:00
Baligh Uddin
757299af42 am 3f708833: (-s ours) am 0da0c18e: (-s ours) Import translations. DO NOT MERGE
* commit '3f708833b7bf420156f034f25cd5547e3bdd8afb':
  Import translations. DO NOT MERGE
2013-03-20 20:03:49 +00:00
Baligh Uddin
3f708833b7 am 0da0c18e: (-s ours) Import translations. DO NOT MERGE
* commit '0da0c18ede2dfad91916f8852881ae38ee01c688':
  Import translations. DO NOT MERGE
2013-03-20 20:01:41 +00:00
Baligh Uddin
314690d142 am 93477ca9: (-s ours) Import translations. DO NOT MERGE
* commit '93477ca98724260533dce14ab0c225911e7e79a4':
  Import translations. DO NOT MERGE
2013-03-20 20:00:40 +00:00
Baligh Uddin
0da0c18ede Import translations. DO NOT MERGE
Change-Id: Iab79dd1932eb580a6049c2bb740f462f8b84e562
Auto-generated-cl: translation import
2013-03-20 12:02:46 -07:00
Baligh Uddin
18e247b36e Import translations. DO NOT MERGE
Change-Id: If6e2bb4ad342d0b7c8c36da939165cd292f07f31
Auto-generated-cl: translation import
2013-03-20 12:01:24 -07:00
Baligh Uddin
93477ca987 Import translations. DO NOT MERGE
Change-Id: I2bfa153f833c44763432f399ae278c1addbc8436
Auto-generated-cl: translation import
2013-03-20 12:00:10 -07:00
Yu Ping Hu
a52ca81d06 am 37a06f0e: am b06369ea: Merge "Move system folder string resources to emailcommon." into jb-ub-mail-ur9
* commit '37a06f0e949a6c9bd046f43acd3a80571e48af22':
  Move system folder string resources to emailcommon.
2013-03-20 03:17:26 +00:00
Yu Ping Hu
37a06f0e94 am b06369ea: Merge "Move system folder string resources to emailcommon." into jb-ub-mail-ur9
* commit 'b06369ea005768fb3e4d87553505ac44e05576c6':
  Move system folder string resources to emailcommon.
2013-03-20 03:15:50 +00:00
Yu Ping Hu
b06369ea00 Merge "Move system folder string resources to emailcommon." into jb-ub-mail-ur9 2013-03-20 03:14:09 +00:00
Yu Ping Hu
9ae81e2af0 Move system folder string resources to emailcommon.
This permits us to move shared code for looking up system
folder names to emailcommon, which is also in this change.

Also renames emailcommon2 to emailcommon.

This is part of a multi-project submit with
I4a071a07c3e33aaa4ea404eb66a8db1eabc9ef0e and
I5746c0353783f9b29d52d6540472588c6542a6a2.

Bug: 8383232

Change-Id: I6c6eec4f1bcf2abd54c1ed05da1add8d894ee403
2013-03-19 19:45:52 -07:00
Scott Kennedy
0dce81e99e am a6a71360: am 093e6697: Fix notification issues
* commit 'a6a713602d6b807ff29c2355922a729197ca2d41':
  Fix notification issues
2013-03-20 02:18:49 +00:00
Scott Kennedy
a6a713602d am 093e6697: Fix notification issues
* commit '093e669746f39f2297d21a7b47e61aa41399ab61':
  Fix notification issues
2013-03-20 02:17:11 +00:00
Scott Kennedy
093e669746 Fix notification issues
CLEAR_NEW_MAIL_NOTIFICATIONS wasn't being received because
there were no data tags in the filter.

Bug: 7923968
Change-Id: I4f6d03e79a8ecf9450acba3348242c8a48916ad3
2013-03-19 18:32:39 -07:00
Yu Ping Hu
fc29461c7e am b59bd1fc: am 24e16532: Increment Email version.
* commit 'b59bd1fc2214c35aed3229bcc7076a47af22b0d3':
  Increment Email version.
2013-03-19 22:00:41 +00:00
Yu Ping Hu
b59bd1fc22 am 24e16532: Increment Email version.
* commit '24e165323e5a1d834dba1e0cef0677302e41b5ec':
  Increment Email version.
2013-03-19 21:58:57 +00:00