Commit Graph

8361 Commits

Author SHA1 Message Date
Tony Mantler
801bb02408 Merge "Bandaid fix for overlapping buttons in incoming/outgoing settings" into jb-ub-mail-ur10 2013-08-27 17:37:36 +00:00
Scott Kennedy
0a710bde68 Fix notification preference migration
These settings need to be migrated from the database, not the
SharedPreferences file that likely shouldn't even exist.

Everything added to Account.java was removed in
Ie6ec389b5b5d2e7ab1b299d0877811ae716526e2
when it was believed to be unnecessary.

Bug: 10211615
Change-Id: If6193758febda8a3272d82792492503549a44e32
2013-08-26 14:19:54 -07:00
Tony Mantler
8d3b493d1b Bandaid fix for overlapping buttons in incoming/outgoing settings
Just fall back to the phone layout for the buttons until I address b/8134410 more directly by making the incoming/outgoing screens into dialogs

Change-Id: I7ef5fb5477a2a6b723d46f111b23884519ac36ff
2013-08-26 13:44:34 -07:00
Tony Mantler
076ab83074 Minor warnings tidy
Change-Id: Ib2a85ca838ae521377855b916c57bb7bd00c42f3
2013-08-26 10:17:14 -07:00
Yu Ping Hu
9950981ec6 Increment Email version.
Change-Id: Ifb89a09b3bfaf9296ce8c4cd65053719ad957e5b
2013-08-23 18:01:38 -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
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
ed4accb24f Clean up warnings, finals, dead and useless code
Change-Id: I8225a78c3b1712479bb5752161e3585a2bc2be2e
2013-08-23 14:43:31 -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
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
9b75d662da New overflow to more places
Change-Id: I1cfdef636fdb32968a4a7164e1e79693475d8d09
2013-08-22 16:58:05 -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
e28df24205 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-08-22 17:58:04 +00: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
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
dc5549a1e4 Increment Email version.
Change-Id: Ie42e9085f7d9e79035192d2c2d9ff62abf4feaaa
2013-08-21 20:32: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
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
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
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
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
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
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
c0a1a81543 Make EmailProvider URL matcher init threadsafe
Also remove mysterious extra indentation

b/10388165

Change-Id: I9a6f16c58e31653e5c47ff2898f66a44412b8a33
2013-08-20 09:58:17 -07:00
Scott Kennedy
8bdf037f9c Remove an unused constant
Change-Id: I4aaf0237719078731e3eb0c2434485530e653c86
2013-08-19 21:27:24 -07:00
Yu Ping Hu
ab45810839 Merge "Disable policy listing in account settings." into jb-ub-mail-ur10 2013-08-20 02:05:54 +00:00
Yu Ping Hu
4df4c1c2d8 Disable policy listing in account settings.
It wasn't working right anyway.
Also, fix a problem where account settings were
not being fully initialized.

Bug: 8384097
Change-Id: Ia60ace2ce618b64fe4ad5ef8d8ac547a086a26d5
2013-08-19 18:52:44 -07:00
Martin Hibdon
caf847f1ca Merge "Fix an OutOfBoundsException" into jb-ub-mail-ur10 2013-08-20 00:31:23 +00:00
Martin Hibdon
b940ed8adf Fix an OutOfBoundsException
b/10380970
This could happen if the response to the POP3
RETR request did not contain a content length.

Change-Id: I99ad93ec71ba917e0f36bee204d7f8d05c79c5ff
2013-08-19 17:07:05 -07:00
Baligh Uddin
4def09f9fc Import translations. DO NOT MERGE
Change-Id: I5ceb8be0223048d1a2cfe75f205f1a33236b4de7
Auto-generated-cl: translation import
2013-08-19 13:15:02 -07:00
Paul Westbrook
5440a40532 Prevent NPE
If two threads call EmailContent.init(), one of them may use
uninitialized EmailContent contstants

Bug: 10355491

Change-Id: Iedcad01345989df62baf755bf4d63c123e307b7c
2013-08-16 20:27:24 -07:00
Yu Ping Hu
ea69cbe533 Merge "Fix attachments when policies change." into jb-ub-mail-ur10 2013-08-17 02:26:40 +00:00
Yu Ping Hu
901faf1bfb Allow deletion from virtual folders.
Bug: 10367404
Change-Id: I869dfc5af7064e2992bbd47c89fd990e2caaa701
2013-08-16 18:30:44 -07:00
Yu Ping Hu
940a335bab Fix attachments when policies change.
This used to be done in the Exchange code, but it's more
appropriate here.

Change-Id: Ie2bd5722bda46741d367eef3a2e9d2493c3cc4e3
2013-08-16 17:46:01 -07:00
Paul Westbrook
908fac0b24 Fix NPE
Bug: 10292690
Change-Id: I34714a6a07bcaba3d20fdae32ee6b129c74c8a32
2013-08-16 15:53:36 -07:00
Tony Mantler
dae31e6c28 Merge "Reimplement QuickResponse support" into jb-ub-mail-ur10 2013-08-16 21:57:33 +00:00
Martin Hibdon
1a0aa22dc0 Cut down on some unneccesary allocations
We were always allocating a one element array in
a loop. We can just keep create one array and
reuse it.

Change-Id: Ia44f0b711ef48fb87030c3f09f3f9fb654717b7a
2013-08-16 14:19:07 -07:00
Tony Mantler
c6953b7755 Reimplement QuickResponse support
b/8622751

Change-Id: Id079efcf34dce15b5f5057f937582c0e198d3d50
2013-08-16 14:08:54 -07:00
Paul Westbrook
2127d4dd09 Use name "Email" instead of Email2
cherry-pick of https://googleplex-android-review.googlesource.com/#/c/344210/1
Change-Id: I67e8f1b46e708b65934c794f7df107138f84c7c9
2013-08-16 09:22:57 -07:00
Baligh Uddin
62630e8d6c Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-08-16 00:53:08 +00:00
Martin Hibdon
8708594f03 Use insecure socketFactory if "accept all certificates"
b/9176386

Change-Id: I1edc92bb4207d166e9b252bf3ed98ad8b2c4d996
2013-08-15 17:45:36 -07:00
Yu Ping Hu
64fa58a0bc Increment Email version.
Change-Id: I40c58ab66a6838e15e9abdd629e05de526597ba6
2013-08-16 00:32:10 +00:00