33021 Commits

Author SHA1 Message Date
Gilles Debunne
8556efe5a3 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
a29643a645 Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread 2010-10-04 16:42:40 -07:00
Scott Main
196894cdcc 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
c692792ead 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
8c03723da7 DO NOT MERGE. Select word no longer selects spaces between words.
Bug 3000870

This feature was useful to paste between two words. To do this, all you
have to do now in to first position the cursor between the words, and then
long pressing anywhere to get the pop-up menu with paste.

Not merged into HC since the paste story in HC still has to be determined.

Change-Id: Iea8d87e09b7ad43658ec5526110e609b9735c27a
2010-10-04 16:15:56 -07:00
Gilles Debunne
b6b193013d Merge "resolved conflicts for merge of 242fa52b to master" 2010-10-04 16:01:22 -07:00
Patrick Dubroy
3dd101133a resolved conflicts for merge of 242fa52b to master
Change-Id: I6a6c134fe4fb05dbc15249661b441d88534acb1e
2010-10-04 15:49:40 -07:00
Gil Dobjanschi
e799720dd4 Merge "Added audio track playback API" 2010-10-04 15:49:26 -07:00
Scott Main
fc7f39196b 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
6a02ba0100 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
6f4f01062b 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
dcbf315e83 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
b8d3bc5c3c 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
46ffeb2188 docs: update homepage with more countries for market announcement
Change-Id: Icb56ddd57ca23b2773792f171bc65327b2f725bd
2010-10-04 15:45:11 -07:00
Scott Main
b3a5b85a61 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
b99f0c7eae Merge "Resilent media time stamp adjustment" into gingerbread 2010-10-04 15:35:40 -07:00
Gilles Debunne
b621e2030d Merge "Removed icon in Alert dialog header." into gingerbread 2010-10-04 15:34:43 -07:00
Adam Powell
368733b204 Remove overscroll_edge.png from drawable/
This crops up in apps targeting <= cupcake. This asset shouldn't be
there.

Change-Id: Ia8f613b1c2657111f8ff5e20d9571290add03ddb
2010-10-04 15:28:25 -07:00
Adam Powell
103f59baa7 Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 2010-10-04 15:24:29 -07:00
Kenny Root
259ec46e8e 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
Chet Haase
5e25c2c145 Add ability to automate animated transitions on View show/hide
Change-Id: Id6ff92c8fd06c3f5fb30c41b020b4de4f567154f
2010-10-04 15:11:36 -07:00
James Dong
acee8e7131 Resilent media time stamp adjustment
Change-Id: I13ab87c05f26bb11a3cc9bf8559f98e6ea0752db
2010-10-04 15:11:19 -07:00
Adam Powell
62a744e17d Fix bug 3052686 - ScrollView padding treated incorrectly
Also allow grabbing scrollviews for dragging outside of content
bounds, which makes a difference for overscroll effects.

Change-Id: I344db4490ad59f393bb6de338009e251a76e6282
2010-10-04 15:06:30 -07:00
Gilles Debunne
6fee4406b0 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
89230e3b7b 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
58520b24d4 resolved conflicts for merge of 10d5b096 to master
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
2010-10-04 14:54:59 -07:00
Dianne Hackborn
458fc5f52e Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 2010-10-04 14:52:12 -07:00
Gilles Debunne
8390651c12 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
77e4237682 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
33a4c77218 Merge "New green in assets for battery, download, upload" into gingerbread 2010-10-04 14:43:16 -07:00
Gilles Debunne
a819fc194e New green in assets for battery, download, upload
Change-Id: Iea08cddee109273fd070a7c9dae7ccb9d22d0e05
2010-10-04 14:41:56 -07:00
Joe Onorato
87efbbb563 Merge "implement the number bubbles on the status bar" into gingerbread 2010-10-04 14:41:38 -07:00
Joe Onorato
6c01a11a20 implement the number bubbles on the status bar
Bug: 2993482
Change-Id: I73b1f8c39e995fd4f986c25ea04127eb23c3cd07
2010-10-04 17:40:24 -04:00
Scott Main
7008b7c1c4 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
ae1864c0e7 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
5e9f64ce24 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
a143e83e1e 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
242fa52bb6 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
e14e8e31fa Merge "Snap the clip rectangle to pixel boundaries." 2010-10-04 14:21:10 -07:00
Patrick Dubroy
eb15ac40ab Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 2010-10-04 14:20:39 -07:00
Romain Guy
3b3e457c27 Snap the clip rectangle to pixel boundaries.
Change-Id: Iac2765303552f385995fe46e219af456e0501da7
2010-10-04 14:18:24 -07:00
Gilles Debunne
08ed700fa8 Merge "resolved conflicts for merge of 115b9dc3 to master" 2010-10-04 14:17:51 -07:00
Romain Guy
a1cf4a78d1 Merge "Apply bilinear filtering on text only when necessary." 2010-10-04 14:16:24 -07:00
Patrick Dubroy
276e7498bb Fix 2-pixel offset unlock jog tab 2010-10-04 14:16:22 -07:00
Gilles Debunne
9339fa7fa1 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
Romain Guy
e8cb9c1430 Apply bilinear filtering on text only when necessary.
Change-Id: Ic903f4b5d30e9c92528c6291941896efe4729ee3
2010-10-04 14:14:11 -07:00
Scott Main
6ef33cb3b8 docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Change-Id: Ic46ba89cfd0566fea792f65dfa130bef7010b164
2010-10-04 14:13:54 -07:00
Gilles Debunne
be86b8a4c9 Updated quick contact assets.
Change-Id: I1ab617a1deeeacbc49acd09f883fbf2aeaa904a3
2010-10-04 14:11:11 -07:00
Dianne Hackborn
10d5b0966d 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
152c7c4091 resolved conflicts for merge of 115b9dc3 to master
Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339
2010-10-04 14:02:50 -07:00