Commit Graph

8186 Commits

Author SHA1 Message Date
Yu Ping Hu
de85765657 am 3d2ef0f0: am 5d4f9b96: Increment Email version number.
* commit '3d2ef0f0efc51445221c5daf7a9de761f93b58d3':
  Increment Email version number.
2013-04-26 17:22:51 -07:00
Yu Ping Hu
3d2ef0f0ef am 5d4f9b96: Increment Email version number.
* commit '5d4f9b96b078a48b5206c86ca85351809237336b':
  Increment Email version number.
2013-04-26 17:20:32 -07:00
Yu Ping Hu
5d4f9b96b0 Increment Email version number.
Change-Id: Ib9d78d2bd74edcdfb00ea9f575cdc3a4b9ab18ee
2013-04-26 17:14:09 -07:00
Yu Ping Hu
441bbecd1d am d519a0c8: am 23f57e3f: Increment Email version number.
* commit 'd519a0c807563e1977ec5ba4b03378d1ec3c9b46':
  Increment Email version number.
2013-04-26 16:15:27 -07:00
Yu Ping Hu
d519a0c807 am 23f57e3f: Increment Email version number.
* commit '23f57e3f20aaf4717e30cfd29cbc543036e62240':
  Increment Email version number.
2013-04-26 16:14:22 -07:00
Yu Ping Hu
23f57e3f20 Increment Email version number.
Change-Id: I9d890232e076377458580dc72aaab3b0e56a12c1
2013-04-26 16:10:41 -07:00
Baligh Uddin
dc22aa9c5e am 4680b8eb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '4680b8eb259ac4a9a738e72c2f79a1a41122a4cf':
  Import translations. DO NOT MERGE
2013-04-26 15:14:06 -07:00
Baligh Uddin
4680b8eb25 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-04-26 22:12:25 +00:00
Baligh Uddin
8942a3ee4a Import translations. DO NOT MERGE
Change-Id: Iad1aa61dae2aef9d1d953b440fb4ca0637df3ec0
Auto-generated-cl: translation import
2013-04-26 11:39:21 -07:00
Yu Ping Hu
a74afd3755 am bcf89c2a: am 5b528172: Merge "Use system SyncManager for Exchange." into jb-ub-mail-ur9
* commit 'bcf89c2ace4e965523b20a555753ed88b409bf94':
  Use system SyncManager for Exchange.
2013-04-26 11:10:47 -07:00
Yu Ping Hu
bcf89c2ace am 5b528172: Merge "Use system SyncManager for Exchange." into jb-ub-mail-ur9
* commit '5b528172436c754b261a786b985124ed9a898269':
  Use system SyncManager for Exchange.
2013-04-26 11:08:51 -07:00
Yu Ping Hu
5b52817243 Merge "Use system SyncManager for Exchange." into jb-ub-mail-ur9 2013-04-26 18:08:00 +00:00
Paul Westbrook
503405cc1b am 91921246: am 3bf29abe: Include analytics library
* commit '91921246eebf335a55dba788a073664667ce9847':
  Include analytics library
2013-04-26 09:53:35 -07:00
Paul Westbrook
91921246ee am 3bf29abe: Include analytics library
* commit '3bf29abec0b7262df9d16291233293e5f171ae80':
  Include analytics library
2013-04-26 09:51:50 -07:00
Paul Westbrook
3bf29abec0 Include analytics library
Change-Id: Ief6b76fa5c9d4013c8848c78748b988d306510de
2013-04-26 03:07:30 -07:00
Alice Yang
109fda7ddb am 59c048df: am 6929654a: Remove checkboxes from Email
* commit '59c048dfc6abdaa3eb7bae44ba5936f52e9dcbff':
  Remove checkboxes from Email
2013-04-25 23:58:31 -07:00
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
20d653208a am a5f784bb: am 81c1b3ee: Sender images in email
* commit 'a5f784bb99d719aafbb9944a708cc3b3324117cb':
  Sender images in email
2013-04-25 21:31:46 -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
Yu Ping Hu
9e7f5a2a33 Use system SyncManager for Exchange.
Change-Id: I77e4e75c94c532d22a28cf97e6f55f1259b8bdde
2013-04-25 14:03:00 -07:00
Scott Kennedy
cc2d942509 am a1b06623: am c726d4fa: Add "Reply all" setting to tablets
* commit 'a1b066231b8cf8e8446416b80ee922a55083a807':
  Add "Reply all" setting to tablets
2013-04-24 18:28:07 -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
317c934330 am 634365f6: am 156a9bde: PreferenceMigrator force commits pref upgrades.
* commit '634365f65ee472633a0040f680a901fff4133686':
  PreferenceMigrator force commits pref upgrades.
2013-04-24 16:02:07 -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
6c0f16ddbd am 66708dd9: (-s ours) am 33558fc1: (-s ours) Import translations. DO NOT MERGE
* commit '66708dd9b8fe4fa18bb9ec85f952c74a1ec19c04':
  Import translations. DO NOT MERGE
2013-04-24 12:55:22 -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
3fa2e295e5 am d34bd93b: (-s ours) Import translations. DO NOT MERGE
* commit 'd34bd93b81b406ec236ab26870ff09e188fa1b42':
  Import translations. DO NOT MERGE
2013-04-24 12:52:08 -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
90937c3fd8 Import translations. DO NOT MERGE
Change-Id: I5be6ab8840bf372df262b9984fa950d99e8c692b
Auto-generated-cl: translation import
2013-04-24 11:17:53 -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
0632bac5d2 am 97589ea9: am 643846ab: Settings changes
* commit '97589ea94341a1a18eb57c580f328b5c49e65030':
  Settings changes
2013-04-23 17:44:13 -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
7c3aaea8a9 am a17a2436: am 7ed75feb: Merge "CL to support method signature change." into jb-ub-mail-ur9
* commit 'a17a24366b08bc6af01953f1385ade2394066e45':
  CL to support method signature change.
2013-04-23 13:05:59 -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
9ca0f58bd2 am 4729eac8: (-s ours) am c2dfee3c: (-s ours) Import translations. DO NOT MERGE
* commit '4729eac81f58ce2b1e513f5064abdf41178a168d':
  Import translations. DO NOT MERGE
2013-04-22 15:04:36 -07:00
Baligh Uddin
4f26da000c am 25f94583: (-s ours) Import translations. DO NOT MERGE
* commit '25f94583a59d607dd7f8e607c7e0535efda9bae0':
  Import translations. DO NOT MERGE
2013-04-22 15:01:21 -07: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
f4b83d66bf Import translations. DO NOT MERGE
Change-Id: I66070fca1658a2cc486967c57f7bcaa14bf25d77
Auto-generated-cl: translation import
2013-04-22 11:59:23 -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
8f381e57d7 am 2425df5a: am ee9f671d: CleanSpec for change in drawer resource
* commit '2425df5a8ae7509903f0c59c5041123c2b1c5f13':
  CleanSpec for change in drawer resource
2013-04-21 15:07:29 -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