Makoto Onuki
6c15d943c2
Merge "Don't mix up loader managers" into honeycomb
2011-02-01 16:03:26 -08:00
Makoto Onuki
d4df1cf65a
Don't mix up loader managers
...
- Don't use activity's LoaderManager in fragments. Fragments have their own
loader managers, and using the wrong one causes loaders won't get reset()
when the owner fragment gets destroyed().
- Don't destroy loaders by ourselves.
The combination of these two issues caused the problem where the loader
callbacks wouldn't get the reset event, which resulted in the adapter
holding a closed cursor.
Bug 3412079
Change-Id: Ib7441565ea69adb08eb74845b0996c7b8ae6f53b
2011-02-01 15:45:52 -08:00
Sang-Jun Park
499fc762ee
Fix a decoding problem on the Email body
...
When decoding the Email body, email application used google default base64
function. But it caused problem, so particular email did not sync any more.
So we have changed decoding function as a decoder from apache in order
not to occur problem
Change-Id: I7581123f21fbb4015153ca6f4a0c14c0f6a769fc
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
2011-02-02 08:16:13 +09:00
Marc Blank
d26c138cb2
am 4c0ae95f
: am 73ba7150
: Merge "Delete calendar properly on commanded wipe" into honeycomb
...
* commit '4c0ae95fbea959f15aef958814311f1f063134d2':
Delete calendar properly on commanded wipe
2011-02-01 13:26:18 -08:00
Marc Blank
4c0ae95fbe
am 73ba7150
: Merge "Delete calendar properly on commanded wipe" into honeycomb
...
* commit '73ba71506a542ac6fd6463f2cf1efea1569bbcc4':
Delete calendar properly on commanded wipe
2011-02-01 06:52:28 -08:00
Marc Blank
73ba71506a
Merge "Delete calendar properly on commanded wipe" into honeycomb
2011-02-01 06:50:08 -08:00
Marc Blank
81d68b842e
Delete calendar properly on commanded wipe
...
* CalendarProvider2 has unusual semantics for its delete operation on
Calendars; this caused the user's calendar NOT to be deleted when
the server commanded a wipe of calendar data. The result was
duplication of events after the subsequent resync
Bug: 3361000
Change-Id: I672034a7a444eb7ebdea60cd6dc66a31087cc6f7
2011-01-31 21:07:18 -08:00
Eric Fischer
9e20e61350
am 3d462540
: (-s ours) am 0d676a12
: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
...
* commit '3d462540c34dc5e1afe904ade91530caa73bdbc9':
Import revised translations. DO NOT MERGE. Bug 3394542
2011-01-31 18:38:34 -08:00
Justin Ho
ab5498ccc3
am 96535ff3
: am 6f6524ff
: Merge "Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749" into honeycomb
...
* commit '96535ff3e533226b48b88bf9914fa5cdf9de648a':
Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749
2011-01-31 18:38:29 -08:00
Eric Fischer
3d462540c3
am 0d676a12
: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
...
* commit '0d676a12589c9c6a822d5b802dfc0ff711bb4280':
Import revised translations. DO NOT MERGE. Bug 3394542
2011-01-31 18:33:10 -08:00
Justin Ho
96535ff3e5
am 6f6524ff
: Merge "Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749" into honeycomb
...
* commit '6f6524ff284de9f1059ee883f2cf1b06866d361e':
Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749
2011-01-31 18:31:51 -08:00
Todd Kennedy
f1b510462f
Fix ConcurrentAccessException in unit tests
...
The ContentCache is now an LRU cache. This means we must NOT access the cache
while using any iterator over the cache. In this case, we were calling get()
using an iterator of cache keys.
Change-Id: I2d1feabff7474b6f2a230b98f97df067ab7ccd9c
2011-01-31 17:39:44 -08:00
Eric Fischer
0d676a1258
Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
2011-01-31 17:28:00 -08:00
Justin Ho
6f6524ff28
Merge "Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749" into honeycomb
2011-01-31 17:03:42 -08:00
Justin Ho
389a03bf1e
Changing Add Account icon to another asset
...
Bug: 3405709
Bug: 3362749
Change-Id: I84773b05c105fdcbc6d925a2ddec2b9a2bf89c6a
2011-01-31 16:57:47 -08:00
Makoto Onuki
978e75ee90
Merge "Message details: Show only one address per line"
2011-01-31 16:15:08 -08:00
Makoto Onuki
7fdaaf72c4
Merge "Revive "Send all messages" label."
2011-01-31 16:13:49 -08:00
Makoto Onuki
812c43295c
Merge "Unit test for change Ieec04881 (make sure CC is visible)"
2011-01-31 16:13:37 -08:00
Makoto Onuki
f33420e68f
Message details: Show only one address per line
...
Also removed unused field from MessageViewMessageDetailsDialog
Bug 3372971
Change-Id: I8a6d87d006793c0099b380634217624bf9002ead
2011-01-31 16:12:53 -08:00
Makoto Onuki
e73bae12ed
Revive "Send all messages" label.
...
Bug 3409375
Change-Id: I2368e6679cba496c58b31a4613fef6291d106de9
2011-01-31 16:02:49 -08:00
Andy Stadler
2d6241e123
am 11070a53
: am 275b89d9
: am 927dbc7c
: Don\'t send IMAP ID unless server supports it
...
* commit '11070a53970116a8216b8d83694041fe09560b91':
Don't send IMAP ID unless server supports it
2011-01-31 15:46:36 -08:00
Makoto Onuki
7c1fa2c161
Unit test for change Ieec04881 (make sure CC is visible)
...
Change-Id: Ic6ffbddf80dcbfe39e55d9b579316767a0ff1180
2011-01-31 15:42:58 -08:00
Andy Stadler
11070a5397
am 275b89d9
: am 927dbc7c
: Don\'t send IMAP ID unless server supports it
...
* commit '275b89d96949de6544c7bca999e241f659cf18b3':
Don't send IMAP ID unless server supports it
2011-01-31 15:20:01 -08:00
Andy Stadler
275b89d969
am 927dbc7c
: Don\'t send IMAP ID unless server supports it
...
* commit '927dbc7c20072939fd0ebdf4cc89301a41d075c2':
Don't send IMAP ID unless server supports it
2011-01-31 15:16:30 -08:00
Andy Stadler
927dbc7c20
Don't send IMAP ID unless server supports it
...
Only send IMAP ID to servers that include ID in the CAPABILITY response.
Always sending IMAP ID was found to cause problems with some servers.
Better compliance with RFC 2971.
Thanks to Samsung for debugging & reporting this.
Change-Id: I495f80949f9f811470853a1f2f8e506d8236d8cf
2011-01-31 15:10:49 -08:00
Makoto Onuki
295297581c
Supress log from RefreshManager
...
Bug 3404747
Change-Id: I3c0d4d513c7ebb640630a21b626c1515520c0bed
2011-01-31 15:05:27 -08:00
Eric Fischer
ac64eba8a3
Import revised translations. DO NOT MERGE. Bug 3394542
...
Change-Id: I7638be55b70177bba8d20b3fe394aa6a3144a518
2011-01-31 12:45:53 -08:00
Todd Kennedy
73eae49238
am f30faf24
: (-s ours) am db0a6017
: DO NOT MERGE Ensure foreground colour is set during drag
...
* commit 'f30faf2462874125f096d90e8a02cfd1470bc52f':
DO NOT MERGE Ensure foreground colour is set during drag
2011-01-31 11:14:21 -08:00
Todd Kennedy
f30faf2462
am db0a6017
: DO NOT MERGE Ensure foreground colour is set during drag
...
* commit 'db0a601714a311ccbf7b6e780b80d8e5318df848':
DO NOT MERGE Ensure foreground colour is set during drag
2011-01-31 11:11:25 -08:00
Todd Kennedy
951f194918
am 1c2a4e17
: (-s ours) am 046ca9e8
: DO NOT MERGE Remove border from the email widget
...
* commit '1c2a4e170bd47ad418812605605053c2e15476ef':
DO NOT MERGE Remove border from the email widget
2011-01-31 10:55:00 -08:00
Todd Kennedy
db0a601714
DO NOT MERGE Ensure foreground colour is set during drag
...
At any time, it's possible for the framework to recycle views. Normally it's
not an issue, however, during drag-n-drop a view with "unavailable drop
target" foreground colour may be reused. We need to ensure that the foreground
color is always set.
bug 3398330
Change-Id: I7be9bf8487e0062cf2335476fd971592f33baa09
2011-01-31 10:53:33 -08:00
Todd Kennedy
1c2a4e170b
am 046ca9e8
: DO NOT MERGE Remove border from the email widget
...
* commit '046ca9e803eff50a743cfb3e330f14e49060a3f4':
DO NOT MERGE Remove border from the email widget
2011-01-31 10:52:52 -08:00
Todd Kennedy
046ca9e803
DO NOT MERGE Remove border from the email widget
...
bug 3402206
Change-Id: Ie56e8606e49486320457a2a8c8c06242c99d98d8
2011-01-31 10:37:12 -08:00
Todd Kennedy
9262f20f5d
Remove border from the email widget
...
bug 3402206
Change-Id: I2d1e04cee69459f5afe6df530925e137c1163f63
2011-01-31 10:11:03 -08:00
Paul Eastham
5c7ffc91a5
am c34e4eec
: am 04d3f014
: Merge "Remove STOPSHIP" into honeycomb
...
* commit 'c34e4eecf1450b20e804297741507d1edc044d0f':
Remove STOPSHIP
2011-01-30 22:22:28 -08:00
Paul Eastham
c34e4eecf1
am 04d3f014
: Merge "Remove STOPSHIP" into honeycomb
...
* commit '04d3f0144783641dcb4e4c2703663d166b7f88a9':
Remove STOPSHIP
2011-01-30 22:19:38 -08:00
Paul Eastham
04d3f01447
Merge "Remove STOPSHIP" into honeycomb
2011-01-30 22:16:55 -08:00
Justin Ho
c22d2a2828
am 92c41d58
: am a5ba0daa
: Merge "New Email launcher icon, deprecating old asset Bug: 3362749" into honeycomb
...
* commit '92c41d587a840672722ac693e79d8c52e6f4497c':
New Email launcher icon, deprecating old asset Bug: 3362749
2011-01-30 17:33:21 -08:00
Justin Ho
92c41d587a
am a5ba0daa
: Merge "New Email launcher icon, deprecating old asset Bug: 3362749" into honeycomb
...
* commit 'a5ba0daac392ecfab9db6ae5c96d1a2c1a267b32':
New Email launcher icon, deprecating old asset Bug: 3362749
2011-01-30 17:29:32 -08:00
Andy Stadler
5f10938fd4
Remove STOPSHIP
...
Bug: 3396875
Change-Id: I0d57922def86dc48abb2a8a47c9358115dddb9fd
2011-01-30 17:17:42 -08:00
Justin Ho
a5ba0daac3
Merge "New Email launcher icon, deprecating old asset Bug: 3362749" into honeycomb
2011-01-30 17:12:13 -08:00
The Android Open Source Project
cc22f164e0
am c4650d17
: Reconcile gingerbread-plus-aosp and honeycomb
...
* commit 'c4650d17fa8c01a60988b3dcba7c2f35c44dcaca':
2011-01-30 12:54:23 -08:00
Andy Stadler
34512ba630
am 809cd769
: am 0e3a0331
: Widget: Max out message count at 999+
...
* commit '809cd769390aa503ad90e5b8bce1594f92a2479f':
Widget: Max out message count at 999+
2011-01-30 12:53:16 -08:00
The Android Open Source Project
c4650d17fa
Reconcile gingerbread-plus-aosp and honeycomb
...
Change-Id: Ic6875e46dff692ebe8490ec746b73cc2666de422
2011-01-30 12:41:42 -08:00
The Android Open Source Project
46cc9c8322
Mass merge from gingerbread - do not merge
...
Change-Id: I3024f896a04ff0748d1fb5a6172d54ccfe7dd330
2011-01-30 12:41:41 -08:00
Andy Stadler
809cd76939
am 0e3a0331
: Widget: Max out message count at 999+
...
* commit '0e3a03317b1aebd168fb1bf41b3656e7dc6a1c89':
Widget: Max out message count at 999+
2011-01-30 12:10:12 -08:00
Andy Stadler
0e3a03317b
Widget: Max out message count at 999+
...
Bug 3403158
Change-Id: I1daf0c62684bad83a69e19c39ffe1b8df899d077
2011-01-30 11:45:33 -08:00
Justin Ho
b5b8e568e2
New Email launcher icon, deprecating old asset
...
Bug: 3362749
Change-Id: Idb876f38588a9c5d2b4b3c04dbf4dbca082c1618
2011-01-29 14:20:01 -08:00
Marc Blank
a86265e8e5
am 9a09129d
: am 1122e0f6
: Merge "Remove cache statistics logging" into honeycomb
...
* commit '9a09129d0928712ad84a11027812ff0a63afed4a':
Remove cache statistics logging
2011-01-28 16:22:14 -08:00
Marc Blank
9a09129d09
am 1122e0f6
: Merge "Remove cache statistics logging" into honeycomb
...
* commit '1122e0f64402a33fad7652fe58d42001df5b4aaf':
Remove cache statistics logging
2011-01-28 16:18:21 -08:00