Commit Graph

8034 Commits

Author SHA1 Message Date
Alice Yang
59c048dfc6 am 6929654a: Remove checkboxes from Email
* commit '6929654a0db0886821c7b161d7d0beb6ae5efb64':
  Remove checkboxes from Email
2013-04-25 23:56:43 -07:00
Alice Yang
6929654a0d Remove checkboxes from Email
Change-Id: Ie2338cddcf15a278622f72e4827e6b160e16912f
2013-04-25 22:13:29 -07:00
Alice Yang
a5f784bb99 am 81c1b3ee: Sender images in email
* commit '81c1b3ee2f6e32200f1ff48e1b6466bac515ed38':
  Sender images in email
2013-04-25 21:30:56 -07:00
Alice Yang
81c1b3ee2f Sender images in email
This is the minimum change to not break the build in Email when CL
for removing checkboxes is submitted in MR2.
I'm still investigating why contact images aren't showing up in Email and
will follow up with a fix.

Change-Id: I814ed2b0b0a468ee465e57c47c6c7248f4afdbbc
2013-04-25 20:28:31 -07:00
Scott Kennedy
a1b066231b am c726d4fa: Add "Reply all" setting to tablets
* commit 'c726d4fa6cd5239f9b902e954efaab7752d26471':
  Add "Reply all" setting to tablets
2013-04-24 18:25:55 -07:00
Scott Kennedy
c726d4fa6c Add "Reply all" setting to tablets
This controls the notification action on tablets.

Change-Id: I0b8df2ded371820f0dada3f1b11cebad462962ed
2013-04-24 18:15:19 -07:00
Andrew Sapperstein
634365f65e am 156a9bde: PreferenceMigrator force commits pref upgrades.
* commit '156a9bde06ec72f497f50ad1c7258636067512a6':
  PreferenceMigrator force commits pref upgrades.
2013-04-24 16:00:31 -07:00
Andrew Sapperstein
156a9bde06 PreferenceMigrator force commits pref upgrades.
Now, when PreferenceMigrator.migrate is run,
we forcibly call commit after the VersionedPrefs
object is updated (whether MailPrefs, AccountPreferences
or FolderPreferences). This commit applies the change to
Email2. Should fix b/8640441 and b/8520847.

Change-Id: I9a014c1c4bd35aa2ea8e268fec9a050d47e4d732
2013-04-24 13:38:08 -07:00
Baligh Uddin
66708dd9b8 am 33558fc1: (-s ours) Import translations. DO NOT MERGE
* commit '33558fc1335417c504337c64ef3119c119e8f5c6':
  Import translations. DO NOT MERGE
2013-04-24 12:52:10 -07:00
Baligh Uddin
33558fc133 Import translations. DO NOT MERGE
Change-Id: I06bc1d390dba17ab69bcf287dce947277ad28542
Auto-generated-cl: translation import
2013-04-24 11:18:44 -07:00
Baligh Uddin
d34bd93b81 Import translations. DO NOT MERGE
Change-Id: I73d879a369f4f0349ce9c590882eb485eaab64bd
Auto-generated-cl: translation import
2013-04-24 11:16:58 -07:00
Scott Kennedy
97589ea943 am 643846ab: Settings changes
* commit '643846abbd1ae60454fc8191992afffd08114e98':
  Settings changes
2013-04-23 17:42:13 -07:00
Scott Kennedy
643846abbd Settings changes
Bug: 8685202
Change-Id: Ica781557b91e5ed43221f6e28b9d65cbb044ea55
2013-04-23 13:12:31 -07:00
Andrew Sapperstein
a17a24366b am 7ed75feb: Merge "CL to support method signature change." into jb-ub-mail-ur9
* commit '7ed75feb1492ac3350ba00527a11d26a239e4511':
  CL to support method signature change.
2013-04-23 13:05:03 -07:00
Andrew Sapperstein
7ed75feb14 Merge "CL to support method signature change." into jb-ub-mail-ur9 2013-04-23 20:03:11 +00:00
Baligh Uddin
4729eac81f am c2dfee3c: (-s ours) Import translations. DO NOT MERGE
* commit 'c2dfee3ca81ddd1fce5194dcc2ecc90abfa60dd3':
  Import translations. DO NOT MERGE
2013-04-22 15:00:56 -07:00
Andrew Sapperstein
625409b169 CL to support method signature change.
Helps fix b/7923968. This is just a one-line
change. The real change is in the UnifiedEmail code.

Change-Id: I60808c0265e911394cbffa92214d10626769ca9a
2013-04-22 13:59:16 -07:00
Baligh Uddin
c2dfee3ca8 Import translations. DO NOT MERGE
Change-Id: If2f78530cca3ae11bc93975b6504929a6bce9216
Auto-generated-cl: translation import
2013-04-22 12:00:21 -07:00
Baligh Uddin
25f94583a5 Import translations. DO NOT MERGE
Change-Id: I2684719671a8dba0a90cfd74c86356efd8df1b40
Auto-generated-cl: translation import
2013-04-22 11:58:22 -07:00
Paul Westbrook
2425df5a8a am ee9f671d: CleanSpec for change in drawer resource
* commit 'ee9f671daa94b38ee101fb5398686dbe838c8dec':
  CleanSpec for change in drawer resource
2013-04-21 15:05:22 -07:00
Paul Westbrook
ee9f671daa CleanSpec for change in drawer resource
Bug: 8668887
Change-Id: I1d98d268950fee9335b519f43f8fea6cc4c4a805
2013-04-21 14:44:42 -07:00
Yu Ping Hu
165a382ec7 am e669f28b: Fix periodic sync (for POP/IMAP).
* commit 'e669f28b0866e66c629103698ad14b22a204442f':
  Fix periodic sync (for POP/IMAP).
2013-04-21 14:16:40 -07:00
Yu Ping Hu
e669f28b08 Fix periodic sync (for POP/IMAP).
Periodic sync management was wrong in at least two ways:

1) Periodic syncs were scheduled as a side effect of
   performing a sync, so changing the sync interval setting
   would not do what you expect.
2) Performing a manual mailbox sync would schedule a
   periodic sync on that mailbox.

This change removes the side effect from sync, and instead
actually responds to updates to the sync interval by
removing the extra syncs and updating just the account sync.

Bug: 8666490
Change-Id: I3f4a3fb7044c408578f0dc75ccb6c5bb176bfc0b
2013-04-21 11:33:52 -07:00
Yu Ping Hu
d040669d82 am 50d5152f: Merge "Code cleanup." into jb-ub-mail-ur9
* commit '50d5152f54060fa6a491e8f10411d02f13a09b83':
  Code cleanup.
2013-04-19 21:38:13 -07:00
Yu Ping Hu
50d5152f54 Merge "Code cleanup." into jb-ub-mail-ur9 2013-04-19 23:16:00 +00:00
Yu Ping Hu
0eb47994a3 Code cleanup.
- Refactor EmailProvider.call
- Remove unused import

Change-Id: I9f0ae35256856a9cd6ea015348d49fcbb6fa8b0f
2013-04-19 15:59:27 -07:00
Mark Wei
fe2187007a am 3a82ad59: Fix migration from Email1 to Email2 when using combined inbox.
* commit '3a82ad59928864931b826c46413831d7431057f9':
  Fix migration from Email1 to Email2 when using combined inbox.
2013-04-19 15:20:55 -07:00
Mark Wei
3a82ad5992 Fix migration from Email1 to Email2 when using combined inbox.
Bug: 8578254
Change-Id: I2afb7e145664c1e6d10c0cfbf654d835fec8c9f1
2013-04-19 15:07:28 -07:00
Yu Ping Hu
d5820f4271 am 503cc063: Stop using ContentCache and related caches.
* commit '503cc0630d54de430a97f6013c6c7b7e851e343d':
  Stop using ContentCache and related caches.
2013-04-19 13:49:21 -07:00
Yu Ping Hu
503cc0630d Stop using ContentCache and related caches.
Bug: 8655671
Change-Id: I349ce464b5d752b3ac687852dbce4f0b57e04c67
2013-04-19 11:09:15 -07:00
Yu Ping Hu
a8a397e4c9 am 0b8e65b7: Increment Email version number.
* commit '0b8e65b78471f741047872eb719b041555500cfc':
  Increment Email version number.
2013-04-19 10:22:42 -07:00
Yu Ping Hu
0b8e65b784 Increment Email version number.
Change-Id: I70237386705740dc20b6ee589a3404df17bef5f5
2013-04-19 10:03:51 -07:00
Yu Ping Hu
d26ec600f1 am 7539508b: Add a way to check whether we have a wakelock.
* commit '7539508bfc315fb3fce10d57da27762dab4d2bd4':
  Add a way to check whether we have a wakelock.
2013-04-19 08:46:52 -07:00
Yu Ping Hu
7539508bfc Add a way to check whether we have a wakelock.
Bug: 8640907

Change-Id: I886af09d20dab195a9bbd38082a02d29e8b864e7
2013-04-18 13:48:57 -07:00
Baligh Uddin
22a8772084 am 87d5fd39: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
* commit '87d5fd399fdfbe5d8b4660a8277e3fda3c37ee72':
  Import translations. DO NOT MERGE
2013-04-18 07:56:50 -07:00
Baligh Uddin
87d5fd399f Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9 2013-04-18 14:55:28 +00:00
Baligh Uddin
f6884dbe28 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-04-18 14:54:34 +00:00
Yu Ping Hu
fdb583ab6c am 9a2686af: Improve POP sync.
* commit '9a2686afa2e02c62a8e5f9c42c82bd2da70b96af':
  Improve POP sync.
2013-04-17 13:02:23 -07:00
Baligh Uddin
ac0b2e8571 Import translations. DO NOT MERGE
Change-Id: I90409e7de9c729ee77e8e388affb090ecccda8ee
Auto-generated-cl: translation import
2013-04-17 12:07:10 -07:00
Baligh Uddin
4f2103b294 Import translations. DO NOT MERGE
Change-Id: I8696bd5f512cf14b7864597d064e83e146987c75
Auto-generated-cl: translation import
2013-04-17 12:05:19 -07:00
Yu Ping Hu
9a2686afa2 Improve POP sync.
- Set socket timeout as soon as you open it. This was how
  IMAP worked, so I just moved the call up one level. This
  should help one of the sync forever scenarios.
- Simplify the SQL query for getting a Mailbox.
- Try to load messages that failed to load last time.
- Always close the connection to the remote folder.
- Don't try to be too clever in fetching the body.
  This needs to be fixed later for attachements, but for
  now seems to work better and will let me get more testing.

Change-Id: I91b6a6f2a2846b34b1a0c50eb4eb37fc947389ce
2013-04-17 10:54:33 -07:00
Andy Huang
1bcf452d53 am cb6bdff9: clean up old layouts, pt 3
* commit 'cb6bdff95c58b4927082bcca138a6305152643a7':
  clean up old layouts, pt 3
2013-04-15 14:20:42 -07:00
Andy Huang
cb6bdff95c clean up old layouts, pt 3
Bug: 8393227
Change-Id: I8fbd3ed96d9f7e10708ff6b064b2fea4865c4f69
2013-04-15 13:55:14 -07:00
Yu Ping Hu
4cdc42372c am d3af8adb: Merge "Populate the account object with the type" into jb-ub-mail-ur9
* commit 'd3af8adba6206ceb25f2cfea94419df1478ef974':
  Populate the account object with the type
2013-04-15 13:26:10 -07:00
Yu Ping Hu
d3af8adba6 Merge "Populate the account object with the type" into jb-ub-mail-ur9 2013-04-15 20:23:31 +00:00
Scott Kennedy
e0d4cab353 Populate the account object with the type
This is needed for prioritizing contact results

Bug: 8587925
Change-Id: I093f0914060a01f37b175ae5877b27e0e16e9eaf
2013-04-15 13:22:27 -07:00
Baligh Uddin
9fb0801cac am e8fd143c: (-s ours) Import translations. DO NOT MERGE
* commit 'e8fd143c81d3466010ffd8a71bad17393a8b48ec':
  Import translations. DO NOT MERGE
2013-04-15 13:06:24 -07:00
Baligh Uddin
e8fd143c81 Import translations. DO NOT MERGE
Change-Id: I9ea9f585bf76f378e3de4970c6f0c8d5fdb23e13
Auto-generated-cl: translation import
2013-04-15 12:05:13 -07:00
Yu Ping Hu
c1ff50488e am e3338641: Merge "Remove spammy log message." into jb-ub-mail-ur9
* commit 'e33386411219f1f2d1b53af787e3e414b01d6b1b':
  Remove spammy log message.
2013-04-15 10:57:53 -07:00
Baligh Uddin
31735479f3 am 8b01f18c: (-s ours) Import translations. DO NOT MERGE
* commit '8b01f18c2d6be4c26595d94bbb6cf7f6eca570f2':
  Import translations. DO NOT MERGE
2013-04-15 10:57:51 -07:00