Commit Graph

8732 Commits

Author SHA1 Message Date
Baligh Uddin
f3cd0deb1e Import translations. DO NOT MERGE
Change-Id: I55ac03c2b04a1f2eea19318b8aeff3433723cd37
Auto-generated-cl: translation import
2013-08-26 15:07:01 -07:00
Yu Ping Hu
9f4e0ca2f6 am 9950981e: Increment Email version.
* commit '9950981ec689091f7f38941283ededdbea2983b8':
  Increment Email version.
2013-08-23 18:37:57 -07:00
Yu Ping Hu
9950981ec6 Increment Email version.
Change-Id: Ifb89a09b3bfaf9296ce8c4cd65053719ad957e5b
2013-08-23 18:01:38 -07:00
Yu Ping Hu
073505c8d5 am 9e8a6f86: Increase char limit for a string.
* commit '9e8a6f86ba71d96d085af84fea05f04533de226e':
  Increase char limit for a string.
2013-08-23 16:44:12 -07:00
Yu Ping Hu
9e8a6f86ba Increase char limit for a string.
Bug: 10460863
Change-Id: Iaaaf2988f86cf1182a29ec6b99e88d4bbe9c309c
2013-08-23 16:38:16 -07:00
Yu Ping Hu
53e38fd3f4 am c76d008c: Merge "Add the moved messages query." into jb-ub-mail-ur10
* commit 'c76d008c90dee88c53b182db9d95f6a18999b5cd':
  Add the moved messages query.
2013-08-23 15:55:20 -07:00
Yu Ping Hu
c76d008c90 Merge "Add the moved messages query." into jb-ub-mail-ur10 2013-08-23 22:54:14 +00:00
Yu Ping Hu
336e65b6e1 Add the moved messages query.
Change-Id: I6dea8055c5d1a4195b9613f684fbd1f5e8d807fd
2013-08-23 15:50:10 -07:00
Tony Mantler
69442daf32 am ed4accb2: Clean up warnings, finals, dead and useless code
* commit 'ed4accb24facd1324948abc61b0791eb3dc97cc4':
  Clean up warnings, finals, dead and useless code
2013-08-23 15:20:08 -07:00
Tony Mantler
ed4accb24f Clean up warnings, finals, dead and useless code
Change-Id: I8225a78c3b1712479bb5752161e3585a2bc2be2e
2013-08-23 14:43:31 -07:00
Tony Mantler
14e4ee0be3 am 21b95c10: Check for null cursor in EmailPreferenceMigrator#migrate()
* commit '21b95c1071b15a8c264c945a809d60ee284020de':
  Check for null cursor in EmailPreferenceMigrator#migrate()
2013-08-23 11:46:35 -07:00
Tony Mantler
21b95c1071 Check for null cursor in EmailPreferenceMigrator#migrate()
b/10456199

Change-Id: I3586fbb1aadbcc7e93208aa35ce948b133737d11
2013-08-23 11:43:49 -07:00
Scott Kennedy
2d52755be9 am 3b219ce0: Merge "Add a CleanSpec" into jb-ub-mail-ur10
* commit '3b219ce0bc65a9892a45ffb1e311ed5638ffd143':
  Add a CleanSpec
2013-08-23 11:04:09 -07:00
Tony Mantler
61c92f45e1 am c38a8427: Merge "Add TODO for debug variable for entering debug screen" into jb-ub-mail-ur10
* commit 'c38a84279ba579a8a8fc618c9d2a77139d5ced4c':
  Add TODO for debug variable for entering debug screen
2013-08-23 11:04:08 -07:00
Scott Kennedy
3b219ce0bc Merge "Add a CleanSpec" into jb-ub-mail-ur10 2013-08-23 18:01:03 +00:00
Tony Mantler
c38a84279b Merge "Add TODO for debug variable for entering debug screen" into jb-ub-mail-ur10 2013-08-23 18:00:41 +00:00
Tony Mantler
4727dc2903 Add TODO for debug variable for entering debug screen
See b/10446166 for STOPSHIP notice to disable debug screen before shipping

Change-Id: Ic0c845b558a2b745bc5015beb3eac3864165670d
2013-08-23 10:50:52 -07:00
Scott Kennedy
cc2e8153e6 Add a CleanSpec
Change-Id: I4d8e2c9f702a2f364a0c0c6a953a9e283a73a3ce
2013-08-23 10:47:19 -07:00
Andrew Sapperstein
9996d679d1 am 9b75d662: New overflow to more places
* commit '9b75d662da2930fff6afdd9730b6e8b0c4b15c15':
  New overflow to more places
2013-08-22 17:15:27 -07:00
Andrew Sapperstein
9b75d662da New overflow to more places
Change-Id: I1cfdef636fdb32968a4a7164e1e79693475d8d09
2013-08-22 16:58:05 -07:00
Tony Mantler
c15798f1b3 am 219c3b5b: Tidy up warnings in account setup fragments
* commit '219c3b5b8474bc0b95a9dcab21067ff603fccb15':
  Tidy up warnings in account setup fragments
2013-08-22 15:44:45 -07:00
Tony Mantler
219c3b5b84 Tidy up warnings in account setup fragments
Change-Id: I078df83dbc4afd10c0783a98bfbb23bced12489c
2013-08-22 15:09:42 -07:00
Baligh Uddin
f19b19378d am e28df242: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit 'e28df2420522643a23646921cb252de3a6188b9d':
  Import translations. DO NOT MERGE
2013-08-22 11:01:08 -07:00
Baligh Uddin
5741008c51 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-08-22 17:58:11 +00:00
Baligh Uddin
e28df24205 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-08-22 17:58:04 +00:00
Scott Kennedy
adddf3b918 am a21d609a: Merge "Move Email multi-message notification icon to UnifiedEmail" into jb-ub-mail-ur10
* commit 'a21d609a39553da5436a477113ceb9df19a22ee3':
  Move Email multi-message notification icon to UnifiedEmail
2013-08-22 09:34:19 -07:00
Scott Kennedy
a21d609a39 Merge "Move Email multi-message notification icon to UnifiedEmail" into jb-ub-mail-ur10 2013-08-22 16:29:00 +00:00
Scott Kennedy
be7c1bdb40 am e3a0ef87: Remove a bunch of unused resources
* commit 'e3a0ef87be55bd4348c9b487070288e06ff239f8':
  Remove a bunch of unused resources
2013-08-22 09:15:57 -07:00
Scott Kennedy
19597e8e72 Move Email multi-message notification icon to UnifiedEmail
Change-Id: I70f30ac71c2c9990a8178108011db88484e6d7bc
2013-08-22 00:41:20 -07:00
Scott Kennedy
e3a0ef87be Remove a bunch of unused resources
Change-Id: I3ae05b530046a087f150da0ceb8b59f7970da817
2013-08-22 00:31:12 -07:00
Yu Ping Hu
69652f36fb am dc5549a1: Increment Email version.
* commit 'dc5549a1e4e1950bfa00db35e39d8dce4a734bdc':
  Increment Email version.
2013-08-21 20:49:36 -07:00
Yu Ping Hu
dc5549a1e4 Increment Email version.
Change-Id: Ie42e9085f7d9e79035192d2c2d9ff62abf4feaaa
2013-08-21 20:32:33 -07:00
Andrew Sapperstein
8ee6266c81 am f7c76220: Merge "Support photoviewer backport." into jb-ub-mail-ur10
* commit 'f7c76220caa56b7f65ed9520a61813b8539373f2':
  Support photoviewer backport.
2013-08-21 18:41:33 -07:00
Andrew Sapperstein
f7c76220ca Merge "Support photoviewer backport." into jb-ub-mail-ur10 2013-08-22 01:39:15 +00:00
Yu Ping Hu
2650d5372a am f89b69ab: Merge "When adding an account, permit precisely 1 email address." into jb-ub-mail-ur10
* commit 'f89b69abb0d997fc09bccff03fb3db0419f59430':
  When adding an account, permit precisely 1 email address.
2013-08-21 17:39:49 -07:00
Yu Ping Hu
f89b69abb0 Merge "When adding an account, permit precisely 1 email address." into jb-ub-mail-ur10 2013-08-22 00:37:05 +00:00
Baligh Uddin
d99de4a48b Import translations. DO NOT MERGE
Change-Id: Ic556df2deb575cdf9727b61ee6ed641a5886fd5a
Auto-generated-cl: translation import
2013-08-21 17:24:27 -07:00
Baligh Uddin
9d750c9de2 Import translations. DO NOT MERGE
Change-Id: I28bd219e5e8208af5aa7aab078d8573c28eb978e
Auto-generated-cl: translation import
2013-08-21 17:23:30 -07:00
Yu Ping Hu
aba5a30c78 When adding an account, permit precisely 1 email address.
Bug: 10357463
Change-Id: I310647e48f21be2942f2ad375b0e2e19c1af9015
2013-08-21 17:21:48 -07:00
Martin Hibdon
df24691526 am b4d4729f: Merge "Add PingDuration to the Account table" into jb-ub-mail-ur10
* commit 'b4d4729fa2fc285ddc7ed31d902b15d8ad0cacca':
  Add PingDuration to the Account table
2013-08-21 17:21:11 -07:00
Martin Hibdon
b4d4729fa2 Merge "Add PingDuration to the Account table" into jb-ub-mail-ur10 2013-08-22 00:17:25 +00:00
Martin Hibdon
52135c6e87 Add PingDuration to the Account table
b/10328857
this is so that we can keep the current ping
duration and restore it on startup.

Change-Id: I7ae11fd21687cb9013222924934154c5ebe1f7e7
2013-08-21 17:00:55 -07:00
Andrew Sapperstein
a32a8aeed0 Support photoviewer backport.
Change-Id: I94460208d5e8d93cc59790cac374222bd05b38a4
2013-08-20 21:42:06 -07:00
Paul Westbrook
3f340419ce am e568f1bd: Use resources for authority/package name
* commit 'e568f1bd379d211d5ed743d2c3edc734d2cdf691':
  Use resources for authority/package name
2013-08-20 18:34:34 -07:00
Paul Westbrook
e568f1bd37 Use resources for authority/package name
This will better handle the case where the Email package name
changes from the "orignal package name"

Bug: 9763397

Change-Id: I8e01620551ce473e389e6a13963caaf685aea221
2013-08-20 17:55:47 -07:00
Yu Ping Hu
8b9478108c am fd96929f: Fix some sync related strings to match UX spec.
* commit 'fd96929f8ffbfbb17b91ae7e68e5ec9bcc1fc041':
  Fix some sync related strings to match UX spec.
2013-08-20 16:08:34 -07:00
Yu Ping Hu
fd96929f8f Fix some sync related strings to match UX spec.
Bug: 9564587
Change-Id: Ibf09f3a7c6fcd9fe2c939f35d8f41261e1b8005f
2013-08-20 16:02:58 -07:00
Yu Ping Hu
d1920c5225 am 45255659: Improve synchronization in EmailProvider.
* commit '4525565948db8728f5608da21bb9fd95993c6be9':
  Improve synchronization in EmailProvider.
2013-08-20 15:09:55 -07:00
Yu Ping Hu
4525565948 Improve synchronization in EmailProvider.
It's possible to have multiple EmailProviders.
Also get rid of references to the multiprocess attribute.

Bug: 10388165
Change-Id: Ic6be363eaee20b3b5deddc7b3054d1a7419483a1
2013-08-20 15:06:06 -07:00
Tony Mantler
4ea6b97e6d am c0a1a815: Make EmailProvider URL matcher init threadsafe
* commit 'c0a1a81543d147309876701484f5c5be93bdd203':
  Make EmailProvider URL matcher init threadsafe
2013-08-20 10:37:25 -07:00