48739 Commits

Author SHA1 Message Date
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
Jaikumar Ganesh
6f7a973660 Check if BT is disabled or not when sending audio state.
When BT is turning off we need to send the audio state intent.
We were not doing this since the state was turning off.

The check was added to prevent misuse of public APIs, since
these functions are used internally, its not a problem.

Change-Id: I9834cbff741722bf99c2875fa65c0617b7b4807b
2011-04-06 11:11:13 -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
Scott Main
e4cafabbcc am a90eb8fe: docs: fix the TOC in a few docs
* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
  docs: fix the TOC in a few docs
2011-04-05 14:21:36 -07:00
Fabrice Di Meglio
1de9e7a9df Code refactoring for TextLayoutCache
- rename TextLayoutCache entry name
- update references to old name
- better variable names in TextLayoutCache::getRunAdvances()

Change-Id: I5173fbc8af79437ce4786084580426f130120ce8
2011-04-05 14:13:22 -07:00
Scott Main
a90eb8fec1 docs: fix the TOC in a few docs
Change-Id: Iff2b91701ba39e17cc0d88804f3eb3f658e13c27
2011-04-05 14:05:03 -07:00
Mike LeBeau
c95c3a3fc7 Merge "Add EXTRA_ORIGIN to RecognizerIntent." 2011-04-05 14:03:55 -07:00
Mike LeBeau
216ce0f16e Add EXTRA_ORIGIN to RecognizerIntent.
This is for passing the http referer of a request, e.g., for speech
input from within a browser.

Bug: 4161306
Change-Id: I56fdb7466edd985aab6df8364be1f1619a11a00d
2011-04-05 16:38:24 -04:00
Mike Lockwood
b83dee77e2 Merge "MTP and media provider support for multiple storage devices:" 2011-04-05 13:36:49 -07:00
Kenny Root
124198d8ad Merge "Update installd to allow multiuser" 2011-04-05 13:17:02 -07:00
Mike Lockwood
772a3b3106 Merge "MountService: Fix running media scanner at boot." 2011-04-05 12:41:47 -07:00
Mike Lockwood
aefb1ea5b0 Merge "Fix deadlock in MountService" 2011-04-05 12:41:35 -07:00
Eric Laurent
31c91b335e Merge "New fix for issue 4111672: control block flags" 2011-04-05 12:23:28 -07:00
Mike Lockwood
b239b68376 MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
2011-04-05 15:19:16 -04:00
Eric Laurent
ae29b7632e New fix for issue 4111672: control block flags
The first fix (commit 913af0b4) is problematic because it makes threads
in mediaserver process block on the cblk mutex. This is not permitted
as it can cause audio to skip or worse have a malicious application
prevent all audio playback by keeping the mutex locked.

The fix consists in using atomic operations when modifying the control
block flags.

Also fixed audio_track_cblk_t::framesReady() so that it doesn't block
when called from AudioFlinger (only applies when a loop is active).

Change-Id: Ibf0abb562ced3e9f64118afdd5036854bb959428
2011-04-05 12:05:41 -07:00
Adam Powell
67ed4f547e am 2e68ec1b: am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '2e68ec1bc6e9ab57cd884d32b08dbb389189e7a4':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:30:52 -07:00
Mike LeBeau
0cd9cb1827 Merge "Support speech recognizer confidence values." 2011-04-05 11:27:55 -07:00
Adam Powell
2e68ec1bc6 am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:27:23 -07:00
Eric Fischer
9f3c6160e4 Merge "Import revised translations." 2011-04-05 11:18:57 -07:00
Adam Powell
2bb59637ca am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:14:27 -07:00
Kenny Root
86c9584559 Update installd to allow multiuser
* Add ability to select different personas to generate the path to be
  created.

* Move hardcoded paths to read from init's set environment.

* Add unit tests for all the utility functions that build strings to
  make sure they're correct.

* Fill in persona with "0" all the time now. Will be plumbed through in
  later CL.

Change-Id: I0a7f6e3640cb6b052f8823080886ee79e90b679f
2011-04-05 10:45:35 -07:00
Adam Powell
030b38ffc2 Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 2011-04-05 10:45:25 -07:00
Eric Laurent
d8cbd16659 am 7a492a9a: am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit '7a492a9ad42947a3a7b777b0eb6eec56f5bb942b':
  Issue 4157048: mic gain for VoIP/SIP calls.
2011-04-05 10:27:06 -07:00
Mike Lockwood
a88990cf5b am 824c6edc: (-s ours) am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '824c6edce8f79aac9c98caabd9b8857d4c580629':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
2011-04-05 10:27:03 -07:00
Trevor Johns
385539c7d5 am fa6b7889: am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
* commit 'fa6b78890b17f6df2175b143783174ab5e7f7758':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-04-05 10:27:01 -07:00
Simon Wilson
52a5880fc4 am 442bf4cd: (-s ours) am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit '442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-05 10:26:54 -07:00
Mike LeBeau
bb7cf916b2 Support speech recognizer confidence values.
Pass speech recognizer confidence values in the SpeechRecognizer and
RecognizerIntent APIs through to the caller. This change defines new
API constants for keys to these values.

The corresponding change is being made to Google Voice Search, and should be
made to any other implementations.

Bug: 3267513
Bug: 4163206

Change-Id: I294553f2eb9eb3be21298b8434117c8c5309558d
2011-04-05 10:54:18 -04:00