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
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
eacc5ecc5f
am 8bdf037f
: Remove an unused constant
...
* commit '8bdf037f9cd08823210ce68aa000322a2f0c0a4d':
Remove an unused constant
2013-08-19 22:10:44 -07:00
Scott Kennedy
8bdf037f9c
Remove an unused constant
...
Change-Id: I4aaf0237719078731e3eb0c2434485530e653c86
2013-08-19 21:27:24 -07:00
Yu Ping Hu
18fce71483
am ab458108
: Merge "Disable policy listing in account settings." into jb-ub-mail-ur10
...
* commit 'ab45810839ed4a7c68cbd065bd18acd0b5a6c7bd':
Disable policy listing in account settings.
2013-08-19 19:07:04 -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
7e8a79e9fc
am caf847f1
: Merge "Fix an OutOfBoundsException" into jb-ub-mail-ur10
...
* commit 'caf847f1ca1affb3904b1f50f7145b441a3b4759':
Fix an OutOfBoundsException
2013-08-19 17:34:26 -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
4b1fac77b8
am 4def09f9
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4def09f9fc194a55716c6e31db2964886a48adbd':
Import translations. DO NOT MERGE
2013-08-19 14:56:31 -07:00
Baligh Uddin
1c0972cbf8
Import translations. DO NOT MERGE
...
Change-Id: I73a26e6880296b7e281de575a83e16c9d4d325e0
Auto-generated-cl: translation import
2013-08-19 13:15:54 -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
fafda74387
am 5440a405
: Prevent NPE
...
* commit '5440a405325c118ecab7ab4f124955ab3c92c245':
Prevent NPE
2013-08-16 20:32: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
ebe2c556e2
am ea69cbe5
: Merge "Fix attachments when policies change." into jb-ub-mail-ur10
...
* commit 'ea69cbe533eb09c0264082dd2370f5d6d8c47fda':
Fix attachments when policies change.
2013-08-16 19:28:42 -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
f6fcd02071
am 901faf1b
: Allow deletion from virtual folders.
...
* commit '901faf1bfb3473b4e40ccd82dab3f3f99eb599bb':
Allow deletion from virtual folders.
2013-08-16 18:39:22 -07: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
703f2a7ee1
am 908fac0b
: Fix NPE
...
* commit '908fac0b247deff27fee44297f892afdfbb086a5':
Fix NPE
2013-08-16 16:13:26 -07:00
Paul Westbrook
908fac0b24
Fix NPE
...
Bug: 10292690
Change-Id: I34714a6a07bcaba3d20fdae32ee6b129c74c8a32
2013-08-16 15:53:36 -07:00
Tony Mantler
f36791eefd
am dae31e6c
: Merge "Reimplement QuickResponse support" into jb-ub-mail-ur10
...
* commit 'dae31e6c28c2380a680f6fdbff416e4fa31488b2':
Reimplement QuickResponse support
2013-08-16 14:58:55 -07:00
Tony Mantler
dae31e6c28
Merge "Reimplement QuickResponse support" into jb-ub-mail-ur10
2013-08-16 21:57:33 +00:00
Martin Hibdon
d20f163913
am 1a0aa22d
: Cut down on some unneccesary allocations
...
* commit '1a0aa22dc02fdfc6876ee90926acc447da8fe935':
Cut down on some unneccesary allocations
2013-08-16 14:41:28 -07: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
076c892e80
am 2127d4dd
: Use name "Email" instead of Email2
...
* commit '2127d4dd096408ae3a31278f90b2d90c17a41d97':
Use name "Email" instead of Email2
2013-08-16 10:10:30 -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
a5879b621f
am 62630e8d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '62630e8d6c38d4506385d3efce19f3fc3ec640c9':
Import translations. DO NOT MERGE
2013-08-15 17:54:32 -07:00
Martin Hibdon
4622112c88
am 8708594f
: Use insecure socketFactory if "accept all certificates"
...
* commit '8708594f03068a8c71a6c6e752b52c2fc1a733d8':
Use insecure socketFactory if "accept all certificates"
2013-08-15 17:54:31 -07:00
Baligh Uddin
576914eaeb
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-08-16 00:53:10 +00: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
00c032df03
am 64fa58a0
: Increment Email version.
...
* commit '64fa58a0bce3518759a0355ebeb2466258d2cb7a':
Increment Email version.
2013-08-15 17:44:20 -07:00
Yu Ping Hu
64fa58a0bc
Increment Email version.
...
Change-Id: I40c58ab66a6838e15e9abdd629e05de526597ba6
2013-08-16 00:32:10 +00:00
Baligh Uddin
57a2e2b1b6
Import translations. DO NOT MERGE
...
Change-Id: I01f66240572840879243e0aff167956cd346a4a9
Auto-generated-cl: translation import
2013-08-14 15:47:35 -07:00
Baligh Uddin
444eccf0cc
Import translations. DO NOT MERGE
...
Change-Id: Icdaa563ba4b2ead825c5f670f069e8d2103957b6
Auto-generated-cl: translation import
2013-08-14 15:46:50 -07:00
Tony Mantler
5dcf6e7f15
am 72632593
: android:layout_alignParentTop is not a property in LinearLayout
...
* commit '72632593cde9b012c186a539fe724f10aa60e011':
android:layout_alignParentTop is not a property in LinearLayout
2013-08-14 13:30:35 -07:00
Tony Mantler
72632593cd
android:layout_alignParentTop is not a property in LinearLayout
...
Change-Id: I2c3debd331ee2074ff6432a4f5a680ade8c6ef6d
2013-08-14 13:25:22 -07:00
Yu Ping Hu
de312eb06b
am 859a4ef1
: Merge "Don\'t crash when the policy service is unavailable." into jb-ub-mail-ur10
...
* commit '859a4ef1e9357e196f4b9caa92e4bf36c398d33d':
Don't crash when the policy service is unavailable.
2013-08-14 10:58:15 -07:00
Yu Ping Hu
859a4ef1e9
Merge "Don't crash when the policy service is unavailable." into jb-ub-mail-ur10
2013-08-14 17:56:08 +00:00
Yu Ping Hu
eb190a8d9d
Don't crash when the policy service is unavailable.
...
This isn't a great situation -- it suggests the PolicyService
is having some sort of RemoteException -- but when it happens
we should just treat it the same as if the policy is not
enforced.
Bug: 10315113
Change-Id: If2fbe1648a5c6f3df13cef02c8dc5bc6e858f2d9
2013-08-14 10:46:07 -07:00
Paul Westbrook
7c35c519b2
am 7985b43a
: Add public no-arg Fragment constructors
...
* commit '7985b43ab7310f76c170266da346f993d2f86051':
Add public no-arg Fragment constructors
2013-08-13 21:54:42 -07:00