48713 Commits

Author SHA1 Message Date
Jean-Michel Trivi
d07f6a7934 Merge "Bug 4231349 fix error in javadoc for android.media.MediaPlayer" 2011-04-06 14:46:17 -07:00
Jean-Michel Trivi
ea763069b1 Bug 4231349 fix error in javadoc for android.media.MediaPlayer
In the javadoc for MediaPlayer.OnBufferingUpdateListener,
the percent parameter for onBufferingUpdate() is described as:
  the percentage (0-100) of the buffer that has been filled thus far

This is incorrect. This percentage is the ratio of (current position
+ content buffered) relative to the total duration.
Also buffering updates are only sent for progressive HTTP download.

Change-Id: I9f346a150b39fa1f7b17126119ecc0d7d27fbfbe
2011-04-06 14:42:18 -07:00
Eric Fischer
7aadb8bda4 am bef09dc0: (-s ours) am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'bef09dc022a57e535232890302ffb5e9c02b7a6a':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:18:45 -07:00
Eric Fischer
bef09dc022 am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'ad3bddab9246933971ff1b5360b0915e55579fe7':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:16:12 -07:00
Eric Fischer
ad3bddab92 am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
  Import revised translations.  DO NOT MERGE
2011-04-06 14:12:31 -07:00
Eric Fischer
9f2f650f26 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-04-06 14:09:32 -07:00
Bill Gruber
9b51746eee am 3e46ee4b: am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '3e46ee4b5cf6103f5d3fe59a486e82c7c6600bb8':
  IAB docs: fixes line break issues
2011-04-06 14:09:01 -07:00
Bill Gruber
3e46ee4b5c am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '2811358f68e6f31c44f483e196f1c91692febf50':
  IAB docs: fixes line break issues
2011-04-06 14:04:47 -07:00
Joe Onorato
279dfe5fa9 Merge "more targeted logging" 2011-04-06 13:58:57 -07:00
Bill Gruber
2811358f68 am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '3bd373079ed2599e5e07aa1cf702c7f8386765c3':
  IAB docs: fixes line break issues
2011-04-06 13:58:34 -07:00
Joe Onorato
f4a9e7d97e more targeted logging
Change-Id: Id440a0f20ae360cd6863aa198d82b5ff2dd2f3b7
2011-04-06 13:58:11 -07:00
Eric Fischer
6d5f5faae0 Import revised translations. DO NOT MERGE
Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
2011-04-06 13:47:57 -07:00
Adam Cohen
f961f9c2df Merge "Fixing AdapterViewAnimator onItemClick compatibility" 2011-04-06 13:40:24 -07:00
Adam Cohen
d38a0cee20 Fixing AdapterViewAnimator onItemClick compatibility
Change-Id: I7b7c37370d0afdc23c62534ea41ffedc8f96f8ff
2011-04-06 13:20:42 -07:00
Bill Gruber
3bd373079e am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
* commit '48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
  IAB docs: fixes line break issues
2011-04-06 13:20:27 -07:00
Xavier Ducrohet
b4af696054 am d7765e35: am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.
* commit 'd7765e353cdc6f0bb4156841a8436ea28eb20eea':
  LayoutLib: Fix issue with rendering mode.
2011-04-06 13:19:57 -07:00
Glenn Kasten
85b65f2008 Merge "Miscellaneous code cleanup in audio framework" 2011-04-06 13:03:11 -07:00
Bill Gruber
48a1b52bc7 Merge "IAB docs: fixes line break issues" into honeycomb 2011-04-06 12:52:41 -07:00
Xavier Ducrohet
d7765e353c am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.
* commit '73dc2602898a300306ad418ca5bec990f0de877f':
  LayoutLib: Fix issue with rendering mode.
2011-04-06 12:50:01 -07:00
Xavier Ducrohet
73dc260289 am c5aeac7f: LayoutLib: Fix issue with rendering mode.
* commit 'c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
  LayoutLib: Fix issue with rendering mode.
2011-04-06 12:41:17 -07:00
Mathias Agopian
59ad81e19b Merge "remove more unused references to ISurface" 2011-04-06 12:22:29 -07:00
Mathias Agopian
5a4fb5c735 Merge "Remove unused references to ISurface" 2011-04-06 12:22:01 -07:00
Joe Onorato
e4e551e0ff Merge "turn off log spew" 2011-04-06 12:04:35 -07:00
Joe Onorato
b589f47d01 Merge "Move around the HDMI switch detection so we don't try to get the status if we can't listen to it." 2011-04-06 12:04:24 -07:00
Joe Onorato
63ebffcb84 turn off log spew
Change-Id: I7e5564e02460ff41829c9fd26d80032ea3104498
2011-04-06 11:50:50 -07:00
Jason Sams
78e0618d21 Merge "Cleanup character limits." 2011-04-06 11:45:42 -07:00
Jason Sams
bd184c5585 Cleanup character limits.
Change-Id: Icb127248d6e3a0b662ed3b13c9a6646f4f81129a
2011-04-06 11:44:47 -07:00
Joe Onorato
ea495d4c1f Move around the HDMI switch detection so we don't try to get the status if we can't listen to it.
Change-Id: I46f4e92923ba010f68109b6d043c817e25dfe650
2011-04-06 11:41:11 -07:00
Jason Sams
46ded12dd1 Merge "Seperate ProgramRaster. Cleanup ProgramRaster and ProgramStore creation." 2011-04-06 11:40:33 -07:00
Jason Sams
d57a93b27d Merge "Seperate GL from RS program store." 2011-04-06 11:30:24 -07:00
Jason Sams
331bf9b14b Seperate ProgramRaster.
Cleanup ProgramRaster and ProgramStore creation.

Change-Id: If25ea74355238d405340f0ccfb8117ad6e1307b7
2011-04-06 11:23:54 -07:00
Dianne Hackborn
3fc982f41f Add new resource configurations for screen width/height in "dp".
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
2011-04-06 11:00:37 -07:00
Glenn Kasten
ed0079dddd Miscellaneous code cleanup in audio framework
Changes:
 - Move declaration of kClassPathName to top of file so it can be used
   in more than one place, instead of "android/media/AudioSystem".
 - Make private methods static.
 - Add comment to stream_type, audio_mode, force_use types that they must match
   values in AudioSystem.java.
 - Add comment about unused types mp3_sub_format and vorbis_sub_format.
 - Fix typos.
 - Use @ in javadoc comments.
 - Delete dead APIs setMode, getMode, setRouting, getRouting in AudioSystem.java
   (they are all hidden, deprecated, and unused by rest of framework)
 - Delete unused private log method.
 - Fix pathname for android_media_AudioSystem.cpp.
 - Improve code formatting for space after == and !=.
 - Add logging of delta for changing audio policy manager ref count.

Change-Id: I18037c7beb8ab76d1fda08c11e589f6e591d36e1
2011-04-06 10:24:18 -07:00
Brian Carlstrom
fb84ce0df6 Merge "Don't use local ref for cached jclass reference in JNI code" 2011-04-06 10:06:00 -07:00
Brian Carlstrom
46e18c11d4 Don't use local ref for cached jclass reference in JNI code
Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b
related-to-bug: 4241138
2011-04-06 10:04:20 -07:00
Irfan Sheriff
9552766567 Merge "Add support for supplicant SCAN_INTERVAL" 2011-04-06 09:16:26 -07:00
Irfan Sheriff
2b7f63887e Add support for supplicant SCAN_INTERVAL
Also, allow scan interval for framework and supplicant
to be configured at build time or run time

Bug: 4144882
Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
2011-04-06 09:11:15 -07:00
Xavier Ducrohet
c5aeac7f15 LayoutLib: Fix issue with rendering mode.
When the layout content is embedded inside a decor layout
to emulate system bar (top or bottom) and title bar (or action bar)
then the code computing the full required size based on the RenderingMode
would fail because the decor layout would prevents the content layout to
take as much room as possible.
There is also an issue with the way we know render dialogs as the
dialogs usually as a frame with some padding and the previous measurements
would not take into account the dialog padding when increasing the
screen size.

This fix makes the code measure the size of the content layout in the
normal rendering, and then separately from the root layout with the proper
MeasureSpec to let the content grown. The difference in size is then added
to the screen size.

Bug: http://code.google.com/p/android/issues/detail?id=15892

Change-Id: Ibb9ca2a67c6c450d10d9f9a8050536e094650f8b
2011-04-05 20:45:48 -07:00
Mathias Agopian
c8a04b536b remove more unused references to ISurface
Change-Id: I2201f1ca2bb8f203a081d94a0134f798778dfbef
2011-04-05 20:11:55 -07:00
Bill Gruber
0a8084d78f IAB docs: fixes line break issues
Change-Id: Iad795520a4544638bd26c354b4a8718afb28646a
2011-04-05 15:54:21 -07:00
Jaikumar Ganesh
14faa3bd8b Update for change in Bluez version.
1. Implement address copy
2. Update device properties parsing.

Change-Id: I112371c848cdfaa2f02e0c447154070c0a38737f
2011-04-05 15:53:59 -07:00
Jaikumar Ganesh
72b18064a2 Disable Out of Band pairing for Bluez upgrade.
This is a temporary change, till OOB pairing is redone.

Change-Id: I3e25fc7923eb4c70b4139880da884acf43098386
2011-04-05 15:53:59 -07:00
Fabrice Di Meglio
23e0df5854 Merge "TextLayoutCache - more code refactoring" 2011-04-05 15:38:06 -07:00
Fabrice Di Meglio
48796a81be TextLayoutCache - more code refactoring
- move code from .h file to .cpp file

Change-Id: Ib8201a20e2767ef5d92707a6f4d8d79a3673e04d
2011-04-05 15:35:59 -07:00
Brian Carlstrom
3a6076ec28 Merge "Fix usages of PopLocalFrame to include returned local reference" 2011-04-05 15:26:04 -07:00
Brian Carlstrom
b32b1ddf72 Fix usages of PopLocalFrame to include returned local reference
Change-Id: Ibd7a37b4035862718cb625110cfbba741537c17a
2011-04-05 15:20:52 -07:00
Scott Main
782c9d8709 am 6bb507e9: am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
* commit '6bb507e9ebdaff0370b2826f9a4a73156997c498':
  docs: fix the TOC in a few docs
2011-04-05 14:35:37 -07:00
Scott Main
6bb507e9eb am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
* commit 'c70d483f4baffe5cb4ba09df3645aa6a1b351431':
  docs: fix the TOC in a few docs
2011-04-05 14:32:15 -07:00
Scott Main
c70d483f4b am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
  docs: fix the TOC in a few docs
2011-04-05 14:28:23 -07:00
Fabrice Di Meglio
4e733a0cf9 Merge "Code refactoring for TextLayoutCache" 2011-04-05 14:23:23 -07:00