Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,310 Commits 3 Branches 0 Tags
bcb284c1960df025dc671c10a97ec0c599ce9a11
Commit Graph

30310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Wink Saville
02bbbc14ef Merge "Remove unused intent from filter and unused method." 2010-09-03 13:17:00 -07:00