Yu Shan Emily Lau
9cca1da60c
Merge "Remove the old media player stress test. Add the new playback stress that which caputred the total number of crashes, frame drops from a list of video which side-loaded to the device."
2011-02-07 20:16:17 -08:00
Dianne Hackborn
1fb7a75ca5
am 5592b0d8: am ae91b5ac: Update theme documentation a bit.
...
* commit '5592b0d8fe30c84a4bd8909b5be4166e890d9853':
Update theme documentation a bit.
2011-02-07 19:11:54 -08:00
Adam Powell
c1a35d2b1a
Merge "Fix bug 3389707 - Spinner: should be able to expand wider than their collapsed size"
2011-02-07 19:09:44 -08:00
Dianne Hackborn
5592b0d8fe
am ae91b5ac: Update theme documentation a bit.
...
* commit 'ae91b5ac7d18e4e461fa42709f51da73d29c403a':
Update theme documentation a bit.
2011-02-07 19:09:33 -08:00
Adam Powell
19fd164408
Fix bug 3389707 - Spinner: should be able to expand wider than their
...
collapsed size
Change-Id: Ibd7389d3d7f74b36e9b3e42392cc1f3c0522f20d
2011-02-07 19:05:32 -08:00
Yu Shan Emily Lau
a58389bdc1
Remove the old media player stress test.
...
Add the new playback stress that which caputred the total number of crashes, frame drops from a list of video which
side-loaded to the device.
Change-Id: I41d54b5286da0aecb52a37feec176d8ae5456d9e
2011-02-07 18:59:40 -08:00
Dianne Hackborn
ae91b5ac7d
Update theme documentation a bit.
...
Change-Id: I3dbb2785973fe2618033a3956b99f1100a46b054
2011-02-07 18:45:20 -08:00
Adam Powell
326a23a381
Merge "Fix bug 3426162 - Overflow menu closes on its own"
2011-02-07 18:11:53 -08:00
Adam Powell
f2d7a5d831
Fix bug 3426162 - Overflow menu closes on its own
...
Makes populating action menus smarter, doesn't completely empty and
repopulate. Fixes issues where changing menus can leave popups without
an anchor.
Change-Id: I03cc266f0952123c5704a78cdcfc69b77af1915b
2011-02-07 18:09:56 -08:00
Roman Nurik
5d82abe586
am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
...
* commit 'b8d74fd962e7a8595e5aeadb78b5e7eacea52e8a':
Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
2011-02-07 17:27:58 -08:00
Roman Nurik
b8d74fd962
am 8635908d: Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
...
* commit '8635908da1a9f0b3e7ba9bd11ce7104b38f76756':
Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
2011-02-07 17:24:33 -08:00
Roman Nurik
8635908da1
Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
2011-02-07 17:22:43 -08:00
Jaikumar Ganesh
609602ed77
Merge "Reject incoming tethering connections if Tethering option is not enabled."
2011-02-07 16:49:26 -08:00
Jaikumar Ganesh
8f08ae9661
Reject incoming tethering connections if Tethering option is not enabled.
...
Change-Id: I40aa08ad5a3f3a2169551bbe35682910daced098
2011-02-07 16:45:23 -08:00
Scott Main
5e2b123e48
am 236e9db9: am 62e97010: enable javadoc filtering for api level 11 and disable preview doc mode
...
* commit '236e9db9f31f6b93f6f21cd3b09df7c19dde16dd':
enable javadoc filtering for api level 11 and disable preview doc mode
2011-02-07 16:41:21 -08:00
Scott Main
236e9db9f3
am 62e97010: enable javadoc filtering for api level 11 and disable preview doc mode
...
* commit '62e9701099062093af01d7b5d9bdf7f1fe683a31':
enable javadoc filtering for api level 11 and disable preview doc mode
2011-02-07 16:39:36 -08:00
Scott Main
62e9701099
enable javadoc filtering for api level 11 and disable preview doc mode
...
Change-Id: I12e5f295145ef037beda0e1a3ae0358cf5a2b590
2011-02-07 16:35:46 -08:00
Shimeng (Simon) Wang
ae7272d8cb
Merge "Send actual view height to webkit for window.innerHeight."
2011-02-07 15:30:52 -08:00
Vasu Nori
be92556350
Merge "while waiting for lock, try in 30sec intervals and print warnings if no lock"
2011-02-07 14:40:25 -08:00
Jason Sams
4110c9931a
am 5510d172: am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb
...
* commit '5510d1722b8da4fd630a236f0fd3aad0cc4dac0c':
cleanup headers for SDK. bug 3421901
2011-02-07 14:20:07 -08:00
Jason Sams
5510d1722b
am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb
...
* commit 'f8cbf7297bd7e29867154610cbc24fe0dbc168d1':
cleanup headers for SDK. bug 3421901
2011-02-07 14:17:45 -08:00
Jason Sams
f8cbf7297b
Merge "cleanup headers for SDK. bug 3421901" into honeycomb
2011-02-07 13:59:45 -08:00
Xavier Ducrohet
96203e2dbe
am 5ac53883: am 4dd2299d: LayoutLib: Update to latest API fix.
...
* commit '5ac5388359652f45fd401dc269ac3e37b52216af':
LayoutLib: Update to latest API fix.
2011-02-07 13:52:04 -08:00
Xavier Ducrohet
8d3f4eb7cd
am 80656fb7: am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
...
* commit '80656fb71e98aa5aa2f9d7f010f2db4dfc0c9ff5':
LayoutLib: Handle color state list in methods returning an int.
2011-02-07 13:51:50 -08:00
Brad Fitzpatrick
45a59550b1
am bb756a90: am a62bf8bb: am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
...
* commit 'bb756a90902ade5cf619f5fa65ec5505dcdf431a':
Fix a race condition in NativeDaemonConnector
2011-02-07 13:51:43 -08:00
Scott Main
97228942d8
am 602a891a: am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
...
* commit '602a891aea0392168e90f9dee61b33f45c698f34':
docs: SearchView is iconified by default
2011-02-07 13:51:36 -08:00
Dianne Hackborn
53595b1688
am 432ab6ac: am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
...
* commit '432ab6ac04f22a5e4c15aece04117b35bbf8869c':
Fixing possible race condition.
2011-02-07 13:51:31 -08:00
Xavier Ducrohet
7455500684
am 181e3212: am 83d72da7: Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
...
* commit '181e3212625374e7954b0313e3a2782e15d09599':
LayoutLib: improved rendering for system/title/action bars.
2011-02-07 13:51:19 -08:00
Robert Ly
c07eb39417
am 18f5c7e6: am cfc048a3: set targetsdk=11 on renderscript misc samples project
...
* commit '18f5c7e6919a8d66b1b7c818d55b92504961b379':
set targetsdk=11 on renderscript misc samples project
2011-02-07 13:51:11 -08:00
Robert Ly
a5c8eb76f5
am 7eca7f74: am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
...
* commit '7eca7f742a31654a3240f70611ac8c82705d2b42':
Fixing renderscript samples to properly declare targetSDK
2011-02-07 13:51:03 -08:00
Xavier Ducrohet
0bf9f7066b
am 1d009fbd: am 35064e5e: Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb
...
* commit '1d009fbd17c52a0f3cdd26582e55abe03b125890':
LayoutLib: add implementation of Bridge.renderDrawable()
2011-02-07 13:50:48 -08:00
Paul Eastham
19e70cbbcb
am 9a5bda87: am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
...
* commit '9a5bda875f86b188b501ce7cf73810dd92288251':
Revert "Fix for StaticLayout bug with ellipsized text"
2011-02-07 13:50:42 -08:00
Dharmaray Kundargi
3ec816ba61
am 284f3128: am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
...
* commit '284f3128fa959c8c2aa901d0af359f1f1b4d8bc4':
Fix issue 3426489 Overlay background changed when exported
2011-02-07 13:50:31 -08:00
Xavier Ducrohet
fc45532da8
am b627f783: am b0d34f9c: LayoutLib: split RenderSession\'s base method into RenderAction.
...
* commit 'b627f78359ef3b1883f27e6fdf73a882bc3832b0':
LayoutLib: split RenderSession's base method into RenderAction.
2011-02-07 13:50:19 -08:00
Xavier Ducrohet
2c994424c8
am 1480942d: am 1126422e: LayoutLib: update to the new API.
...
* commit '1480942d970ce0503fc99125dbf64e5dae0fd706':
LayoutLib: update to the new API.
2011-02-07 13:50:06 -08:00
Dharmaray Kundargi
88928ffc1c
am 73edcfe8: am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
...
* commit '73edcfe8f4678c4d5e91c8018e00a72ea325da71':
Fix issue 3426200 Movie Studio crashes when a media item is deleted
2011-02-07 13:49:38 -08:00
Xavier Ducrohet
b5fc0409ef
am 57bb7faf: am 3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
...
* commit '57bb7faf9793329babe04493d89d891ef482ac4f':
LayoutLib: Replace custom BitmapFactory by a simpler delegate
2011-02-07 13:49:31 -08:00
Danny Fernandes
5bdbb562ee
am 7d913d43: am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
...
* commit '7d913d4350230afba8dea55718d887cf967d1ab2':
Fixed 3423072 Imported 1080x720 video clips present distorted view
2011-02-07 13:49:25 -08:00
Eric Laurent
b82d4570d9
am 5f3e9e69: am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
...
* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
Issue 3395734: fix media server restart detection
2011-02-07 13:49:16 -08:00
Kenny Root
7679365b54
am 6465889e: am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit '6465889ecbf4c04bb4bb6f4e8d4306727f7ca837':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-07 13:49:08 -08:00
Jean-Michel Trivi
7d79721888
am d1f0947a: am c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb
...
* commit 'd1f0947a609c492b4e96b41aa1cf055bc7603220':
Fix bug 3425610 Reduce lock / unlock sound level
2011-02-07 13:48:58 -08:00
Scott Main
1fbb9372e9
am 7706cd36: am c1b638ae: docs: add more info about activating components and change link for broadcasts
...
* commit '7706cd3619ba4fe96027978d47e5526556f57962':
docs: add more info about activating components and change link for broadcasts
2011-02-07 13:48:48 -08:00
Gilles Debunne
c84d49d915
am 2b01f31a: (-s ours) am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
...
* commit '2b01f31a3a83176147c2f0eef9787f5c754f9903':
Blinking runnable is created only if text is editable. DO NOT MERGE.
2011-02-07 13:48:34 -08:00
Gilles Debunne
97bf20c581
am 978dfdaa: (-s ours) am 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
...
* commit '978dfdaa1e5c8654a2a02eae8d7d006e7ced8c64':
All runnable are stopped on detach. DO NOT MERGE.
2011-02-07 13:48:26 -08:00
Gilles Debunne
03cc6db141
am ec1cae6d: (-s ours) am 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
...
* commit 'ec1cae6daa179a9e86723ecbcfad441fc3c0dd70':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-07 13:48:17 -08:00
Trevor Johns
92d7dae32f
am 18fc4f80: am 8d7cc6fa: Merge "Minor updates to Android Market Licensing Service docs." into honeycomb
...
* commit '18fc4f80d35c43962ac62877460e3ba644afde90':
Minor updates to Android Market Licensing Service docs.
2011-02-07 13:48:06 -08:00
Mike Cleron
b3fe3f59d1
am e4d08c02: am 851beae7: Merge "Properly handle dirty rectangles generated from 9-patches Bug #3409580 " into honeycomb
...
* commit 'e4d08c02229bea67c6f19db22d4ffa45196d4258':
Properly handle dirty rectangles generated from 9-patches Bug #3409580
2011-02-07 13:47:58 -08:00
Mike Cleron
b31688eb05
am a626eb18: am 2d47fd3c: Merge "Fix crash when Paths are GCd in hw accelerated apps" into honeycomb
...
* commit 'a626eb18ae2c4a48c8770ece3a64eeee5974f455':
Fix crash when Paths are GCd in hw accelerated apps
2011-02-07 13:47:48 -08:00
Stephen Hines
74d0778229
am 95dc232c: am a5b8768f: Merge "Add support for memcpy/memset to RS." into honeycomb
...
* commit '95dc232c0a16c64e422ef7e57e14e5f955b112a2':
Add support for memcpy/memset to RS.
2011-02-07 13:47:21 -08:00
Jamie Gennis
f7398e2808
am c7839751: am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb
...
* commit 'c7839751aa1de52e0c3aab7dd1518b0fc8f2ee0a':
Initialize the SurfaceTexture transform fields.
2011-02-07 13:47:02 -08:00