Commit Graph

8407 Commits

Author SHA1 Message Date
Baligh Uddin
962d599b02 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9 2013-05-01 20:57:05 +00:00
Baligh Uddin
94e1f2134f Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-05-01 20:56:42 +00:00
Baligh Uddin
68689a780d Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-05-01 20:56:26 +00:00
Baligh Uddin
f480039c16 Import translations. DO NOT MERGE
Change-Id: Ie8b0a3c1d8f990b83d43294c77b4e800c86fb185
Auto-generated-cl: translation import
2013-05-01 11:40:58 -07:00
Baligh Uddin
e31b6db4d4 Import translations. DO NOT MERGE
Change-Id: I67a19e4a651caf6a3dd636e6d1922705387f7b09
Auto-generated-cl: translation import
2013-05-01 11:40:08 -07:00
Baligh Uddin
7c0e6b624b Import translations. DO NOT MERGE
Change-Id: I1a545ca14a3206755d244585512b92015592fa50
Auto-generated-cl: translation import
2013-05-01 11:39:15 -07:00
Paul Westbrook
5f625200f1 am 1801ffc6: am fce86e93: Revert "Include analytics library"
* commit '1801ffc6bc420762f89b3964829978db300fd88d':
  Revert "Include analytics library"
2013-05-01 10:56:14 -07:00
Paul Westbrook
1801ffc6bc am fce86e93: Revert "Include analytics library"
* commit 'fce86e93912fe97f2c60881c3d46b3ad8b5de27f':
  Revert "Include analytics library"
2013-05-01 10:53:44 -07:00
Paul Westbrook
fce86e9391 Revert "Include analytics library"
This reverts commit 3bf29abec0.
Bug: 8764535
2013-05-01 10:21:37 -07:00
Yu Ping Hu
80af6d03a9 am 075f3b96: am 99e66178: Merge "Code cleanup." into jb-ub-mail-ur9
* commit '075f3b962e253d1f74aae88cd5445671c0ff6c14':
  Code cleanup.
2013-04-30 14:34:49 -07:00
Yu Ping Hu
075f3b962e am 99e66178: Merge "Code cleanup." into jb-ub-mail-ur9
* commit '99e66178b9ba76a4aed9805d6929c6756056ac4f':
  Code cleanup.
2013-04-30 14:32:22 -07:00
Yu Ping Hu
99e66178b9 Merge "Code cleanup." into jb-ub-mail-ur9 2013-04-30 21:29:10 +00:00
Yu Ping Hu
1484c6663d Code cleanup.
- Cleanup sync adapter to not have statics & locks.
- Remove some dead code.

Change-Id: Ia310d32b93706dc3742ccee74e5b751174280488
2013-04-30 14:21:19 -07:00
Mark Wei
c5d79f888a am 7648a667: am 39913f25: Merge "Unconfigure widgets when switching sectioned inbox on/off." into jb-ub-mail-ur9
* commit '7648a667a9dbf2765a6f38bc5eeda0bbb768f6be':
  Unconfigure widgets when switching sectioned inbox on/off.
2013-04-30 13:16:48 -07:00
Mark Wei
7648a667a9 am 39913f25: Merge "Unconfigure widgets when switching sectioned inbox on/off." into jb-ub-mail-ur9
* commit '39913f25bf70a12f5f9ee55eb3386d0a3812cef9':
  Unconfigure widgets when switching sectioned inbox on/off.
2013-04-30 13:14:22 -07:00
Mark Wei
39913f25bf Merge "Unconfigure widgets when switching sectioned inbox on/off." into jb-ub-mail-ur9 2013-04-30 20:10:28 +00:00
Baligh Uddin
0fb7e6060e am 5d11882e: (-s ours) am 53b03880: (-s ours) Import translations. DO NOT MERGE
* commit '5d11882e39405002b2cca5ed05cbbe06939166e1':
  Import translations. DO NOT MERGE
2013-04-30 09:06:31 -07:00
Baligh Uddin
5d11882e39 am 53b03880: (-s ours) Import translations. DO NOT MERGE
* commit '53b0388076e94e9d4987cb64576905e64db2cfec':
  Import translations. DO NOT MERGE
2013-04-30 09:05:12 -07:00
Baligh Uddin
53b0388076 Import translations. DO NOT MERGE
Change-Id: Idda37765db9dd38be45058b3dbf7cef7636d6da5
Auto-generated-cl: translation import
2013-04-30 01:35:34 -07:00
Baligh Uddin
3e255139e4 Import translations. DO NOT MERGE
Change-Id: I6a62e4bb175dfa3a6a6a1f2dc8b1575dd5d8d916
Auto-generated-cl: translation import
2013-04-30 01:34:45 -07:00
Mark Wei
d2740d69cc Unconfigure widgets when switching sectioned inbox on/off.
Widgets configured to use inboxes that no longer exist will be unconfigured.

Bug: 8599006
Change-Id: I95c61546a71a727ebb51aed9b345ccc3276829b6
2013-04-29 17:27:06 -07:00
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