Dianne Hackborn
e1aa82a422
Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
2010-09-03 15:07:17 -07:00
Eric Fischer
3a94b7c121
Preserve old translations for changed strings. DO NOT MERGE
...
Change-Id: I64023ad34cba22133fd355ed4d885b3f831c5aa1
2010-09-03 14:55:45 -07:00
Andreas Huber
1ab9d1289b
am 8e11c822: am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.
...
Merge commit '8e11c82247151085fa165c76bfbc157bc6091ca4'
* commit '8e11c82247151085fa165c76bfbc157bc6091ca4':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
2010-09-03 14:54:28 -07:00
Andreas Huber
8e11c82247
am 9fee0b2a: Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer\'s setLooping setting.
...
Merge commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba' into gingerbread-plus-aosp
* commit '9fee0b2a02daa6fcf286ed930e45400dd3ba8dba':
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
2010-09-03 14:50:18 -07:00
Jamie Gennis
a093659dd0
Merge "Add the new Stagefright ANativeWindow OMX codec API."
2010-09-03 14:42:06 -07:00
Dan Morrill
6993d3d136
Adding a feature denoting support for 5 or more fully
...
independent multitouch pointers.
Change-Id: I9997ed9c481dbd507e9eff70d8beb9e1140cca3f
2010-09-03 14:41:36 -07:00
Jamie Gennis
33a78149e0
Add the new Stagefright ANativeWindow OMX codec API.
...
This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.
This is try 2 for this change, after reverting the first one because it broke
the build.
Change-Id: I94249b72bdb5d5719360f03d7935fcca4ece5028
2010-09-03 14:32:42 -07:00
Andreas Huber
9fee0b2a02
Ogg files can be tagged to be automatically looping, this setting always overrides the MediaPlayer's setLooping setting.
...
Change-Id: Ifb564c6cdf6137eac14869f9ca7d471f05a5556a
related-to-bug: 2974691
2010-09-03 14:31:50 -07:00
John Wang
9096a427ce
am 419126a6: am dc243482: Merge "Add API to get all foreground calls." into gingerbread
...
Merge commit '419126a6969be5384742b2fbf5f8507d0513c8db'
* commit '419126a6969be5384742b2fbf5f8507d0513c8db':
Add API to get all foreground calls.
2010-09-03 14:17:20 -07:00
Adam Powell
2856ccfbf2
am f9a1ff41: (-s ours) am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
...
Merge commit 'f9a1ff4173fd366fb263f0d3cae71014404c4612'
* commit 'f9a1ff4173fd366fb263f0d3cae71014404c4612':
Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
2010-09-03 14:17:16 -07:00
Andreas Huber
00c88eac9a
am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
...
Merge commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc'
* commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
2010-09-03 14:13:19 -07:00
John Wang
419126a696
am dc243482: Merge "Add API to get all foreground calls." into gingerbread
...
Merge commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp
* commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
Add API to get all foreground calls.
2010-09-03 14:08:32 -07:00
Dianne Hackborn
004abb1223
resolved conflicts for merge of 3d7d3690 to master
...
Change-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf
2010-09-03 14:07:25 -07:00
John Wang
dc243482d6
Merge "Add API to get all foreground calls." into gingerbread
2010-09-03 14:06:20 -07:00
Adam Powell
f9a1ff4173
am e7c02ef4: Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
...
Merge commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f' into gingerbread-plus-aosp
* commit 'e7c02ef40a10c599b13684a6f99a91eabd0f258f':
Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
2010-09-03 14:00:41 -07:00
Adam Powell
e7c02ef40a
Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
2010-09-03 13:58:37 -07:00
Andreas Huber
af7a7c34e0
am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
...
Merge commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5' into gingerbread-plus-aosp
* commit 'cc4a38c60f52082f3c1970c7eda6756949c6e5d5':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
2010-09-03 13:48:43 -07:00
Andreas Huber
cc4a38c60f
Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
2010-09-03 13:46:02 -07:00
Andreas Huber
87ab9cdd0f
Properly buffer a certain amount of data on streaming sources before finishing prepare().
...
Change-Id: I39bf3c6dafcbe003b51dea4795742dcd8548f207
related-to-bug: 2875110
2010-09-03 13:44:42 -07:00
Scott Main
8ae409f501
am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error
...
Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'
* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
fix code snippet error
2010-09-03 13:28:18 -07:00
Brad Fitzpatrick
4f3c5589c8
am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
...
Merge commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28'
* commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28':
More SharedPreferences commit() -> apply() changes.
2010-09-03 13:27:51 -07:00
Dianne Hackborn
3d7d3690de
am e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
...
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp
* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
These are not ready to be exposed. Also rename them to be better.
2010-09-03 13:26:30 -07:00
Jeff Hamilton
5410a60261
Merge "Hide this log behind the debug flag."
2010-09-03 13:26:23 -07:00
Dianne Hackborn
e25b4bc76f
Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
2010-09-03 13:24:33 -07:00
Scott Main
bfbf84b726
am 2b136832: am c4367e54: fix code snippet error
...
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp
* commit '2b136832be7326caed0c79bae418c2dd54372bea':
fix code snippet error
2010-09-03 13:18:28 -07:00
Anthony Newnam
578a57fc6b
Avoid pre-processing images when they won't be used
...
Change-Id: Iffa31228ca95a2e29ccc0aa81bda0fc66922d577
2010-09-03 15:17:09 -05:00
Wink Saville
02bbbc14ef
Merge "Remove unused intent from filter and unused method."
2010-09-03 13:17:00 -07:00
Scott Main
2b136832be
am c4367e54: fix code snippet error
...
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread
* commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
fix code snippet error
2010-09-03 13:15:11 -07:00
Jeff Hamilton
2c2d72a7fd
Hide this log behind the debug flag.
...
Change-Id: I83eb8558c8037f3b703dcf46c2d3aa0fa3d18a43
2010-09-03 15:10:28 -05:00
Alex Sakhartchouk
355383e424
Merge "Fixing fragment shader bounding code"
2010-09-03 12:58:28 -07:00
Daniel Sandler
78e42751f3
Merge "Don't get stung!"
2010-09-03 12:51:36 -07:00
Dianne Hackborn
482566ed5c
These are not ready to be exposed. Also rename them to be better.
...
Change-Id: I7c234144497084b7769f8c46761b7d74d1c583d5
2010-09-03 12:51:28 -07:00
Brad Fitzpatrick
9eb32c96c8
am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
...
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp
* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
More SharedPreferences commit() -> apply() changes.
2010-09-03 12:49:44 -07:00
Brad Fitzpatrick
a2f2141c84
Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
2010-09-03 12:46:25 -07:00
Chet Haase
52d33aa412
Merge "Add transition effects for layout changes on ViewGroups"
2010-09-03 12:31:17 -07:00
Chet Haase
21cd1389d2
Add transition effects for layout changes on ViewGroups
...
Change-Id: Ibefcca5692450188fbcec608f3f7e36be1213b21
2010-09-03 12:20:00 -07:00
Adam Powell
e6ffce9f65
Fix bug 2973252 - Make overscroll glow respect ifContentScrolls
...
Change-Id: I0e4bf09c0cbc660c9b8d26a3526b09568c05e93d
2010-09-03 12:06:51 -07:00
James Dong
3caa71483f
Not all audio source has the drift time information
...
Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
2010-09-03 12:01:55 -07:00
Marco Nelissen
462bac9222
am e7884d68: am d85621c9: Don\'t crash when extra logging is enabled.
...
Merge commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a'
* commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a':
Don't crash when extra logging is enabled.
2010-09-03 11:54:31 -07:00
Marco Nelissen
e7884d68a6
am d85621c9: Don\'t crash when extra logging is enabled.
...
Merge commit 'd85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp
* commit 'd85621c938286a568b1173e7ab29f80ab93d27e1':
Don't crash when extra logging is enabled.
2010-09-03 11:51:28 -07:00
Marco Nelissen
d85621c938
Don't crash when extra logging is enabled.
...
Change-Id: I76cf8db0f51ed33e91acee9636180e8d7c0b5ff9
2010-09-03 11:46:19 -07:00
Daniel Sandler
44434f002a
Don't get stung!
...
Change-Id: I8211675e619bcc31c991296387513d07ad53ff10
2010-09-03 14:45:45 -04:00
Daniel Sandler
b062f02d54
Merge "Fix status bar battery meter."
2010-09-03 11:41:43 -07:00
James Dong
9b3569bc42
am bc1452a3: am 7755cdd6: Remove unused/debugging code from MP4 file writer
...
Merge commit 'bc1452a307ac61ca87bf78722701ac85100952af'
* commit 'bc1452a307ac61ca87bf78722701ac85100952af':
Remove unused/debugging code from MP4 file writer
2010-09-03 11:37:14 -07:00
James Dong
bc1452a307
am 7755cdd6: Remove unused/debugging code from MP4 file writer
...
Merge commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82' into gingerbread-plus-aosp
* commit '7755cdd69690ccbb42c6fd47b3e9c4594d4ade82':
Remove unused/debugging code from MP4 file writer
2010-09-03 11:33:47 -07:00
Daniel Sandler
3df3ad3faa
Fix status bar battery meter.
...
Bug: 2974927
Change-Id: I22bcf92a85bca3c2c2d1d2efd2a501e563b3c84c
2010-09-03 14:28:02 -04:00
Brad Fitzpatrick
fa8e271636
More SharedPreferences commit() -> apply() changes.
...
Change-Id: Ibc844d72d463434722a349f5bbc02889a9feb0ee
2010-09-03 11:18:28 -07:00
Scott Main
c4367e54e4
fix code snippet error
...
Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
2010-09-03 11:03:42 -07:00
Gloria Wang
048350abfe
Fix for the incorrect size of the new added DRM file. (bug 2897238)
...
Change-Id: I798be5243116727abdc77850000a6a84ab204bd6
2010-09-03 10:45:51 -07:00
Wink Saville
30bf654574
Remove unused intent from filter and unused method.
...
Change-Id: I8c503903fceb508658cce14918f2c77c04289873
2010-09-03 10:28:57 -07:00
