Commit Graph

22282 Commits

Author SHA1 Message Date
Gil Dobjanschi
03ce5e9a82 Merge "Save AudioTrack to XML" 2010-10-04 17:52:43 -07:00
Romain Guy
5a9be87d7d Merge "Remove logs to reduce logcat spam." 2010-10-04 17:24:21 -07:00
Chet Haase
d6fae037b8 Merge "Changed LayoutTransition to disable animations when set to null" 2010-10-04 17:16:03 -07:00
Romain Guy
fea26a72f1 Merge "Reorder logs." 2010-10-04 17:15:15 -07:00
Kenny Root
2a877ed73a am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit 'f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp

* commit 'f84a5918f5e0572c0280fa705970ef7459b45393':
  Use pread() in ZipFileRO for Linux
2010-10-04 17:12:10 -07:00
Kenny Root
085996210c Merge "Use pread() in ZipFileRO for Linux" into gingerbread 2010-10-04 17:08:26 -07:00
Gilles Debunne
64e8d24969 am c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp

* commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5':
  Restored ic_dialog_menu_generic asset.
2010-10-04 17:03:25 -07:00
Gilles Debunne
6ce2e6e4bc am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp

* commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee':
  DO NOT MERGE. Select word no longer selects spaces between words.
2010-10-04 16:45:32 -07:00
Gilles Debunne
250b2c9c16 Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread 2010-10-04 16:42:40 -07:00
Scott Main
39aac03b9b am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement
Merge commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88' into gingerbread-plus-aosp

* commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88':
  docs: update homepage with more countries for market announcement
2010-10-04 16:35:18 -07:00
Scott Main
37c5dc049c am 46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread

* commit '46ffeb218859a543540a70b3229a48d2d96cbb4a':
  docs: update homepage with more countries for market announcement
2010-10-04 16:31:47 -07:00
Gilles Debunne
ff5e2fddb3 Merge "resolved conflicts for merge of 242fa52b to master" 2010-10-04 16:01:22 -07:00
Gil Dobjanschi
5110891a53 Merge "Added audio track playback API" 2010-10-04 15:49:26 -07:00
Scott Main
0f77061f38 am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp

* commit 'b3a5b85a612703e54e631ffab5bb518eba909899':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 15:49:07 -07:00
James Dong
90c9df0582 am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp

* commit 'b99f0c7eae365f788a21944fef28de580c7f5f92':
  Resilent media time stamp adjustment
2010-10-04 15:48:59 -07:00
Gilles Debunne
efb078ff61 am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
Merge commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp

* commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b':
  Removed icon in Alert dialog header.
2010-10-04 15:48:54 -07:00
Adam Powell
aec6b516c5 am 368733b2: Remove overscroll_edge.png from drawable/
Merge commit '368733b204805cfa716897b09153350a70dca3f3' into gingerbread-plus-aosp

* commit '368733b204805cfa716897b09153350a70dca3f3':
  Remove overscroll_edge.png from drawable/
2010-10-04 15:48:50 -07:00
Adam Powell
e5ada36d2b am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp

* commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9':
  Fix bug 3052686 - ScrollView padding treated incorrectly
2010-10-04 15:48:37 -07:00
Scott Main
72f5d5b949 am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread

* commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 15:39:24 -07:00
James Dong
4576b09a11 Merge "Resilent media time stamp adjustment" into gingerbread 2010-10-04 15:35:40 -07:00
Gilles Debunne
721a4020a7 Merge "Removed icon in Alert dialog header." into gingerbread 2010-10-04 15:34:43 -07:00
Adam Powell
27a0b636ac Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 2010-10-04 15:24:29 -07:00
Kenny Root
61ef747e0e Use pread() in ZipFileRO for Linux
AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.

The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.

Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
2010-10-04 15:17:19 -07:00
Gilles Debunne
ad54820fff am 9339fa7f: am be86b8a4: Updated quick contact assets.
Merge commit '9339fa7fa13b8c8847dac4624598112d03555330'

* commit '9339fa7fa13b8c8847dac4624598112d03555330':
  Updated quick contact assets.
2010-10-04 15:00:58 -07:00
Dianne Hackborn
b628861f8a am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '458fc5f52e25d7a8b4e482010711aed66f0b4999' into gingerbread-plus-aosp

* commit '458fc5f52e25d7a8b4e482010711aed66f0b4999':
  Fix issue #3041660: Camera image flips upside down when rotating device
2010-10-04 14:55:09 -07:00
Dianne Hackborn
58df7a6415 resolved conflicts for merge of 10d5b096 to master
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
2010-10-04 14:54:59 -07:00
Dianne Hackborn
859d08676e Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 2010-10-04 14:52:12 -07:00
Gilles Debunne
b9a9ee37f3 am 33a4c772: Merge "New green in assets for battery, download, upload" into gingerbread
Merge commit '33a4c77218e4513268be8d5ce2af6f746976706b' into gingerbread-plus-aosp

* commit '33a4c77218e4513268be8d5ce2af6f746976706b':
  New green in assets for battery, download, upload
2010-10-04 14:47:12 -07:00
Joe Onorato
f776da9ac4 am 87efbbb5: Merge "implement the number bubbles on the status bar" into gingerbread
Merge commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df' into gingerbread-plus-aosp

* commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df':
  implement the number bubbles on the status bar
2010-10-04 14:44:40 -07:00
Gilles Debunne
68a6951696 Merge "New green in assets for battery, download, upload" into gingerbread 2010-10-04 14:43:16 -07:00
Joe Onorato
87304310b0 Merge "implement the number bubbles on the status bar" into gingerbread 2010-10-04 14:41:38 -07:00
Scott Main
91884dd7c5 am ae1864c0: am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
Merge commit 'ae1864c0e79baae75ad25f20828349be8635d471' into gingerbread-plus-aosp

* commit 'ae1864c0e79baae75ad25f20828349be8635d471':
  docs: consistency fixit for the quickview boxes in the dev guide
2010-10-04 14:37:11 -07:00
Scott Main
200c4ffccf am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
Merge commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread

* commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1':
  docs: consistency fixit for the quickview boxes in the dev guide
2010-10-04 14:32:26 -07:00
Brad Fitzpatrick
ef13ad2312 am b12bfbd4: am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread
Merge commit 'b12bfbd4df985041ab0e584ef5a746328baac038'

* commit 'b12bfbd4df985041ab0e584ef5a746328baac038':
  Document Bitmap.createScaledBitmap
2010-10-04 14:28:35 -07:00
Adam Powell
06606dc513 am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread
Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'

* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
  Fix bug 3058324
2010-10-04 14:28:08 -07:00
Patrick Dubroy
8d5fccec29 am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
Merge commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c' into gingerbread-plus-aosp

* commit 'eb15ac40ab2da2f599f2380bc7a8b00e7132a64c':
  Fix 2-pixel offset unlock jog tab
2010-10-04 14:25:42 -07:00
Romain Guy
d70f4e70c4 Merge "Snap the clip rectangle to pixel boundaries." 2010-10-04 14:21:10 -07:00
Patrick Dubroy
68ef68f874 Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 2010-10-04 14:20:39 -07:00
Gilles Debunne
0f97561712 Merge "resolved conflicts for merge of 115b9dc3 to master" 2010-10-04 14:17:51 -07:00
Romain Guy
041976e9b9 Merge "Apply bilinear filtering on text only when necessary." 2010-10-04 14:16:24 -07:00
Gilles Debunne
6cea08c619 am be86b8a4: Updated quick contact assets.
Merge commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b' into gingerbread-plus-aosp

* commit 'be86b8a4c94905e547f8ecdcd220bbe7bb249d2b':
  Updated quick contact assets.
2010-10-04 14:15:15 -07:00
Dianne Hackborn
bd00691535 am 407f625a: Add new API to find out whether external storage is removable.
Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp

* commit '407f625a9b8e356e765a5ec587c443af1f3aadb5':
  Add new API to find out whether external storage is removable.
2010-10-04 14:03:06 -07:00
Gilles Debunne
4251f75f07 resolved conflicts for merge of 115b9dc3 to master
Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339
2010-10-04 14:02:50 -07:00
Romain Guy
86707b9a5f Merge "Apply all Canvas transformations to ColorDrawable." 2010-10-04 13:48:12 -07:00
Raphael
2cbb59e22c Merge "layoutlib_create: Generate delegate to implement native methods." 2010-10-04 12:46:37 -07:00
Joe Onorato
51cfe21e8f Merge "work around race condition which causes us to try to load the phone status bar on the tablet." 2010-10-04 12:28:45 -07:00
Brad Fitzpatrick
96a3d2e643 am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread
Merge commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802' into gingerbread-plus-aosp

* commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802':
  Document Bitmap.createScaledBitmap
2010-10-04 12:23:58 -07:00
Brad Fitzpatrick
f67f0acc67 Merge "Document Bitmap.createScaledBitmap" into gingerbread 2010-10-04 12:21:14 -07:00
Adam Powell
23c08a158c am d29e6861: Merge "Fix bug 3058324" into gingerbread
Merge commit 'd29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp

* commit 'd29e6861717a4e762050eb5a30169729e205d651':
  Fix bug 3058324
2010-10-04 12:18:44 -07:00
Adam Powell
550801abe4 Merge "Fix bug 3058324" into gingerbread 2010-10-04 12:15:34 -07:00