Scott Main
1c91fac1ab
am 22f4e8f6: am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard
...
* commit '22f4e8f627e3f54b418da422eadcf0c43caa3499':
docs: fix date on opengl dashboard
2011-07-13 14:54:24 -07:00
Xavier Ducrohet
37b3cc3bbe
am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
...
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
Merge 36a3a392 from mr1.
2011-07-13 14:53:54 -07:00
Mike Lockwood
fd909a774c
Merge "MediaScanner: fix breakage in updates"
2011-07-13 14:33:13 -07:00
Robert Ly
afcec44d5f
Merge "docs: fix for bug 3186839"
2011-07-13 14:28:52 -07:00
Robert Ly
a704daa8b1
docs: fix for bug 3186839
...
Change-Id: I28305b73f0fe02593e072d690471a1448eb4c675
2011-07-13 14:25:52 -07:00
Svetoslav Ganov
3b56b0d74b
Merge "Polish of the ActivityChooserView and ShareActionProvider."
2011-07-13 14:19:33 -07:00
repo sync
0d4fc33479
Merge "Add REFER handling."
2011-07-13 14:09:33 -07:00
Chris Craik
101eb4810c
Merge "Tile profiling interface"
2011-07-13 14:08:11 -07:00
Mathias Agopian
40001da8fa
Merge "get rid of overlay HAL"
2011-07-13 14:07:01 -07:00
Svetoslav Ganov
76559a65ad
Polish of the ActivityChooserView and ShareActionProvider.
...
1. Addressed the UX comments: ActivityChooserView's default selection
popup no longer shows a message, rather hightlights the default
action which now it displays. Alignemnt of the UI.
2. The ShareActionProvider shows a sub-menu if the host item goes
on the overflow menu.
3. Now the heade layout of the activity chooser view is not needed hence
dropped and the item and footer ones are merged.
Change-Id: I0b3de623e4c0a805be9ed73a8541e66b8c00e2d2
2011-07-13 13:57:32 -07:00
Mike Lockwood
45aaa2a345
MediaScanner: fix breakage in updates
...
To facilitate bulk inserts, we changed the media scanner to use the file URI
instead of the audio, video or image media URIs.
However we should still use the media URIs for updating existing records
Bug: 5021925
Change-Id: I6143dc1d00350192170428a5e951b52ef9223734
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 16:50:29 -04:00
Chris Craik
445ab74a21
Tile profiling interface
...
Allows access to underlying WebView benchmarking calls.
Uses C++ backend from the following CL:
https://android-git.corp.google.com/g/#change,121035
Change-Id: Ib205340451aadfd40425f492afa4f2e46d314ebc
2011-07-13 13:19:37 -07:00
Jeff Brown
023e8c72e9
Merge "Revert "fix a weird use of Vector::appendVector()""
2011-07-13 13:00:38 -07:00
Jeff Brown
b99a82437c
Revert "fix a weird use of Vector::appendVector()"
...
This reverts commit 198fd888add624cf9e53ce31b776568a5d069916
This change seems to have exposed some other bugs.
Bug: 5026631
2011-07-13 12:51:11 -07:00
Jason Sams
3ac60ada27
Merge "Add slot number to forEach hal."
2011-07-13 12:28:38 -07:00
Jason Sams
92b0eab07e
Add slot number to forEach hal.
...
Change-Id: I0f2992d5f4128422d07f897b335c219cc7f1d02c
2011-07-13 11:26:26 -07:00
Andreas Huber
67d464f47e
Enable signalling of a stream discontinuity involving a format-change
...
through IStreamListener.
Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a
related-to-bug: 5022434
2011-07-13 09:47:09 -07:00
Mike Lockwood
9cba686366
Merge "MTP: Clean up MtpServer initialization and threading:"
2011-07-13 08:07:59 -07:00
Mike Lockwood
de033beae4
Merge "UsbDeviceManager: clean up HandlerThread creation"
2011-07-13 07:34:29 -07:00
Narayan Kamath
948d9fef89
Merge "Wait until the audio track finishes playing before releasing it."
2011-07-13 07:30:27 -07:00
Mike Lockwood
dcc31946f2
MTP: Clean up MtpServer initialization and threading:
...
Move thread from native to Java code
Remove the stop() method (the thread will exit on its own)
Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
2011-07-13 09:44:42 -04:00
Mike Lockwood
3fd13eb632
UsbDeviceManager: clean up HandlerThread creation
...
Change-Id: I84683b1753fcf3c3b501f8a506d6d890edf2eb37
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 09:39:54 -04:00
Narayan Kamath
47d6288541
Wait until the audio track finishes playing before releasing it.
...
Release calls stop, which causes truncation of playback.
bug:5021056
Change-Id: I8eadcbf5622dab83be3c4dabfcc06629398f27ab
2011-07-13 13:59:45 +01:00
Jeff Sharkey
3862096cbf
Merge "Include full network history around current time."
2011-07-12 20:23:03 -07:00
Jeff Sharkey
434962e44e
Include full network history around current time.
...
When requesting historical values with time ranges, always include
full values for buckets that span current time. (It doesn't make
sense to interpolate partial data.) Move getTotalData() to return
full Entry objects to prepare for packet counts.
Bug: 4691901
Change-Id: I717bd721be9f1d4a47c4121e46e07a56cb15bbf1
2011-07-12 20:20:56 -07:00
Romain Guy
6ce9ed955e
Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant.""
2011-07-12 19:10:22 -07:00
Romain Guy
08645eb0f4
Revert "Don't preload HardwareRenderer, its static initialization is process dependant."
...
This reverts commit 821e24336b3ab1f902fc3ee8da423226f50b540c.
2011-07-12 19:09:03 -07:00
Fabrice Di Meglio
a6c53c7939
Merge "Introduce TextView drawableStart and drawableEnd"
2011-07-12 18:24:27 -07:00
Romain Guy
c93ffea268
Merge "Don't preload HardwareRenderer, its static initialization is process dependant."
2011-07-12 18:18:11 -07:00
Romain Guy
821e24336b
Don't preload HardwareRenderer, its static initialization is process dependant.
...
Change-Id: I229357aaaa10b19209983c122f98dd3c07e01d7f
2011-07-12 18:16:35 -07:00
Iliyan Malchev
d420b18c43
Merge "Add support for TI H264 encoder"
2011-07-12 17:40:25 -07:00
Mathias Agopian
a7b28df5f0
Merge "take the state transform into account with h/w composer hal"
2011-07-12 17:36:22 -07:00
Chia-chi Yeh
995ab4caf2
am 3b219a51: (-s ours) am 4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
...
* commit '3b219a51a9d692807d3fb0f516df81609ca6e4fc':
VpnService: stop VPN when unknown DNS servers show up.
2011-07-12 16:58:45 -07:00
Elliott Hughes
0d5f971245
Merge "Fix typo in AndroidHttpClient JavaDoc."
2011-07-12 16:58:18 -07:00
Gilles Debunne
5292a9d0a0
Merge "Refactored TextView selectable state methods."
2011-07-12 16:38:51 -07:00
Wink Saville
c4f5d33ea6
am 0ddd9960: am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
...
* commit '0ddd99600675aaf5f514ac6bb30d345c4b66f8c2':
Add a property so that CSIM provision check can be bypassed
2011-07-12 16:38:22 -07:00
Alex Sakhartchouk
5b7da3d3df
Merge "Fix for the renderscript ref counting bug."
2011-07-12 16:27:09 -07:00
Mathias Agopian
6e62dba519
get rid of overlay HAL
...
Change-Id: I461f633d172ab10e05326ef10544c67dea664c0e
2011-07-12 16:04:12 -07:00
Elliott Hughes
7b91b31e28
Fix typo in AndroidHttpClient JavaDoc.
...
Bug: http://code.google.com/p/android/issues/detail?id=14788
Change-Id: I7465c6c42e7b208efc9c954ac46c1b683676106e
2011-07-12 16:02:50 -07:00
Jaikumar Ganesh
30e8f98277
Merge "Add REGISTERED_BEFORE_BOOT flag to intent."
2011-07-12 15:54:50 -07:00
Dandawate Saket
e641dc502b
Add support for TI H264 encoder
...
Add support for TI H264 encoder and quirks for buffer allocation.
Temporary switching to baseline profile till ctts patch is defaulted
as per profile detection.
Change-Id: I1d56184b9c5d5f00d6c63aef7e058f3d56b84cef
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-07-12 15:50:28 -07:00
Jeff Sharkey
f0c3b1b6b7
Merge "Hide NetworkStatsHistory internals."
2011-07-12 15:19:31 -07:00
Jeff Sharkey
099b3d2179
Merge "Watch for external Secure.DATA_ROAMING changes."
2011-07-12 15:18:41 -07:00
Adam Powell
9a845ee425
Merge "Update ActionProvider to support dynamically building submenus."
2011-07-12 15:08:37 -07:00
Kazuhiro Ondo
64bd196fe4
am a9e00a4a: am 89799e72: Fix incorrect ERI banner format
...
* commit 'a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
Fix incorrect ERI banner format
2011-07-12 14:56:59 -07:00
Mathias Agopian
9e37abb636
take the state transform into account with h/w composer hal
...
if the state transform didn't preserve rectangles, we
would still try to use h/w composer hal using the bounds
of the transformed rect, which isn't correct.
now we correctly fall back to composition.
Change-Id: Iff78f4339ece415d4987e95a5717b04934d370ab
2011-07-12 14:51:45 -07:00
Wink Saville
474c924379
Merge "resolved conflicts for merge of 99cd6671 to master"
2011-07-12 14:46:02 -07:00
Adam Powell
961dd11895
Update ActionProvider to support dynamically building submenus.
...
Stub out ShareActionProvider for building a submenu of activities to
choose from.
Change-Id: Ibd9ada77a455ed1a296c87b6d967073ca0f676c2
2011-07-12 14:43:41 -07:00
James Dong
03fb5f30aa
Merge "Make MetadataBufferType.h C-friendly"
2011-07-12 14:43:34 -07:00
Svetoslav Ganov
5fa915039a
Merge "Date/time pickers and calendar view not handling locale change."
2011-07-12 14:39:07 -07:00