Scott Main
602a891aea
am b0f1cfff: Merge "docs: SearchView is iconified by default" into honeycomb
...
* commit 'b0f1cfffd9b201335560c15ffbdcfe12225bac8c':
docs: SearchView is iconified by default
2011-02-07 09:44:52 -08:00
Scott Main
b0f1cfffd9
Merge "docs: SearchView is iconified by default" into honeycomb
2011-02-07 09:33:32 -08:00
Dianne Hackborn
432ab6ac04
am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
...
* commit '6b497a0446ebad24305d5e29d5fd5e65014b9778':
Fixing possible race condition.
2011-02-07 08:02:00 -08:00
Dianne Hackborn
6b497a0446
am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
...
* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
Fixing possible race condition.
2011-02-07 07:51:34 -08:00
Dianne Hackborn
4b7c1cacca
am bb2e1ef8: Merge "Fixing possible race condition."
...
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
2011-02-07 07:33:38 -08:00
Xavier Ducrohet
d96a7403cd
LayoutLib: Handle color state list in methods returning an int.
...
Change-Id: Ia35ea09b992a239873026c7ef1629a01dd2e6cec
2011-02-06 21:05:21 -08:00
Scott Main
cccdbe9acb
docs: SearchView is iconified by default
...
Change-Id: Iabe0fdc0b28847f0c401e3692932a73b7d595c88
2011-02-06 16:28:05 -08:00
Xavier Ducrohet
181e321262
am 83d72da7: Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
...
* commit '83d72da7f69f71fd20bd11fc4f98166532136248':
LayoutLib: improved rendering for system/title/action bars.
2011-02-06 15:15:51 -08:00
Xavier Ducrohet
83d72da7f6
Merge "LayoutLib: improved rendering for system/title/action bars." into honeycomb
2011-02-06 15:13:09 -08:00
Robert Ly
18f5c7e691
am cfc048a3: set targetsdk=11 on renderscript misc samples project
...
* commit 'cfc048a3f912695f7a251a2266aef59ac4d2d124':
set targetsdk=11 on renderscript misc samples project
2011-02-06 14:24:56 -08:00
Robert Ly
cfc048a3f9
set targetsdk=11 on renderscript misc samples project
...
Change-Id: Ib352d6e53bd5b2a56c84169e188b835d87c894f1
2011-02-06 13:59:21 -08:00
Xavier Ducrohet
13bdc3355c
LayoutLib: improved rendering for system/title/action bars.
...
Change-Id: I926531e9ad4a7b98e04e23cac3837794f7c89449
2011-02-06 10:58:16 -08:00
Dianne Hackborn
bb2e1ef87f
Merge "Fixing possible race condition."
2011-02-06 09:06:35 -08:00
Robert Ly
7eca7f742a
am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
...
* commit '5cf98da85c1698cacbeed8d4883373d0e0774fd8':
Fixing renderscript samples to properly declare targetSDK
2011-02-06 00:55:01 -08:00
Robert Ly
5cf98da85c
Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
2011-02-06 00:51:40 -08:00
Xavier Ducrohet
1d009fbd17
am 35064e5e: Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb
...
* commit '35064e5e3a04bda6211166630ccd49d522a8bd92':
LayoutLib: add implementation of Bridge.renderDrawable()
2011-02-04 19:33:27 -08:00
Xavier Ducrohet
35064e5e3a
Merge "LayoutLib: add implementation of Bridge.renderDrawable()" into honeycomb
2011-02-04 19:31:38 -08:00
Xavier Ducrohet
fd18f57328
LayoutLib: add implementation of Bridge.renderDrawable()
...
Change-Id: Ic4d96488fd1a2e5b7d24353bebc8fdb24262c1d1
2011-02-04 19:30:35 -08:00
Paul Eastham
9a5bda875f
am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"
...
* commit 'be46d1456beb7e2f3e8b82bda2d0a5023db3debd':
Revert "Fix for StaticLayout bug with ellipsized text"
2011-02-04 19:23:10 -08:00
Paul Eastham
be46d1456b
Revert "Fix for StaticLayout bug with ellipsized text"
...
This reverts commit bbc910f229dec45fa7481a62fbf051f7ff3130e7.
2011-02-04 19:17:54 -08:00
Dharmaray Kundargi
284f3128fa
am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
...
* commit 'f7f2499638624392ce7665faba5246c46c5e5634':
Fix issue 3426489 Overlay background changed when exported
2011-02-04 19:11:55 -08:00
Dharmaray Kundargi
f7f2499638
Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
2011-02-04 19:09:20 -08:00
Xavier Ducrohet
b627f78359
am b0d34f9c: LayoutLib: split RenderSession\'s base method into RenderAction.
...
* commit 'b0d34f9c99cbd43e8238c5952b19d032f02dd168':
LayoutLib: split RenderSession's base method into RenderAction.
2011-02-04 18:27:30 -08:00
Dharmaray Kundargi
ab280b8db6
Fix issue 3426489 Overlay background changed when exported
...
Change-Id: I53d05732f6de6363cfb64fc84b2539e957adfcd6
2011-02-04 18:23:20 -08:00
Xavier Ducrohet
b0d34f9c99
LayoutLib: split RenderSession's base method into RenderAction.
...
This will allow us to create RenderDrawable that extends RenderAction.
Change-Id: If9cd350453ceffae4859a925a7b436502b311f9c
2011-02-04 18:11:09 -08:00
Xavier Ducrohet
1480942d97
am 1126422e: LayoutLib: update to the new API.
...
* commit '1126422ee1f532d8582a4e3b56dbfe505c15e775':
LayoutLib: update to the new API.
2011-02-04 18:05:55 -08:00
Robert Ly
d307645ece
Fixing renderscript samples to properly declare targetSDK
...
Change-Id: I0374fdcd06470e26dc7e849323a1764c08756af1
2011-02-04 18:02:25 -08:00
Xavier Ducrohet
1126422ee1
LayoutLib: update to the new API.
...
Change-Id: Ice028933cd2270c81c3d17f7bef7c5a9d14bd802
2011-02-04 17:41:43 -08:00
Dharmaray Kundargi
73edcfe8f4
am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
...
* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
Fix issue 3426200 Movie Studio crashes when a media item is deleted
2011-02-04 17:03:47 -08:00
Xavier Ducrohet
57bb7faf97
am 3944b784: Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
...
* commit '3944b784e980b5e2cad69b2c8eb5dbc7c1fafc4a':
LayoutLib: Replace custom BitmapFactory by a simpler delegate
2011-02-04 17:03:43 -08:00
Dharmaray Kundargi
b894f8959c
Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
2011-02-04 17:01:51 -08:00
Xavier Ducrohet
3944b784e9
Merge "LayoutLib: Replace custom BitmapFactory by a simpler delegate" into honeycomb
2011-02-04 17:01:11 -08:00
Danny Fernandes
7d913d4350
am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
...
* commit '6ef407c0e6e3c178b01e2837e59348f72c97cf8c':
Fixed 3423072 Imported 1080x720 video clips present distorted view
2011-02-04 16:54:17 -08:00
Danny Fernandes
6ef407c0e6
Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
2011-02-04 16:52:10 -08:00
Gilles Debunne
cdfe899991
Fix for multiple merge problem.
...
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
2011-02-04 16:50:01 -08:00
Xavier Ducrohet
779c906592
LayoutLib: Replace custom BitmapFactory by a simpler delegate
...
Change-Id: Ie61a0a5b4426e64bb71a22d76d05efa4c0865e5e
2011-02-04 16:40:49 -08:00
Eric Laurent
5f3e9e69a1
am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
...
* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
Issue 3395734: fix media server restart detection
2011-02-04 16:33:43 -08:00
Eric Laurent
d4b88c8829
Merge "Issue 3395734: fix media server restart detection" into honeycomb
2011-02-04 16:30:03 -08:00
Eric Laurent
086396a924
Issue 3395734: fix media server restart detection
...
Commit 25101b0b in AudioSystem for issue 3395734 broke the mechanism
in AudioService to poll and detect the restarting of media server
process after a crash.
The fix consists in changing the method used to poll AudioSystem and
trigger a callback indicating success when media server is responding
(the method must be on IAudioFlinger and not IAudioService to trigger the callback).
Change-Id: I843c0194de9cbf82c779cabbf2f3cbf8064603c8
2011-02-04 16:22:57 -08:00
Kenny Root
6465889ecb
am c4dfa998: am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'c4dfa998b7660b9afc4d41b0c940d798f2122fc3':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:16:19 -08:00
Jean-Michel Trivi
d1f0947a60
am c6a5dfd8: Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb
...
* commit 'c6a5dfd81384e3937fb7773a206876d5ee8d48ff':
Fix bug 3425610 Reduce lock / unlock sound level
2011-02-04 16:12:19 -08:00
Kenny Root
c4dfa998b7
am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:12:14 -08:00
Scott Main
7706cd3619
am c1b638ae: docs: add more info about activating components and change link for broadcasts
...
* commit 'c1b638ae41495b79d96b76bb8c71c1efb33dacbe':
docs: add more info about activating components and change link for broadcasts
2011-02-04 16:10:01 -08:00
Danny Fernandes
69e868dcab
Fixed 3423072 Imported 1080x720 video clips present distorted view
...
Change-Id: If4f4039c516eb77423dd590e8634a2d4a05d4622
2011-02-04 16:08:07 -08:00
Jean-Michel Trivi
c6a5dfd813
Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb
2011-02-04 16:06:45 -08:00
Scott Main
c1b638ae41
docs: add more info about activating components and change link for broadcasts
...
Change-Id: I7e5dd51689c6c178fc3ec8d80ccbfe51b4fda255
2011-02-04 16:03:59 -08:00
Kenny Root
d2a996173e
am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
...
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:01:13 -08:00
Gilles Debunne
2b01f31a3a
am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
...
* commit '1ba2a47b82b950934ddf04570fb24124aec7f249':
Blinking runnable is created only if text is editable. DO NOT MERGE.
2011-02-04 15:54:19 -08:00
Gilles Debunne
978dfdaa1e
am 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
...
* commit '826fbdf7b621861f24b71a16fbad53c2ccff1de7':
All runnable are stopped on detach. DO NOT MERGE.
2011-02-04 15:53:44 -08:00
Gilles Debunne
ec1cae6daa
am 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
...
* commit '2f7e9d403a8ef6660d3acf8c41f57ce339c9f7cc':
SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
2011-02-04 15:53:37 -08:00