Commit Graph

4673 Commits

Author SHA1 Message Date
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
Marc Blank
1122e0f644 Merge "Remove cache statistics logging" into honeycomb 2011-01-28 16:16:26 -08:00
Eric Fischer
5f1eb4b16c am 1f5d5c56: (-s ours) am 3cd8904e: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '1f5d5c56add39d224ac47c538ccc34ae2f2caaa6':
  Import revised translations.  DO NOT MERGE
2011-01-28 15:18:23 -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
22ac818927 am 58462c71: am 62287005: Merge "Updated Email compose icon" into honeycomb
* commit '58462c7152bfd0445268149ca524feb0329b03f4':
  Updated Email compose icon
2011-01-28 15:07:42 -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
Eric Fischer
a548d870eb Import revised translations. DO NOT MERGE
Change-Id: I43f8796a1f260d5c30a5fff30de2cf302ec366b0
2011-01-28 14:57:05 -08:00
Marc Blank
f40294e1aa Remove cache statistics logging
* Use static final flag to control this
* Set flag to false for all commits

Bug: 3403725
Change-Id: I70c89aaf2f0b226206e505a14e9a8f1ed2ebb51a
2011-01-28 14:54:52 -08:00
Justin Ho
1490295ad6 Updated Email compose icon
Bug: 3362749
Change-Id: I688b43c4b9d71dd976f0484384b2481477273798
2011-01-28 14:48:40 -08:00
Makoto Onuki
943e02c97d Merge "Add debug setting for one-minute refresh" 2011-01-28 14:30:55 -08:00
Makoto Onuki
5907d39d2b Add debug setting for one-minute refresh
Bug 3377054

Change-Id: I7843fe82d66ab7896b8293b2fa16ca73f6711595
2011-01-28 14:16:56 -08:00
Makoto Onuki
f5144e0a4a Merge "remove-exchange-support.sh supports MacOS" 2011-01-28 13:44:49 -08:00
Makoto Onuki
a8caa2f6d7 remove-exchange-support.sh supports MacOS
The problem was that you can't omit the parameter for -i (the extension for
backup files) with Mac's sed.

Change-Id: I8cc5404d5d99526c160082c357fc38629e08d7d2
2011-01-28 13:39:39 -08:00
Marc Blank
d07a2312b7 Merge "Make ContentCache LRU, rather than LRI" 2011-01-28 12:56:46 -08:00
Marc Blank
50c7d755a7 Make ContentCache LRU, rather than LRI
Bug: 3403111
Change-Id: I12993a8185db1bebe760f8bd1a8d22683bcdddc3
2011-01-28 12:37:09 -08:00
Andy Stadler
3592da67cd am 57fa4995: am c8f1c814: Merge "Prevent NPE in account deletion race condition" into honeycomb
* commit '57fa4995c27ef9b186b61866b6a1c65f162a93e0':
  Prevent NPE in account deletion race condition
2011-01-28 11:38:36 -08:00
Dmitri Plotnikov
188ad2d5ba am 188a07a0: am fc902559: Merge "Transferring display name logic to GAL provider" into honeycomb
* commit '188a07a0335a81087729b99a1234d0ccd9e3031a':
  Transferring display name logic to GAL provider
2011-01-28 11:38:34 -08:00
Andy Stadler
57fa4995c2 am c8f1c814: Merge "Prevent NPE in account deletion race condition" into honeycomb
* commit 'c8f1c814cd7dbdb7ed3dffe0ec8a096713ee4d08':
  Prevent NPE in account deletion race condition
2011-01-28 11:36:08 -08:00
Dmitri Plotnikov
188a07a033 am fc902559: Merge "Transferring display name logic to GAL provider" into honeycomb
* commit 'fc902559c491542449c6e3f31c41562e6861bd2b':
  Transferring display name logic to GAL provider
2011-01-28 11:36:05 -08:00
Andy Stadler
c8f1c814cd Merge "Prevent NPE in account deletion race condition" into honeycomb 2011-01-28 11:33:34 -08:00
Makoto Onuki
9c44430690 Fix AttachmentDownloadService for remove-exchange script
Now the source at least compiles fine.

Change-Id: I329ad08f81fd6ab23f28dd30023fe3e781ccc4fc
2011-01-28 11:22:51 -08:00
Andy Stadler
bbf03cc1e2 am ecffd551: (-s ours) DO NOT MERGE Remove all password trim() calls
* commit 'ecffd551cc2a9dc6813effbfc9d21f2b3825a5b5':
  DO NOT MERGE Remove all password trim() calls
2011-01-27 19:50:11 -08:00
Andy Stadler
04c4ae864f Prevent NPE in account deletion race condition
Bug: 3399372
Change-Id: Ic41fb1292f8cc2e5ceb120e7233229dc4e47f1eb
2011-01-27 16:20:51 -08:00
Todd Kennedy
eb73f28d1a 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: I21acd04584a122c19219f3abb6690bb231bad3a6
2011-01-27 11:52:33 -08:00
Dmitri Plotnikov
fc902559c4 Merge "Transferring display name logic to GAL provider" into honeycomb 2011-01-27 10:47:10 -08:00
Dmitri Plotnikov
1a8feddd22 Transferring display name logic to GAL provider
Bug: 3396886
Change-Id: Ice4da9fd4189387a31d3a5d44ec4dc49bff938da
2011-01-27 10:24:03 -08:00
Marc Blank
fe9db17831 Show smart forward attachments in MessageCompose
Bug: 3367188
Change-Id: I59dae9781be59eebe3a68769138e8253a24455e6
2011-01-27 10:13:25 -08:00
Andy Stadler
50a0a2dedd am f1f605d3: am 09aae75f: Fix account list after deleting accounts
* commit 'f1f605d3168eb53aea0a0b840f4493a5f8f91766':
  Fix account list after deleting accounts
2011-01-27 09:31:21 -08:00
Andy Stadler
f1f605d316 am 09aae75f: Fix account list after deleting accounts
* commit '09aae75f4e37c3197c6f8d3f046b15c71534d1f0':
  Fix account list after deleting accounts
2011-01-27 09:29:22 -08:00
Andy Stadler
09aae75f4e Fix account list after deleting accounts
* After deleting an account, we need to actually update
  the list of known accounts - it's not sufficient to simply
  rebuild the headers with one account marked deleted.
* Also remove a couple of obsolete TODO's

Bug: 3382965
Change-Id: I1aa6d88f869f0192b564b538817381efdc5fffe0
2011-01-27 00:02:44 -08:00
Andy Stadler
8ab60f362a am b89d6179: am 999199d4: Merge "Remove STOPSHIPs and a bit of debug logging" into honeycomb
* commit 'b89d6179a2e682f6fc51da8bcbe06c82492a4c05':
  Remove STOPSHIPs and a bit of debug logging
2011-01-26 23:03:03 -08:00
Andy Stadler
b89d6179a2 am 999199d4: Merge "Remove STOPSHIPs and a bit of debug logging" into honeycomb
* commit '999199d49a23b4d88efb8619c3538fede6149e23':
  Remove STOPSHIPs and a bit of debug logging
2011-01-26 23:00:59 -08:00
Andy Stadler
97691069df am d414f151: am 1fc9b6b5: Merge "Add "tap to configure" text to widget" into honeycomb
* commit 'd414f151395fb895f939019495751f719ec222b0':
  Add "tap to configure" text to widget
2011-01-26 23:00:57 -08:00