Dheeraj Sharma
7ee76cfeea
am d13f987f: am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
...
* commit 'd13f987f73df03b06c70c631452f6cafbdc254e1':
Fix for issue : 3419353 Crash during transition generation
2011-02-03 17:18:13 -08:00
Cary Clark
39530f8fc7
am 859563eb: am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
...
* commit '859563ebf7edbb6d556ef10bac7315fdc564e73a':
stop GL drawing thread before killing WebCore
2011-02-03 17:17:45 -08:00
Justin Ho
9b50aebc60
am 7d75cd65: am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
...
* commit '7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
Changing Honeycomb default wallpaper
2011-02-03 17:17:35 -08:00
Romain Guy
b0905c998d
am 20bf23e5: am ac14db72: Merge "Fast transform properties setters. Bug #3413510 " into honeycomb
...
* commit '20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
Fast transform properties setters. Bug #3413510
2011-02-03 17:17:21 -08:00
Daniel Sandler
4dce4fc8ea
am a2e82d4c: am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
...
* commit 'a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
Implement priority ordering in notifications.
2011-02-03 17:16:54 -08:00
Gil Dobjanschi
223f2696bb
am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
...
* commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
Bug fix: 3419287 Deleted images and video clips invalidate the entire project
2011-02-03 17:16:43 -08:00
Joe Onorato
247c0c1bba
am 020c021c: am e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
...
* commit '020c021c62f804ed08d89a3a38457a002184158e':
Add a bluetooth icon and data direction to the status bar.
2011-02-03 17:16:31 -08:00
Romain Guy
9bd32c235d
am 109da7df: am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433 " into honeycomb
...
* commit '109da7dfd4c0766274b17467880ee673c731735c':
Allocate layers from the layers pool. Bug #3413433
2011-02-03 17:16:19 -08:00
Justin Ho
de9fa2cfe0
am a29acdfb: am 1cee14f1: Merge "System bar tweaks" into honeycomb
...
* commit 'a29acdfb8a3c9812718ead057f77ef5dbd508682':
System bar tweaks
2011-02-03 17:15:33 -08:00
Justin Ho
8e0bf64c6f
am 8e2c67ea: am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
...
* commit '8e2c67ea26d38677802f3029472aa2393f47173d':
Adding new volume control dialog icons
2011-02-03 17:15:21 -08:00
Dianne Hackborn
3d80ba0515
am dd954212: am a5861743: Merge "Fix issue #3418265 : Rotation animation on wallpaper is broken" into honeycomb
...
* commit 'dd95421291f590ec0b1d8e79b73264516e1da027':
Fix issue #3418265 : Rotation animation on wallpaper is broken
2011-02-03 17:15:04 -08:00
Jean-Michel Trivi
2c7afbe15d
am d1488c58: am 17f88656: Fix audible selection sound is not played
...
* commit 'd1488c588d796ee0d44235b11510327144be977a':
Fix audible selection sound is not played
2011-02-03 17:14:44 -08:00
Scott Main
f37f7065a5
Merge "docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:"
2011-02-03 16:57:36 -08:00
Andreas Huber
792faa453a
Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
2011-02-03 16:19:59 -08:00
Andreas Huber
1122fe90f2
Merge "Make sure timestamps attached to encoded media are composition timestamps."
2011-02-03 16:19:30 -08:00
Andreas Huber
e7c83d4a71
Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)
...
Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
2011-02-03 16:09:57 -08:00
Andreas Huber
bd352c3cdc
Make sure timestamps attached to encoded media are composition timestamps.
...
not decoding timestamps. Obviously there is no difference between them if the
content in question does not involve frame reordering.
Change-Id: Iac4d06cfeb8a136f735c1148e98cac340d3ef893
related-to-bug: 3398314
2011-02-03 16:08:30 -08:00
Jack Palevich
c33bf55c09
Merge "Throw an exception when trying to upload a recycled bitmap."
2011-02-03 15:25:52 -08:00
Robert Greenwalt
23a8a45928
Merge "Stop using netmask in the framework."
2011-02-03 14:16:45 -08:00
Glenn Kasten
2b5072405b
Merge "Bug 1804058 FLAC extractor"
2011-02-03 14:06:09 -08:00
Glenn Kasten
f9f223edb4
Bug 1804058 FLAC extractor
...
Note: dependent on external/flac for libFLAC
Implemented and tested:
* FLAC container
* mono and stereo
* standard sample rates
* standard bit depths
* sniffer
* media scanner
* Vorbis comment metadata including album art
* random access seeking with "torture test"
* web browser integration for audio/flac (not audio/x-flac), but
note that most web servers don't correctly report the MIME type
Not implemented:
* 24-bit to 16-bit dither or noise shaping in AudioFlinger
* 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger
* replay gain is better done in AudioFlinger
* multi-channel, would need AudioFlinger support
* Ogg container, does not seem to be very popular yet
Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
2011-02-03 13:39:10 -08:00
Robert Greenwalt
2d2afd13af
Stop using netmask in the framework.
...
bug:2542681
Change-Id: Iaa2b30f7a43de28844d86a4a8a513e86d719608a
2011-02-03 13:20:00 -08:00
Robert Greenwalt
f8d40f0d55
Merge "Bind addr and prefixLength together in LinkAddress"
2011-02-03 13:17:48 -08:00
Marco Nelissen
770d02c2fa
Unhide MediaStore.getVersion so Music2 can use it.
...
Change-Id: I006860fe2bd828ffdc598dc89329eba952fde5b3
2011-02-03 12:23:40 -08:00
Shimeng (Simon) Wang
4eb02a13b3
Merge "Use more accurate height/width ratio."
2011-02-03 11:44:06 -08:00
Marco Nelissen
d2f5d166c5
Merge "Add a convenience method for getting the media provider version."
2011-02-03 11:06:07 -08:00
Kenny Root
9ebd580231
Merge "Remove defunct secure FS work"
2011-02-03 11:04:28 -08:00
Marco Nelissen
3822f73a58
Add a convenience method for getting the media provider version.
...
b/3350571
Change-Id: I1280a49029aa75643397fab7113b4dd80b639809
2011-02-03 10:59:30 -08:00
Shimeng (Simon) Wang
a0cc8642cc
Use more accurate height/width ratio.
...
When calculating the view height, use more accurate height/width
ratio, instead of the second hand ratio after height and width
are calculated and rounded.
This prevents the height value to be fluctuated by 1 sometimes
when zooming.
issue: 3385757
Change-Id: I08bf5478ae8b8fd799df892e19f450cb558d8b7f
2011-02-03 10:24:03 -08:00
Mike Lockwood
04f024d564
Merge changes I80558c62,I6587f580
...
* changes:
UsbService: Blacklist HID boot subclass devices (keyboards and mice)
UsbService: Add support for blacklisting certain USB busses
2011-02-03 09:51:06 -08:00
Dheeraj Sharma
d13f987f73
am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
...
* commit '36b685ffb0e3c1848bc8085757da3e673d19028a':
Fix for issue : 3419353 Crash during transition generation
2011-02-03 09:38:43 -08:00
Dheeraj Sharma
36b685ffb0
Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
2011-02-03 09:36:02 -08:00
Cary Clark
859563ebf7
am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
...
* commit 'aa7dc92838f4e3d423b2a738f54de9b83f83794b':
stop GL drawing thread before killing WebCore
2011-02-03 08:52:21 -08:00
Cary Clark
aa7dc92838
Merge "stop GL drawing thread before killing WebCore" into honeycomb
2011-02-03 08:48:24 -08:00
Justin Ho
7d75cd65fa
am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
...
* commit 'b732e6d20571e9098b02f4d49f0e4359c232eaa0':
Changing Honeycomb default wallpaper
2011-02-03 07:31:28 -08:00
Justin Ho
b732e6d205
Merge "Changing Honeycomb default wallpaper" into honeycomb
2011-02-03 07:25:18 -08:00
Justin Ho
6baf391cac
Changing Honeycomb default wallpaper
...
Change-Id: I5f3b0d8608d1712c3c96d1f9882706fd08c12588
2011-02-03 07:23:43 -08:00
Cary Clark
d9fd857ca9
stop GL drawing thread before killing WebCore
...
The TexturesGenerator thread references pictures owned by the
WebCore thread, so must be stopped before the WebCore thread
is deleted.
Requires a companion change in external/webkit
bug:3406185
Change-Id: I5b2f8b3b52367b05301c76e5bd22a95fcd0338d5
2011-02-03 05:37:04 -05:00
Romain Guy
20bf23e5e4
am ac14db72: Merge "Fast transform properties setters. Bug #3413510 " into honeycomb
...
* commit 'ac14db72ca55110326f4ceb9ac34fddd360036f4':
Fast transform properties setters. Bug #3413510
2011-02-03 01:37:29 -08:00
Romain Guy
ac14db72ca
Merge "Fast transform properties setters. Bug #3413510 " into honeycomb
2011-02-03 01:11:39 -08:00
Romain Guy
da489796e5
Fast transform properties setters.
...
Bug #3413510
Change-Id: I2c83e219faff697a48a160fee627f87422a2cd08
2011-02-03 01:05:15 -08:00
Dheeraj Sharma
13984592b1
Fix for issue : 3419353 Crash during transition generation
...
Change-Id: I1f15f05c87bdc1ad8acdb6fc5db3c350e5b28947
2011-02-02 23:26:30 -08:00
Daniel Sandler
a2e82d4c69
am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
...
* commit '6f922cbe823c19234bc15eea9ac709f399e9a63c':
Implement priority ordering in notifications.
2011-02-02 22:41:25 -08:00
Daniel Sandler
6f922cbe82
Merge "Implement priority ordering in notifications." into honeycomb
2011-02-02 22:39:25 -08:00
Gil Dobjanschi
3f9a851e07
am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
...
* commit 'ed2c513337ae7581ef73b88424da91ef2d862a78':
Bug fix: 3419287 Deleted images and video clips invalidate the entire project
2011-02-02 22:06:33 -08:00
Gil Dobjanschi
ed2c513337
Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
2011-02-02 22:04:38 -08:00
Gil Dobjanschi
29206e9175
Bug fix: 3419287 Deleted images and video clips invalidate the entire project
...
Change-Id: I9dcc3b9fa0574fefe688c1616e69ba37811bde51
2011-02-02 22:02:20 -08:00
Daniel Sandler
a31e4190cb
Implement priority ordering in notifications.
...
Ongoings are the only notifications currently given higher
priority (and it's in an internal data structure, not a
public API, so fear not about abuse---this will be no worse
than on the phone where ongoings floated to the top).
The only thing left is to give privileged customers a way to
alter the priority of their notifications.
Bug: 3412807
Bug: 3146719
Change-Id: I9e738cc413982845cf4858faa8ccd0a7dbf3187c
2011-02-03 01:01:20 -05:00
Joe Onorato
020c021c62
am e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
...
* commit 'e9dea7b735fb0fdb1956d96a6e78b1c5cd666316':
Add a bluetooth icon and data direction to the status bar.
2011-02-02 21:24:47 -08:00
Joe Onorato
e9dea7b735
Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
2011-02-02 21:22:49 -08:00