75073 Commits

Author SHA1 Message Date
Eric Fischer
dca2e81b7d Merge "Import translations. DO NOT MERGE" 2012-04-19 13:47:52 -07:00
James Dong
831f0a90ca Update javadoc for timed text / multiple audio track APIs
o Throw runtime exception when selectTrack, unselectTrack, getTrackInfo fails
o remove redundant code for selectTrack and unselectTrack methods

o related-to-bug: 6110705,5542712

Change-Id: I59f0ed638e93d0365eccab1e33c9d50354a9c1ba
2012-04-19 13:46:23 -07:00
Andreas Huber
bfc56f497d DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clients
through a custom exception "MediaCodec.CryptoException".

Change-Id: I30215e9e13bab68abad23e27dcead7c1accd07f1
related-to-bug: 6365261
2012-04-19 13:42:14 -07:00
Chet Haase
b78c284bd5 Always execute actions on the runQueue
A View that is not attached will place posted actions on the
ViewRoot's runQueue. Previously, this runQueue was only ever executed
during a layout (during performTraversals()). This works in most situations
(a View that is added to or removed from the hierarchy will force a layout
in general), but not in all cases. For example, a new View being added to
a ListView will not cause a layout, so any actions posted to that View
prior to its being attached will not be run until some indeterminate time
later when a layout happens to run.

The fix is to execute the (typically empty) runQueue on every traversal.

Issue #6366678 View.post() ignored when called on an unattached ListView item

Change-Id: I94e6fdd9da6bb57fd83b547f8d742cd0ddfecbd6
2012-04-19 13:39:50 -07:00
Eric Fischer
abf5df26b5 Import translations. DO NOT MERGE
Change-Id: I76fa7c707eaf80c47b36d7e9145a26ec9c1670e4
2012-04-19 12:53:14 -07:00
Eric Fischer
5b086eb543 Merge "Import translations. DO NOT MERGE" 2012-04-19 12:44:21 -07:00
Eric Fischer
6cb7e640aa Import translations. DO NOT MERGE
Change-Id: I6fada25138bbeda2cdaf4fd4e4b56bdb134fe33d
2012-04-19 12:42:24 -07:00
John Grossman
be02f32cff TimedAudioTrack: Optimize the queue trim operation.
DO NOT MERGE
this change must be hand-merged into master due to directory
restructuring.

Don't perform the end PTS calculation for each buffer during trimming.
Instead, only calculate the ending PTS of a buffer if there is no next
buffer in the queue.  This optimization assumes that the buffers being
queued are in monotonic media time order (a fair assumption for now)
and that the timestamps in the audio are contiguous (not a requirement
for this API, but a reality of how it is being used right now).

In the case where the audio is discontinuous on purpose, it is
that this optimization will cause the system hold one extra buffer
which it could have safely trimmed.  It should not be much of an issue
since in real life the audio is almost always contiguous, and as long
as the media clock is running and the mixer is mixing, the buffer will
be used up and discard as part of the normal flow anyway.

Change-Id: I00061e85ee7d5651fcf80751646c7d7415894a14
Signed-off-by: John Grossman <johngro@google.com>
2012-04-19 12:21:20 -07:00
John Grossman
f609b661a6 TimedAudioTrack: Fix continuity threshold handling.
DO NOT MERGE
this change must be hand-merged into master due to directory
restructuring.

Fix issues with continuity threshold handling; notably
+ If the steady-state continuity threshold is exceeded, be sure to
  clear the on-time flag.  Failure to do this will result in the
  system picking a new mix point which simply satisfies the
  steady-state continuity threshold instead of the startup threshold.
  Since we are putting a discontinuity in presentation anyway, we
  really want to pick a perfect point, not just an OK point.
+ Tighten the steady-state continuity threshold.  It was currently set
  to 100mSec which is enormous.  4mSec (the new setting) is much more
  appropriate.  On systems with a VCXO (like tungsten) this should
  never be wrong by more than a sample.  If TimedAudioTracks are ever
  to be used on VCXO-less systems, this threshold should probably be a
  a parameter configurable by applications on a track by track basis
  so they can make the tradeoff between allowed error and frequency of
  disruptive corrections.
+ Reset the on-time flag if the mixer provides no PTS during a mix
  operation.  This makes for a convenient way for the HAL to reset
  timed tracks when it makes changes for delay compensation across
  multiple outputs.

Change-Id: I2cb23de5a3d1f75618abc1c8ab903db883837aa8
Signed-off-by: John Grossman <johngro@google.com>
2012-04-19 12:21:02 -07:00
Dirk Dougherty
f2740b347b am aa0c94fc: am 93a333e3: Doc change: Add summary page of Android Developers Live videos.
* commit 'aa0c94fc87e1c20177c9285ab4576e4b59b59127':
  Doc change: Add summary page of Android Developers Live videos.
2012-04-19 12:03:55 -07:00
Dirk Dougherty
aa0c94fc87 am 93a333e3: Doc change: Add summary page of Android Developers Live videos.
* commit '93a333e32646778cd96265783e531dddd046367c':
  Doc change: Add summary page of Android Developers Live videos.
2012-04-19 12:00:51 -07:00
Daniel Sandler
8a97b4aea6 Merge "Fix text transformations in Switches." 2012-04-19 11:58:47 -07:00
Jeff Sharkey
35be756030 Move SystemUI out of system UID.
Add permissions for various things it pokes.  Create new permission
to control launching non-exported activities from recents.  Hidden
API to relax WallpaperService checks.

Change-Id: I547fdcd7c213dd153ae101533ce7c56cd8f86a0d
2012-04-19 11:54:34 -07:00
Daniel Sandler
4c3308de7d Fix text transformations in Switches.
In particular, we now honor android:textAllCaps in the
TextAppearance specified for the switch widget itself.
(Now you no longer need to create a separate capitalized
version of your strings to get them to look like the
platform switches.)

Change-Id: Ia48222a6dddd0d0f9115e554dffb621f4d6a2b94
2012-04-19 14:49:49 -04:00
Jeff Sharkey
1b96594171 Merge "Pipe DHCP vendor info towards framework." 2012-04-19 11:43:49 -07:00
Jeff Brown
b4aed7f5c7 Merge "Ensure that db connection reconfiguration can change the db." 2012-04-19 11:32:35 -07:00
Jeff Brown
0d7da09466 Merge "Don't load keyboard layout overlay for virtual keyboard." 2012-04-19 11:32:24 -07:00
Jeff Brown
76070d1690 Ensure that db connection reconfiguration can change the db.
If the db connection had been marked read-only, then certain
operations performed during reconfiguration, such as setting the
locale, could fail.  So we need to make sure to clear the
read-only flag ahead of time.

Bug: 6296752
Change-Id: I98e19aff6386497b7fc321e04ca560fc1817a781
2012-04-19 11:30:33 -07:00
Dirk Dougherty
93a333e326 Doc change: Add summary page of Android Developers Live videos.
Change-Id: I650471562dd0d50496cbff2178b19b7896565d93
2012-04-19 11:26:06 -07:00
Jeff Brown
61c0824058 Don't load keyboard layout overlay for virtual keyboard.
Bug: 6110399
Change-Id: I07c85cf991790ed8766b097acc39295a8065a5ea
2012-04-19 11:25:09 -07:00
John Reck
cada1ae717 Merge "Allow removing messages before EventHub created" 2012-04-19 11:09:44 -07:00
George Mount
0bb01cfea6 Merge "Allow long press to work on text." 2012-04-19 11:06:02 -07:00
Chet Haase
0e5bd8da9d Merge "Make ViewPropertyAnimator ListView-animation-capable" 2012-04-19 11:05:28 -07:00
Chet Haase
563d4f2d46 Make ViewPropertyAnimator ListView-animation-capable
ViewPropertyAnimator now sets the hasTransientState flag in View to tell
it when an animation has started (and unsets it when the animation ends).
This allows ListView to retain views with transient state without recycling them,
which makes ListView item animation possible (because you can't animate a View
if it's being recycled and reused elsewhere as it moves into and out of view).

Change-Id: I75c26a7a56474a76428500afef03a80bb46e04e0
2012-04-19 11:01:27 -07:00
Jean-Michel Trivi
c9496495ba Merge "Unhide Visualizer scaling mode definitions and methods" 2012-04-19 10:52:25 -07:00
John Reck
a60a18965e Remove code preventing scrollTo(0,0)
Bug: 5677901
 Also remove a bunch of unnecessary logic around delaying the
 scroll until the page load has completed, as Browser will keep the
 URL bar visible itself

Change-Id: I4b175f4ff1d741b7027a4c98f676764707f57342
2012-04-19 10:50:55 -07:00
Jean-Michel Trivi
951794616f Unhide Visualizer scaling mode definitions and methods
Unhide Visualizer set/get methods, and associated constant
 definitions.

Change-Id: Iaafe5f7a2f1273f72c3f7f842b416b93614dfa65
2012-04-19 10:34:50 -07:00
Irfan Sheriff
f40a02f85f Merge "Fix build" 2012-04-19 10:27:58 -07:00
Irfan Sheriff
54ac7a5102 Fix build
Change-Id: I1968e0d7d25f613fa6cf72f82d79f17224e3d5ab
2012-04-19 10:26:34 -07:00
Eric Laurent
6db653355b Merge "unhide API for synchronous audio capture." 2012-04-19 10:16:38 -07:00
Joe Malin
7b5f22e11c am 787fa9dc: am 20176edc: Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1
* commit '787fa9dc69262dc002c9da77fa86e88e5a4e658f':
  DOC CHANGE: Add javadoc to ClipboardManager
2012-04-19 10:13:29 -07:00
Joe Malin
787fa9dc69 am 20176edc: Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1
* commit '20176edc4ff43f10ab3be03d84bb9f02b7859bdb':
  DOC CHANGE: Add javadoc to ClipboardManager
2012-04-19 10:10:18 -07:00
Joe Malin
20176edc4f Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1 2012-04-19 10:08:06 -07:00
Craig Mautner
76eb1032d8 Merge "Defer the Surface.show until animation phase." 2012-04-19 10:07:35 -07:00
Adam Powell
1bf4d5f24e Merge "Fix crash setting null seekbar thumb" 2012-04-19 10:00:22 -07:00
Craig Mautner
de6198ebd7 Defer the Surface.show until animation phase.
This fixes a rotation bug introduced by delaying rendering animation
into the Surface. Now instead of delaying the rendering we delay the
show by eliminating a point where we were showing the Surface too soon.

Change-Id: I63ad3b494963111ffc96569093c8d43517c5408b
2012-04-19 09:59:31 -07:00
Adam Powell
0283a5573c Fix crash setting null seekbar thumb
External bug http://code.google.com/p/android/issues/detail?id=15693

Change-Id: I2f869b4ebd1f0857564c69999abb49285beefd14
2012-04-19 09:58:22 -07:00
Irfan Sheriff
75e91f7716 Merge "Add network service discovery broadcast" 2012-04-19 09:57:24 -07:00
George Mount
e3e26c41c3 Allow long press to work on text.
Bug 6351196

Change-Id: I7604ebe70ab58d17b916f92e364343776b66aa3c
2012-04-19 09:57:23 -07:00
Irfan Sheriff
66e69db6d9 Merge "Add user control to turn on/off nsd" 2012-04-19 09:57:02 -07:00
Irfan Sheriff
6c07ba8183 Add network service discovery broadcast
Allows apps to know if user has the feature turned off

Change-Id: I2d2fecb148eb4e48eb4aea51d1d7643a82df5c52
2012-04-19 09:54:40 -07:00
Wink Saville
d38e766e5e Merge "Fix calcuation of CMD_TO_STRING_COUNT." 2012-04-19 09:53:52 -07:00
Irfan Sheriff
3ef889bf56 Add user control to turn on/off nsd
Change-Id: Ide3cc20adb21ac6dffaf6b9b9136d77a129afa3b
2012-04-19 09:52:09 -07:00
Jean-Michel Trivi
125c32ebe7 Merge "Add functional tests for Visualizer volume scaling mode" 2012-04-19 09:38:55 -07:00
Chet Haase
f37d87b35b Merge "Fix init of Animation in View drawing code" 2012-04-19 09:36:49 -07:00
John Reck
9687433dc6 Merge "Cleanup PositionMetadata recycles" 2012-04-19 09:28:16 -07:00
Chet Haase
1fb8a9e44a Fix init of Animation in View drawing code
The refactor of ViewGroup.drawChild() resulted in an error
in a new method (View.drawAnimation) where animations were being
initialized with their view dimensions instead of the parent dimensions.

Issue #6292681 RotateAnimationTest#testRotateAgainstPoint fails on JRN04
Issue #6293275 TranslateAnimationTest#testInitialize fails on JRN04

Change-Id: Ia90711cadd7a6c20fd788e5b8b18a5b28551e68c
2012-04-19 09:22:34 -07:00
Jean-Michel Trivi
997592b3ce Add functional tests for Visualizer volume scaling mode
Add test to set/get the volume scaling mode.

Add test to verify that volume decreases diminish the commputed
  energy.

Change-Id: I0a5d45d064a46a18e5c4b9d7a304c9572f100cdf
2012-04-19 09:13:22 -07:00
Jean-Michel Trivi
5cef554cc8 Merge "Add support for scaling mode parameter in Visualizer effect" 2012-04-19 09:09:06 -07:00
Eric Laurent
ff2577da37 unhide API for synchronous audio capture.
unhide MediaSyncEvent class and AudioRecord.startRecording() method with synchronization
event allowing to start audio capture upon occurence of a specific event.
So far the only event defined is playback presentation complete but more events and synchronized
playback/capture methods could be defined in the future.

Change-Id: If05fc6cd125dd9afad451727f792a3fd9e916bef
2012-04-19 08:59:20 -07:00