30375 Commits

Author SHA1 Message Date
Romain Guy
decf6818ea Fix the build for real.
Change-Id: Ifae30acde466f22bcf4bebb198e345654c3f99ad
2010-09-03 17:32:16 -07:00
Romain Guy
26b098b57a Merge "Fix the build." 2010-09-03 17:25:02 -07:00
Romain Guy
db3c15df15 Fix the build.
Change-Id: I3a8a1b3510c66c3624f1c35f71b444a391b757cb
2010-09-03 17:25:04 -07:00
Nipun Kwatra
f5e1faf1cc Merge changes I71f5b0fc,I92c7accb
* changes:
  Moving decision to use still camera to CameraSourceTimeLapse
  pass auxiliary video parameters.
2010-09-03 17:14:51 -07:00
Kenny Root
7e955e7cce am a060b5f7: am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Merge commit 'a060b5f73863f4b5f161674a9c5ac0a0d8d76072'

* commit 'a060b5f73863f4b5f161674a9c5ac0a0d8d76072':
  Reduce footprint of Signature from ~7000 to ~1448
2010-09-03 17:10:48 -07:00
Nipun Kwatra
4a857e620f Moving decision to use still camera to CameraSourceTimeLapse
CameraSourceTimeLapse now decides whether to use still or video
camera automatically. It checks if the passed in size is a valid
preview size and if it is, then uses the video camera else uses
the still camera.

Removed from StagefrightRecorder the support to set parameter
useStillCameraForTimeLapse.

Change-Id: I71f5b0fc7080ca524792381efe918d22e41a7f36
2010-09-03 17:09:36 -07:00
Kenny Root
a060b5f738 am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp

* commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
  Reduce footprint of Signature from ~7000 to ~1448
2010-09-03 17:07:15 -07:00
Kenny Root
6dc003a73f Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread 2010-09-03 16:59:42 -07:00
Romain Guy
a14c8e0c67 Bring back instances counts to dumpsys meminfo.
Change-Id: Idd846e137e8e87cb93551ba13751df60a8046eed
2010-09-03 16:57:53 -07:00
Jesse Wilson
0fd4c17049 am 783f14dd: am 3326f804: Fix the last remaining gaps in our Java 6 API.
Merge commit '783f14ddc9e4032b72aed7880aeb9d39970c98b7'

* commit '783f14ddc9e4032b72aed7880aeb9d39970c98b7':
  Fix the last remaining gaps in our Java 6 API.
2010-09-03 16:55:24 -07:00
Eric Laurent
bcb284c196 am ef9e508c: am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread
Merge commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950'

* commit 'ef9e508c2cb3b52d31250ceca3dddace17cec950':
  LVM release 1.08 delivery.
2010-09-03 16:52:31 -07:00
Adam Powell
bb3806e810 am 0354f0ca: (-s ours) am 7627c221: DO NOT MERGE Tweak overscroll
Merge commit '0354f0cad59fd87a2756d3949213fe54ac2a50f0'

* commit '0354f0cad59fd87a2756d3949213fe54ac2a50f0':
  DO NOT MERGE Tweak overscroll
2010-09-03 16:52:22 -07:00
James Dong
c4e7be5be9 am d6fd133d: am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit 'd6fd133d18c189ab112daef9dc649d0796df5d99'

* commit 'd6fd133d18c189ab112daef9dc649d0796df5d99':
  Not all audio source has the drift time information
2010-09-03 16:51:50 -07:00
Dianne Hackborn
4eb1f0d902 am acc4e041: (-s ours) am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
Merge commit 'acc4e041d27c24b45fb190c493717fda987b52c2'

* commit 'acc4e041d27c24b45fb190c493717fda987b52c2':
  DO NOT MERGE.  Some stuff that is Not Ready.
2010-09-03 16:51:32 -07:00
Romain Guy
bfcb1f5c4e Merge "Prevent the system process from using the HardwareRenderer." 2010-09-03 16:49:36 -07:00
Jesse Wilson
783f14ddc9 am 3326f804: Fix the last remaining gaps in our Java 6 API.
Merge commit '3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp

* commit '3326f8043858152ea2a407a9a4c20fdcdc859e73':
  Fix the last remaining gaps in our Java 6 API.
2010-09-03 16:42:51 -07:00
Dianne Hackborn
6171401a0a resolved conflicts for merge of 6a3ffb5b to master
Change-Id: I3c77887f56c4fdc1cd80682eccc2f5e0020e2761
2010-09-03 16:40:58 -07:00
Eric Laurent
ef9e508c2c am 7e427934: Merge "LVM release 1.08 delivery." into gingerbread
Merge commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b' into gingerbread-plus-aosp

* commit '7e427934e69db804f3ee803e6ffeef4a339e9b8b':
  LVM release 1.08 delivery.
2010-09-03 16:39:59 -07:00
Jesse Wilson
3326f80438 Fix the last remaining gaps in our Java 6 API.
See http://b/issue?id=2497395
See https://android-git.corp.google.com/g/64647

Change-Id: I0886e06163a3853bff69480b01e6e9f9f54fea4e
2010-09-03 16:37:27 -07:00
Eric Laurent
7e427934e6 Merge "LVM release 1.08 delivery." into gingerbread 2010-09-03 16:35:54 -07:00
Adam Powell
0354f0cad5 am 7627c221: DO NOT MERGE Tweak overscroll
Merge commit '7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp

* commit '7627c221c6ce8bf433bf207b002eabe7236c4757':
  DO NOT MERGE Tweak overscroll
2010-09-03 16:33:37 -07:00
Chet Haase
13cc1207fa Add ability to enable layout transition animations by default from XML
Change-Id: I2b884c83e868f5d22ef85d65ff8ee984633de65e
2010-09-03 16:22:22 -07:00
Adam Powell
7627c221c6 DO NOT MERGE Tweak overscroll
Change-Id: I5ba00fc87ba7b286978acf577ba6461f79066437
2010-09-03 16:09:03 -07:00
Romain Guy
5233920a21 Prevent the system process from using the HardwareRenderer.
This change allows applications with the system UID to use the hardware
renderer.

Change-Id: I3c5d776ee9c07bb14933dbe3060cad4175e4fc95
2010-09-03 16:04:46 -07:00
Kenny Root
de0ff63700 Reduce footprint of Signature from ~7000 to ~1448
Signature had lazy initialization of the mString member when needed, but
it would stick around forever when initialized. Each package had one or
more Signatures that would be ~7000 bytes each. At a couple hundred
packages, that's over 1.3MB just for signatures.

Whenever packages.xml was written out, it would write the Signature for
each program as well which happens at boot thereby initializing the
mString member pretty much immediately.

Change-Id: Idb882ffeca2861b3e87437fc83f001710d6c0441
2010-09-03 16:02:27 -07:00
James Dong
d6fd133d18 am 9077f8ec: Merge "Not all audio source has the drift time information" into gingerbread
Merge commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62' into gingerbread-plus-aosp

* commit '9077f8ec931a4c080948a85ce2e0f793f65e9b62':
  Not all audio source has the drift time information
2010-09-03 15:45:01 -07:00
James Dong
9077f8ec93 Merge "Not all audio source has the drift time information" into gingerbread 2010-09-03 15:42:09 -07:00
Joe Malin
2cb3e29e82 Merge "Doc Change:ActivityManager usage doc:running test package" 2010-09-03 15:30:24 -07:00
Joe Malin
b6e19a23eb Merge "Doc change: Update pm command usage for test packages" 2010-09-03 15:29:59 -07:00
Dianne Hackborn
acc4e041d2 am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp

* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
  DO NOT MERGE.  Some stuff that is Not Ready.
2010-09-03 15:23:46 -07:00
Eric Laurent
5fa6df6ebf LVM release 1.08 delivery.
- Changed bundle SamplesToExit to 0.1 secs
- Added SamplesToExit to Revreb
- Removed mixer from Core reverb

Change-Id: I675ec22889f20ef35a0ac427600c2654111c397e
2010-09-03 15:22:18 -07:00
Gloria Wang
ed4fbd98d0 Merge "Fix for the incorrect size of the new added DRM file. (bug 2897238)" 2010-09-03 15:21:50 -07:00
Dianne Hackborn
69717ccd13 DO NOT MERGE. Some stuff that is Not Ready.
Change-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852
2010-09-03 15:20:06 -07:00
Dianne Hackborn
6a3ffb5bee am df3a0f50: Merge "Improve doc." into gingerbread
Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp

* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
  Improve doc.
2010-09-03 15:18:39 -07:00
Dianne Hackborn
df3a0f50c3 Merge "Improve doc." into gingerbread 2010-09-03 15:15:50 -07:00
Dianne Hackborn
6c82f673f6 am fd3f44b3: am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Merge commit 'fd3f44b38882c74c10aff0e238ee4ad9fcd8b724'

* commit 'fd3f44b38882c74c10aff0e238ee4ad9fcd8b724':
  Adding a feature denoting support for 5 or more fully
2010-09-03 15:14:57 -07:00
Dianne Hackborn
170bae7d83 Improve doc.
Change-Id: I841b04e1e455b6236fb8b65b965f2fc25c4461f0
2010-09-03 15:14:28 -07:00
Dianne Hackborn
fd3f44b388 am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp

* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
  Adding a feature denoting support for 5 or more fully
2010-09-03 15:10:24 -07:00
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