James Dong
96fa949f66
am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
2010-06-03 11:32:29 -07:00
James Dong
37d5dbc742
am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
...
Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken
* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:30:03 -07:00
James Dong
1ce3ee8a00
am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
...
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:27:19 -07:00
James Dong
c1cf2705d5
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
2010-06-03 11:26:09 -07:00
Vasu Nori
7a34c4964f
Merge "cleanup some small but ugly things. all minor things."
2010-06-03 11:07:20 -07:00
Romain Guy
21aa0e0110
Merge "Do not invoke onProgressUpdate if the task is canceled. Bug #2734382 "
2010-06-03 10:58:05 -07:00
Derek Sollenberger
93a5f50e04
Merge "Update EmbeddedZoomControl to use new ZoomManager methods."
2010-06-03 10:35:04 -07:00
Derek Sollenberger
87f4acfd4b
Merge "Refactor zoom logic from WebView to ZoomManager."
2010-06-03 10:07:05 -07:00
Kenny Root
fe68d385b7
am 5095232d: am 15fe2cb7: Add error checking for translatable strings
2010-06-03 09:37:14 -07:00
Kenny Root
3678042be7
am 15fe2cb7: Add error checking for translatable strings
2010-06-03 09:36:00 -07:00
The Android Open Source Project
3c17b38b61
am 913dbc50: am a9f06fef: am ee7e6a78: merge from open-source master
2010-06-03 09:12:40 -07:00
The Android Open Source Project
54821476ae
am a9f06fef: am ee7e6a78: merge from open-source master
2010-06-03 09:10:54 -07:00
The Android Open Source Project
2519d6ce45
am ee7e6a78: merge from open-source master
...
Merge commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken
* commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401':
Improved error-handling in Rfc822Tokenizer
2010-06-03 09:09:07 -07:00
The Android Open Source Project
1531d2f979
merge from open-source master
...
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
2010-06-03 09:03:58 -07:00
Leon Clarke
fa80385504
Merge "Add indexeddb files to the skip list"
2010-06-03 07:05:47 -07:00
Mike Lockwood
6a65d8a9a2
Merge "Prototype Content Provider support for MTP/PTP devices."
2010-06-03 06:00:45 -07:00
Eric Laurent
eafff459aa
Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications.
...
First drop of audio framework modifications for audio effects support.
- AudioTrack/AudioRecord:
Added support for auxiliary effects in AudioTrack
Added support for audio sessions
Fixed left right channel inversion in setVolume()
- IAudioFlinger:
Added interface methods for effect enumeraiton and instantiation
Added support for audio sessions.
- IAudioTrack:
Added method to attach auxiliary effect.
- AudioFlinger
Created new classes to control effect engines in effect library and manage effect connections to tracks or
output mix:
EffectModule: wrapper object controlling the effect engine implementation in the effect library. There
is one EffectModule per instance of an effect in a given audio session
EffectChain: group of effects associated to one audio session. There is one EffectChain per audio session.
EffectChain for session 0 is for output mix effects, other chains are attached to audio tracks
with same session ID. Each chain contains a variable number of EffectModules
EffectHandle: implements the IEffect interface. There is one EffectHandle object for each application
controlling (or using) an effect module. THe EffectModule maintians a list of EffectHandles.
Added support for effect modules and effect chains creation in PlaybackThread.
modified mixer thread loop to allow track volume control by effect modules and call effect processing.
-AudioMixer
Each track now specifies its output buffer used by mixer for accumulation
Modified mixer process functions to process tracks by groups of tracks with same buffer
Modified track process functions to support accumulation to auxiliary channel
Change-Id: I26d5f7c9e070a89bdd383e1a659f8b7ca150379c
2010-06-03 03:21:53 -07:00
Jeff Brown
ccf77ae308
am 1bcc845f: am ca583f09: Merge "Fixed some minor bugs in MotionEvent recycling." into kraken
2010-06-02 22:41:30 -07:00
Joe Onorato
117b926974
am 5e76d148: am 169af47b: remove logging
2010-06-02 22:41:20 -07:00
Joe Onorato
dcf73f7993
am bffd90a5: am c91460d2: Pull the carrier name display in the windowshade out into its own view.
2010-06-02 22:41:16 -07:00
Joe Onorato
627270dd3a
am e3a6e01c: am 1a86dd10: Use the built-in handler instead of allocating another one.
2010-06-02 22:41:11 -07:00
Joe Onorato
d6a616b7aa
am ed9ce2e0: am f5510540: Get the ticker working again.
2010-06-02 22:41:06 -07:00
Joe Onorato
addd2f222b
am 283bbf36: am 9834d534: better debugging "slot" for the notification icons.
2010-06-02 22:41:01 -07:00
Joe Onorato
3174c73b85
am 50515e44: am 75199e3d: Populate the notifications at startup of SystemUI.apk.
2010-06-02 22:40:56 -07:00
Joe Onorato
a7f45df7d7
am cdadef36: am b77f53b2: Get the IconMerger working again.
2010-06-02 22:40:48 -07:00
Daniel Sandler
bbdad65408
am f79bceaf: am 87937dbc: New shadowy status bar, direct from Z\'ha\'dum.
2010-06-02 22:40:42 -07:00
Joe Onorato
228e2c6442
am 9310277c: am 798ac4c7: Start moving resources to SystemUI.apk.
2010-06-02 22:40:33 -07:00
Joe Onorato
5c8511755c
am f00734fe: am 79de0c55: Move the StatusBarPhone package into a new catch-all SystemUI.apk.
2010-06-02 22:40:27 -07:00
Joe Onorato
39cf2aa6c7
am aa6c3f77: am 7dd8c6e4: Remove unused files from the service package.
2010-06-02 22:40:21 -07:00
Joe Onorato
5eecb812d7
am f419c631: am 175f79c5: In fact, switching an item between ongoing and notifications works.
2010-06-02 22:40:09 -07:00
Joe Onorato
1d230ff9dd
am 04e022ff: am 5ee67ebf: Get the text appearance compiling
2010-06-02 22:39:57 -07:00
Joe Onorato
565ef7cd0b
am b649e902: am 9c1d8234: Deal with broken notifications.
2010-06-02 22:39:50 -07:00
Joe Onorato
13f2ca05c0
am 087cc1fa: am 871bdb98: Handle bad icon resources.
2010-06-02 22:39:41 -07:00
Joe Onorato
dba85ab8dd
am f922ef45: am 20da8f8a: Implement setAreThereNotifications.
2010-06-02 22:39:33 -07:00
Joe Onorato
1ec5a7e98d
am 85676633: am 0e26dffd: updateNotifications works.
2010-06-02 22:39:25 -07:00
Joe Onorato
afbe64d023
am f6c288aa: am 66b4c5bb: Implement removeNotification.
2010-06-02 22:39:17 -07:00
Joe Onorato
4e5ff7c434
am bdcc172d: am aaba60b2: Notifications don\'t crash when you click them, and pass through events to NotificationManagerService
2010-06-02 22:39:09 -07:00
Joe Onorato
cc844044aa
am c3c2f605: am e345fff2: notifications show
2010-06-02 22:39:00 -07:00
Joe Onorato
60aa7e4c90
am 34504ffc: am a0c56fe9: Checkpoint. Doesn\'t build.
2010-06-02 22:38:52 -07:00
Joe Onorato
d9c326c493
am ef5ce59a: am 18e69dfc: Checkpoint. Data structures for Notifications in place.
2010-06-02 22:38:43 -07:00
Joe Onorato
cf65255abd
am 599584e7: am 6528b355: Remove unused stuff.
2010-06-02 22:38:32 -07:00
Joe Onorato
4b6b6b9271
am ff97998a: am 4762c2d7: Add expand and collapse.
2010-06-02 22:38:20 -07:00
Joe Onorato
5cac6ac98a
am ee5d0caf: am f3f0e053: Make disable() work.
2010-06-02 22:38:10 -07:00
Joe Onorato
66d6962465
am 47639ea9: am 53680172: Remove unused cruft.
2010-06-02 22:38:00 -07:00
Joe Onorato
8ceb2015d3
am d2b276a9: am 263700df: Clock
2010-06-02 22:37:50 -07:00
Joe Onorato
af837fef82
am 6475786a: am 66d7d01e: Get icon updating working.
2010-06-02 22:37:39 -07:00
Joe Onorato
e0543640f2
am 5581c500: am 514ad663: Set the visibility of the icons.
2010-06-02 22:37:27 -07:00
Joe Onorato
2fd8d021a0
am 8c10ebf6: am fb78cd99: Put the icons in the right order.
2010-06-02 22:37:16 -07:00
Joe Onorato
ad2f969539
am 12cd606d: am 0cbda99f: The status bar draws its icons now.
2010-06-02 22:37:04 -07:00
Joe Onorato
150dc23091
am 27d3ae58: am 503007dd: Checkpoint status bar factoring. Now it builds and doesn\'t crash at boot.
2010-06-02 22:36:53 -07:00