6542 Commits

Author SHA1 Message Date
Marco Nelissen
87ba92fa39 am ec733f09: am d88404d0: Merge "Fix .pls playlist parsing" into jb-dev
* commit 'ec733f094b48882b78ccf00b0ade5a46229c41c3':
  Fix .pls playlist parsing
2012-05-21 12:40:08 -07:00
Jean-Michel Trivi
3c2711fc28 Type of search on headset key long press must depend on device state
When the user long presses on the headset key, the type of search
 that will launched must depend on the state of the device. The
 following logic is implemented:
 - screen on and device unlocked: action is ACTION_WEB_SEARCH,
 - device locked or screen off: action is ACTION_VOICE_SEARCH_HANDS_FREE
    with EXTRA_SECURE set to true if the device is securely locked.

Bug 6518222

Change-Id: I318770346b8d83e44dfcd4154bcdb517ea7098b5
2012-05-21 10:59:44 -07:00
Pannag Sanketi
850c2c36de Merge "Fixing the weird preview size w/ effects on camera" into jb-dev 2012-05-20 21:26:16 -07:00
Jason Simmons
853d8c7f08 Seek to the beginning if start() is called on an AAH_TXPlayer that has completed playback
Bug: 6486022
Change-Id: I4daaf0f1feb1047a12480397598af6c52f54a6b6
2012-05-18 18:21:47 -07:00
Pannag Sanketi
b5af71f2b1 Fixing the weird preview size w/ effects on camera
The aspect ratio sent from the camera app to the SurfaceTextureTarget
filter  does not really matter now since the camera app handles
the re-sizing. Hence, the SurfaceTextureTarget filter needs to be render
in "stretch" mode all the time even though the aspect ratio sent to the
filter might indicate otherwise. The filter still needs the correct
frame size for things other than determining aspect ratio.

Fix b/6430124

Change-Id: Ie7fa5cd2adf2a8d41e6e005418f6c6fd738ed85d
2012-05-17 19:29:33 -07:00
Bryan Mawhinney
9de61ae0ed Merge "Fix video scaling mode validity check." into jb-dev 2012-05-17 16:19:30 -07:00
Bryan Mawhinney
79a9cd40f5 Fix video scaling mode validity check.
Change-Id: Ib7adead2758d50cae67741364801e966a82ad5ba
2012-05-18 00:15:56 +01:00
Jeff Brown
ab624c2fd4 Use FLAG_LONG_PRESS for headset long press interactions.
Handle canceled key events correctly and don't synthesize
key events in that case.

Unfortunately, the state machine was confused by some sequences
of key events that it might receive from the input dispatcher
when new activities take focus during a long-press on the headset key.
The audio service may receive a cancel event intended for the old
window, followed by a repeated down and finally an up for the new window.
Simplified this down to just two booleans.

Bug: 6484717
Change-Id: I9587d0a5e282419ef4d7c17665940682aacea96a
2012-05-17 14:00:34 -07:00
Jean-Michel Trivi
0a95ce9ffb Merge "Handle media button events during phone calls and when ringing" into jb-dev 2012-05-17 11:14:56 -07:00
Jean-Michel Trivi
722b808662 Handle media button events during phone calls and when ringing
Add functionality in AudioManager/AudioService to register a
 media button receiver for telephony that, when registered, gets
 priority for media button key events during a phone call or
 when ringing.

Bug 6484717

Change-Id: I0835fc02cb24d06ca59af5a32c3ba0ae93e54442
2012-05-17 10:38:36 -07:00
Marco Nelissen
d88404d0a1 Merge "Fix .pls playlist parsing" into jb-dev 2012-05-17 09:53:02 -07:00
Marco Nelissen
538d4925b3 Fix .pls playlist parsing
b/6508278

Change-Id: I015ecf3fa599601ba4e9d018be24d0685e153239
2012-05-16 17:10:24 -07:00
James Dong
6cd0fde78d am 62c51779: am 5ddb19e5: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
* commit '62c517792d4e3b0f95aa1b76a6aaf7addffc0a0d':
  Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-16 01:18:57 -07:00
James Dong
5ddb19e530 Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6502980

Change-Id: I77aa67dac73ecb6200cfc885c426c23d70929e5d
2012-05-16 01:04:40 -07:00
James Dong
2fd30eed37 am 7840dfaf: am 5301a56c: Merge "Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"" into jb-dev
* commit '7840dfaf1545e7299521c892b3281e64f4eb8dcf':
  Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
2012-05-15 14:59:16 -07:00
James Dong
f20e4f4b1a Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
This reverts commit cbaa821b7f286a54767cc8bc549504ea2ed86e4d.
2012-05-15 14:51:52 -07:00
James Dong
22b25b185f am 1fb01d9a: am 6387c8a9: Merge "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" into jb-dev
* commit '1fb01d9a48dcb1dcdd6a4feca9f51213f50df94f':
  Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-15 14:29:35 -07:00
Eric Laurent
50e8a1649a am dd99f70a: am dfae6db0: Merge "Implement new volume display policy." into jb-dev
* commit 'dd99f70a3f8e661799ecda271d31fc385a80ecb5':
  Implement new volume display policy.
2012-05-15 11:38:37 -07:00
James Dong
cbaa821b7f Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6328360

Change-Id: Ifc9ffc671f454135db31590805c38f9635e5c815
2012-05-15 00:31:45 -07:00
Jean-Michel Trivi
ba128896f3 am 45274f72: am 2411c336: Merge "Verify AudioTrack only uses a valid multichannel configuration" into jb-dev
* commit '45274f729e9d9d1d9bee3007a949d531abdb31a2':
  Verify AudioTrack only uses a valid multichannel configuration
2012-05-14 19:37:41 -07:00
Eric Laurent
8c78752f2b Implement new volume display policy.
Whenever a stream type is muted, the progress bar in volume panel
is at 0.
If a stream is muted by ringer mode and does not control ringer mode,
the progress bar is disabled.
Pressing VOL- when in vibrate or silent mode resets the last audible
volume of ringtone stream (music strem on tablets) to 0.

VolumePanel implementation:
 - Always prefer AudioManager APIs over AudioService APIs when available on both.
 - Do not use AudioManager.shouldVibrate() (deprecated).

Change-Id: I57fcb19ada4e8d729b6b41d668496562ebe340c3
2012-05-14 14:13:10 -07:00
Jean-Michel Trivi
d9e587137b Verify AudioTrack only uses a valid multichannel configuration
Enforce the same rules as for HDMI output:
- FL/FR must be present
- paired channels must be used in pairs (e.g. no rear left
   without rear right)

Bug 6392126

Change-Id: I0a39e474dcf509cb7eabd8edd1f0e44852d72b51
2012-05-14 08:49:42 -07:00
Jean-Michel Trivi
d8be1b9e67 am 3d486406: am 2d97a70f: Merge "Start voice-based interactions from headsethook key" into jb-dev
* commit '3d486406ab510dfab0e4b6913de90be9486074ad':
  Start voice-based interactions from headsethook key
2012-05-14 08:37:47 -07:00
James Dong
16ff4fbab7 am f4513bb9: am 909c4b85: Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
* commit 'f4513bb95b6c8b831b747bf08accd74f96ce712b':
  Improve notifying TimedText by reducing marshall/unmarshalling.
2012-05-14 08:36:21 -07:00
Jean-Michel Trivi
2d97a70ff8 Merge "Start voice-based interactions from headsethook key" into jb-dev 2012-05-12 08:06:28 -07:00
James Dong
909c4b855a Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev 2012-05-11 16:45:19 -07:00
Jean-Michel Trivi
4294b83927 Start voice-based interactions from headsethook key
Implement the interception of long-press on keys that
 can be used to trigger voice-based interactions (here
 only HEADSETHOOK) only if the long-press hasn't been
 trapped by the foreground application:
 - if the key is not one that is used for voice input, handle
   the event as before.
 - if the key press wasn't long enough, simulate a delayed
   key press.
 - if long press is detected, send
   RecognizerIntent.ACTION_WEB_SEARCH. Long press duration
   is set to 300ms (a typical key press is under 100ms).

Bug 3225090

Change-Id: I5b3adeb91d3c41ccd54d23fdb93d7eaec496eee7
2012-05-10 18:42:31 -07:00
Mike Lockwood
e3f70c6545 am f61adad3: am 8d8176d4: Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev
* commit 'f61adad3a7aab104b8c98625fa0e986341ada0d2':
  AudioService: Fix problem handling USB audio disconnect
2012-05-10 18:04:33 -07:00
Mike Lockwood
8d8176d41b Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev 2012-05-10 17:58:47 -07:00
Mike Lockwood
9841818b9a AudioService: Fix problem handling USB audio disconnect
Also broadcast ACTION_AUDIO_BECOMING_NOISY on USB audio disconnect

Change-Id: I46dfcc744df880066aea6bf651334a081c14af0f
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-05-10 17:49:30 -07:00
Eric Laurent
91812e4305 am d2261486: am 304521b7: Merge "AudioService: fix various volume issues." into jb-dev
* commit 'd2261486fa7c789cce5642034d294220f13f6cb0':
  AudioService: fix various volume issues.
2012-05-10 17:47:26 -07:00
Eric Laurent
2448201852 AudioService: fix various volume issues.
Fix various issues in adjustStreamVolume() related to stream type aliases
using different ranges.

Always Update last audible index on all streams sharing the same alias.

Add check on setRingerMode() to prevent setting mode to VIBRATE when no
vibrator is present.

Issue 6455831.

Change-Id: Id110e05d2f16e208e1e398922617bf31967b62db
2012-05-10 17:20:26 -07:00
Eric Laurent
98d8fcf646 am faf23358: am 24938df9: Merge "AudioService: synchronized access to volume index" into jb-dev
* commit 'faf233585b5f3338cb39ab1aeb97891c0e25b273':
  AudioService: synchronized access to volume index
2012-05-10 15:26:56 -07:00
Eric Laurent
24938df9e4 Merge "AudioService: synchronized access to volume index" into jb-dev 2012-05-10 15:20:08 -07:00
Eric Laurent
3172d5e3e7 AudioService: synchronized access to volume index
Add synchronization to prevent concurrent accesses to
volume indexes HashMap in VolumeStreamState.

Use ConcurrentHashMap for VolumeStreamState mIndex and
mLastAudibleIndex.

Issue 6421841.

Change-Id: I6dee805a79aa5e2cd0ba4072014a2fcdda4ed507
2012-05-10 14:55:20 -07:00
Andreas Huber
15ad6fe94d am b2725f7c: am 1bc1b8a5: Merge "Make sure crop rect information is visible from java." into jb-dev
* commit 'b2725f7c7e30dd547a81a8d057bbeab75f35616e':
  Make sure crop rect information is visible from java.
2012-05-10 11:58:22 -07:00
Pannag Sanketi
745e7f25c1 am b53bc725: am 1870c696: Merge "Adding disconnect call to the SurfaceTextureTarget" into jb-dev
* commit 'b53bc725655056ac275e745bfeeffeaf1479ea38':
  Adding disconnect call to the SurfaceTextureTarget
2012-05-10 11:58:09 -07:00
Ruei-sung Lin
a2172c4403 am af9eb5a0: am c2e393f8: Merge "pseudo random number generator in shader with limited precisions" into jb-dev
* commit 'af9eb5a05b7770fb5fb0901f0a1289951e24664e':
  pseudo random number generator in shader with limited precisions
2012-05-10 11:57:27 -07:00
Andreas Huber
1bc1b8a5b8 Merge "Make sure crop rect information is visible from java." into jb-dev 2012-05-10 11:42:15 -07:00
Dianne Hackborn
d293b4b339 am 1ccc8953: am e2c7e2ad: Merge "Add compression level key for FLAC encoding" into jb-dev
* commit '1ccc8953a0ef17076fc2f8088159556c70fbb9c5':
  Add compression level key for FLAC encoding
2012-05-10 11:38:59 -07:00
Andreas Huber
b842599e51 Make sure crop rect information is visible from java.
Change-Id: Ib914de3d42349efcd7af301d43bec82a21d24ce5
related-to-bug: 6471684
2012-05-10 11:32:15 -07:00
Pannag Sanketi
1870c69693 Merge "Adding disconnect call to the SurfaceTextureTarget" into jb-dev 2012-05-10 11:16:59 -07:00
Ruei-sung Lin
c2e393f86c Merge "pseudo random number generator in shader with limited precisions" into jb-dev 2012-05-10 10:02:44 -07:00
Jean-Michel Trivi
08fb063f07 Add compression level key for FLAC encoding
Change-Id: Ic4c32694841b6f37ca44061d14bb81fc267696cc
2012-05-09 19:16:14 -07:00
Pannag Sanketi
b939760679 Adding disconnect call to the SurfaceTextureTarget
Related to b/5873421.
When an app using the SurfaceTextureTarget filter and the activity goes
out of focus such as onPause(), the underlying surfacetexture might not
be available anymore to the filter. The filter needs to be told about
that so that it does try to render into the surface corresponding to the
surfacetexture. For example, in Camera app, the VideoCamera activity has
to let the underlying effects graph know about the disconnect in the
onPause() method.

Change-Id: Iee3af16715432d84fef4438d1671f4d6d261b3d7
2012-05-09 18:51:48 -07:00
Ruei-sung Lin
a75c7bbc63 pseudo random number generator in shader with limited precisions
Change-Id: I3289155824bf71b274c00d1b16366bb319588831
2012-05-09 17:33:25 -07:00
Andreas Huber
610ac933fc am 039495d3: am ea86b36f: Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev
* commit '039495d3dc19b96e3953fde81b74c44d0ac5c2f0':
  Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
2012-05-09 13:27:03 -07:00
Andreas Huber
f86374adec Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
sense for the java API.

Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774
related-to-bug: 6276111
2012-05-09 11:32:51 -07:00
James Dong
dc8967edf0 am 4c2a7bdf: am 3b5fdf51: Merge "Fix: Missed parcel recycling in MediaPlayer." into jb-dev
* commit '4c2a7bdf21ae2f1cba8abfbffa1ea749e2eaaa39':
  Fix: Missed parcel recycling in MediaPlayer.
2012-05-09 10:10:58 -07:00
Eric Laurent
ec9323509d am 776339fe: am c8ade15d: Merge "Silent and Vibrate mode clean up" into jb-dev
* commit '776339fe4c6254fd8e344496a793ce4a11b6f450':
  Silent and Vibrate mode clean up
2012-05-09 10:10:07 -07:00