Commit Graph

4475 Commits

Author SHA1 Message Date
Eric Fischer
4225039afe am 625cf4ca: Import revised translations. DO NOT MERGE
* commit '625cf4cac27b75e61e8f3e82f533d83c83a9b27d':
  Import revised translations.  DO NOT MERGE
2011-02-08 10:44:07 -08:00
Eric Fischer
625cf4cac2 Import revised translations. DO NOT MERGE
Change-Id: I2e6ded83b1111789122a0d9e9dad52df805721b7
2011-02-07 17:22:41 -08:00
Justin Ho
d7e4896339 am 5769309e: Updated Email launcher icon
* commit '5769309e1e3396b5b8100ac455330de1a2c338b6':
  Updated Email launcher icon
2011-02-03 15:41:29 -08:00
Justin Ho
5769309e1e Updated Email launcher icon
Change-Id: I6c2fcda8bd10b4673a2556e7adde0212686b7a9d
2011-02-03 14:55:00 -08:00
Justin Ho
d31aa4e2a9 am e653ed26: Merge "Updating Email checkboxes with framework assets" into honeycomb
* commit 'e653ed2641fd6ef1d8795a31f096abd61f3c7b63':
  Updating Email checkboxes with framework assets
2011-02-02 15:52:42 -08:00
Justin Ho
e653ed2641 Merge "Updating Email checkboxes with framework assets" into honeycomb 2011-02-02 14:41:04 -08:00
Justin Ho
10b5ace91c Updating Email checkboxes with framework assets
Change-Id: I52fb28304d7175372f05d889a388d7fb846807f1
2011-02-02 14:36:46 -08:00
Jean-Baptiste Queru
bbedac04b0 am 05f45f89: am 4895e726: Merge from gingerbread
* commit '05f45f89e367a82ca9bbb07f8f90e2635c9cad16':
2011-02-02 09:56:22 -08:00
Jean-Baptiste Queru
05f45f89e3 am 4895e726: Merge from gingerbread
* commit '4895e726ee66978dc24c618917e86b2930fe9bdf':
2011-02-02 09:53:24 -08:00
Jean-Baptiste Queru
5e1fa60708 am 80312972: (-s ours) am feb9a2c6: Merge from open-source gingerbread - do not merge
* commit '8031297202239c19ee43d34d467af25b90a07479':
  Fix a decoding problem on the Email body
2011-02-02 08:03:33 -08:00
Jean-Baptiste Queru
4895e726ee Merge from gingerbread
Change-Id: I874374c7c0a05f4159e1a77142d95eb62f7eac61
2011-02-02 08:02:02 -08:00
Jean-Baptiste Queru
8031297202 am feb9a2c6: Merge from open-source gingerbread - do not merge
* commit 'feb9a2c6be046cdb328223c5d76e027c07eb1326':
  Fix a decoding problem on the Email body
2011-02-02 07:58:15 -08:00
Jean-Baptiste Queru
feb9a2c6be Merge from open-source gingerbread - do not merge
Change-Id: Ic48053624dcb200a64776de01ba258800ed3a75c
2011-02-02 07:53:48 -08:00
Jean-Baptiste Queru
b4f225021d Merge "Fix a decoding problem on the Email body" into gingerbread 2011-02-02 07:53:09 -08:00
Makoto Onuki
1cedfc8e5c am 6c15d943: Merge "Don\'t mix up loader managers" into honeycomb
* commit '6c15d943c2a5b4bfb4178d85acf0f415cb2fd6af':
  Don't mix up loader managers
2011-02-01 16:04:42 -08:00
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
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
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
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
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
Eric Fischer
ac64eba8a3 Import revised translations. DO NOT MERGE. Bug 3394542
Change-Id: I7638be55b70177bba8d20b3fe394aa6a3144a518
2011-01-31 12:45:53 -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
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
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
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
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
9a09129d09 am 1122e0f6: Merge "Remove cache statistics logging" into honeycomb
* commit '1122e0f64402a33fad7652fe58d42001df5b4aaf':
  Remove cache statistics logging
2011-01-28 16:18:21 -08:00
Marc Blank
1122e0f644 Merge "Remove cache statistics logging" into honeycomb 2011-01-28 16:16:26 -08:00
Eric Fischer
1f5d5c56ad am 3cd8904e: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '3cd8904ea4aa28e5bd62e84b8e299cda74030200':
  Import revised translations.  DO NOT MERGE
2011-01-28 15:13:34 -08:00
Eric Fischer
3cd8904ea4 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:09:41 -08:00
Justin Ho
58462c7152 am 62287005: Merge "Updated Email compose icon" into honeycomb
* commit '6228700578e9c8ed96a1feeaf89dd8478d28512e':
  Updated Email compose icon
2011-01-28 15:05:11 -08:00
Justin Ho
6228700578 Merge "Updated Email compose icon" into honeycomb 2011-01-28 15:02:39 -08:00