OSDN Git Service
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:36:02 +0000 (09:36 -0800)]
am
34ebb5bf: (-s ours) am
87d19759: Delete browerplugin tests - do not merge
* commit '
34ebb5bfec0794d5852b47edaa8b9d4cea22e515':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:35:55 +0000 (09:35 -0800)]
am
88d7300d: (-s ours) am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
88d7300d2abaf638c2c0b5505b657b401f881c14':
Delete browerplugin tests - do not merge
Robert Greenwalt [Sat, 29 Jan 2011 17:32:04 +0000 (09:32 -0800)]
resolved conflicts for merge of
aa3866e6 to honeycomb-plus-aosp
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
Eric Fischer [Sat, 29 Jan 2011 17:13:21 +0000 (09:13 -0800)]
am
287fbba5: (-s ours) am
5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4':
Import revised translations. DO NOT MERGE
Dirk Dougherty [Sat, 29 Jan 2011 16:57:25 +0000 (08:57 -0800)]
am
30a85ec7: am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
30a85ec7e8d79448fbd0d0af3ac25b656f8428c4':
Doc change: Add time-lapse video to 3.0 highlights.
Andreas Huber [Sat, 29 Jan 2011 16:57:21 +0000 (08:57 -0800)]
am
70888c00: (-s ours) am
b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
70888c00a0371692a07132f0dd94208456dd44c1':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:54:06 +0000 (08:54 -0800)]
Merge
13212f83 from gingerbread-plus-aosp
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
Jim Miller [Sat, 29 Jan 2011 16:47:55 +0000 (08:47 -0800)]
am
145643ca: (-s ours) am
226e5756: Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
145643ca4bb98a88977026ea4d7866e391d53dce':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:45:29 +0000 (08:45 -0800)]
Merge
34afc2cd from gingerbread-plus-aosp
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
Eric Fischer [Sat, 29 Jan 2011 16:02:19 +0000 (08:02 -0800)]
am
e49e30cc: (-s ours) am
3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
e49e30cc4d9411326735f15d92e8d7455467072f':
Import revised translations. DO NOT MERGE
Nick Pelly [Sat, 29 Jan 2011 16:02:04 +0000 (08:02 -0800)]
am
32f7d50d: am
21d0a173: Fix build - javadoc.
* commit '
32f7d50df147e4eb171044aad376bd1425fcf5e7':
Fix build - javadoc.
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:00:52 +0000 (08:00 -0800)]
am
87d19759: Delete browerplugin tests - do not merge
* commit '
87d197597c9130b10ba9d67f17ed81db26e35cd8':
Delete browerplugin tests - do not merge
Scott Main [Sat, 29 Jan 2011 15:59:28 +0000 (07:59 -0800)]
am
51330184: am
7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '
51330184feb1b8d01ac48f4f13e4b91e7e334401':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:58:36 +0000 (07:58 -0800)]
am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
d4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:36:31 +0000 (13:36 -0800)]
Delete browerplugin tests - do not merge
Those don't build in all environments.
Change-Id: Ie564d464d2745df0114236f2c28aa1254d0f65b5
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:39:47 +0000 (07:39 -0800)]
am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:32:39 +0000 (07:32 -0800)]
Merge
55e124c4 from gingerbread-plus-aosp
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
Robert Greenwalt [Sat, 29 Jan 2011 14:55:38 +0000 (06:55 -0800)]
am
6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '
6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
Robert Greenwalt [Sat, 29 Jan 2011 14:44:35 +0000 (06:44 -0800)]
am
19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb
* commit '
19eecb028fe094e5f41d9ddeb1e6aac1d096da43':
Don't use mobile networktype icon if not connected
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Robert Greenwalt [Sat, 29 Jan 2011 14:35:57 +0000 (06:35 -0800)]
Merge "Don't use mobile networktype icon if not connected" into honeycomb
Justin Ho [Sat, 29 Jan 2011 06:54:11 +0000 (22:54 -0800)]
am
9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
* commit '
9b1df1646ff4d480eebe2fd9cd394915b7925e92':
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
Justin Ho [Sat, 29 Jan 2011 06:51:51 +0000 (22:51 -0800)]
Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
Justin Ho [Sat, 29 Jan 2011 06:28:40 +0000 (22:28 -0800)]
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
Justin Ho [Sat, 29 Jan 2011 03:21:33 +0000 (19:21 -0800)]
am
9371f703: Merge "New honeycomb sound set" into honeycomb
* commit '
9371f7030011da2bcc45587e59a40a498f92dfb4':
New honeycomb sound set
Justin Ho [Sat, 29 Jan 2011 03:18:51 +0000 (19:18 -0800)]
Merge "New honeycomb sound set" into honeycomb
Justin Ho [Thu, 27 Jan 2011 05:59:12 +0000 (21:59 -0800)]
New honeycomb sound set
Change-Id: Iaf3062f57f613702ea946fdf65e02f6265342ad5
Joe Onorato [Sat, 29 Jan 2011 02:50:03 +0000 (18:50 -0800)]
am
a0f2cdb5: Merge "999" into honeycomb
* commit '
a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
999
Joe Onorato [Sat, 29 Jan 2011 02:47:57 +0000 (18:47 -0800)]
Merge "999" into honeycomb
Joe Onorato [Sat, 29 Jan 2011 00:53:13 +0000 (16:53 -0800)]
999
Bug:
3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
Mathias Agopian [Sat, 29 Jan 2011 02:40:44 +0000 (18:40 -0800)]
am
231da079: Merge "fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
* commit '
231da079c93664fa7d81c7e957990f17a6334b17':
fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown
Mathias Agopian [Sat, 29 Jan 2011 02:38:58 +0000 (18:38 -0800)]
Merge "fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
Mathias Agopian [Sat, 29 Jan 2011 02:23:24 +0000 (18:23 -0800)]
fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.
Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
Jason Sams [Sat, 29 Jan 2011 02:00:09 +0000 (18:00 -0800)]
am
bd08c7c0: Merge "Clean up RS samples for SDK, bug
2943369 Fix bug
3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
* commit '
bd08c7c0c99fa84dbf3c043f4e6dff07320410b7':
Clean up RS samples for SDK, bug
2943369 Fix bug
3403965 rsgSyncAll would not mark constants as changed found by inspection.
Jason Sams [Sat, 29 Jan 2011 01:58:04 +0000 (17:58 -0800)]
am
c8f6b6fb: Merge "DO NOT MERGE Bug
2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
* commit '
c8f6b6fbbc853bd89a7def780e8d9a4cabe6d0e2':
DO NOT MERGE Bug
2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
Jason Sams [Sat, 29 Jan 2011 01:56:28 +0000 (17:56 -0800)]
Merge "Clean up RS samples for SDK, bug
2943369 Fix bug
3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
Jason Sams [Sat, 29 Jan 2011 01:56:09 +0000 (17:56 -0800)]
Merge "DO NOT MERGE Bug
2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
Xavier Ducrohet [Sat, 29 Jan 2011 01:23:45 +0000 (17:23 -0800)]
am
f597f750: Merge "LayoutLib: update with Pair API." into honeycomb
* commit '
f597f750392a26e1bc33430ff52e2dd3674c875b':
LayoutLib: update with Pair API.
Xavier Ducrohet [Sat, 29 Jan 2011 01:21:57 +0000 (17:21 -0800)]
Merge "LayoutLib: update with Pair API." into honeycomb
Irfan Sheriff [Sat, 29 Jan 2011 01:19:38 +0000 (17:19 -0800)]
am
739f6bc6: Keep never as the default wifi sleep settings
* commit '
739f6bc675c0caa11a1d46b18de24e6c884f723a':
Keep never as the default wifi sleep settings
Robert Greenwalt [Sat, 29 Jan 2011 01:17:49 +0000 (17:17 -0800)]
Don't use mobile networktype icon if not connected
bug:
3398345
Change-Id: I0e8beb54e909e02bc551c54d65c5fed8e4e8cb10
Irfan Sheriff [Sat, 29 Jan 2011 00:43:12 +0000 (16:43 -0800)]
Keep never as the default wifi sleep settings
Bug:
3404049
Change-Id: I824b8cb7b28223cfb4eb89cabc7cb237a4e1e6db
Xavier Ducrohet [Fri, 28 Jan 2011 20:46:12 +0000 (12:46 -0800)]
LayoutLib: update with Pair API.
Change-Id: Iba945153f7544872ea84e3311584223aea740e2e
Joe Onorato [Sat, 29 Jan 2011 00:39:44 +0000 (16:39 -0800)]
am
430dde3e: Merge "Don\'t force all views to be asking for lights out just because somebody did." into honeycomb
* commit '
430dde3ef3b9b82bfca4ae51e225c6ad88aee514':
Don't force all views to be asking for lights out just because somebody did.
Joe Onorato [Sat, 29 Jan 2011 00:38:01 +0000 (16:38 -0800)]
Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb
Joe Onorato [Sat, 29 Jan 2011 00:36:16 +0000 (16:36 -0800)]
Don't force all views to be asking for lights out just because somebody did.
Bug:
3396308
Bug:
3395422
Change-Id: Ic97a689bda12d3b53a6ecace504d411f2beb87d5
Dianne Hackborn [Sat, 29 Jan 2011 00:35:40 +0000 (16:35 -0800)]
am
6ec44395: Merge "Fix issue #
3403539: WordPress crashes on Honeycomb" into honeycomb
* commit '
6ec44395f304a478fb56f20ca5e941514ed0a48e':
Fix issue #
3403539: WordPress crashes on Honeycomb
Dianne Hackborn [Sat, 29 Jan 2011 00:34:02 +0000 (16:34 -0800)]
Merge "Fix issue #
3403539: WordPress crashes on Honeycomb" into honeycomb
Jim Miller [Sat, 29 Jan 2011 00:26:05 +0000 (16:26 -0800)]
am
6354dd0b: Merge "Fix
3403858: Remove lock icons from status1 area." into honeycomb
* commit '
6354dd0b3e507b2afebc5ba41cd57866ade5ba94':
Fix
3403858: Remove lock icons from status1 area.
Chet Haase [Sat, 29 Jan 2011 00:23:45 +0000 (16:23 -0800)]
am
691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
* commit '
691d43c35fb953c2f70830d3ebd890a43b54cae3':
Fixed LayoutTransition bug moving multiple views
Jim Miller [Sat, 29 Jan 2011 00:21:38 +0000 (16:21 -0800)]
Merge "Fix
3403858: Remove lock icons from status1 area." into honeycomb
Chet Haase [Sat, 29 Jan 2011 00:19:32 +0000 (16:19 -0800)]
Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
Jason Sams [Fri, 28 Jan 2011 23:49:07 +0000 (15:49 -0800)]
Clean up RS samples for SDK, bug
2943369
Fix bug
3403965 rsgSyncAll would not mark constants as changed
found by inspection.
Only rsAllocation.cpp affects on device bits.
Change-Id: I6b7ec0df87e42687b24384aaf54dc04976cb84f7
doc update
Change-Id: Id5841f08868557e086f185024470924ef202d19f
Jason Sams [Fri, 28 Jan 2011 23:50:38 +0000 (15:50 -0800)]
DO NOT MERGE
Bug
2943369 RS SDK
Remove typedef for quat type which was pushed back to mr1.
Change-Id: Ice2ad6c766ee786105a8d70fc9457a98e19b5af3
Jim Miller [Fri, 28 Jan 2011 23:54:49 +0000 (15:54 -0800)]
Fix
3403858: Remove lock icons from status1 area.
Change-Id: Ib311f7a9dd4c46965263b3cf72994aab5d2dfb0d
Chet Haase [Fri, 28 Jan 2011 22:13:22 +0000 (14:13 -0800)]
Fixed LayoutTransition bug moving multiple views
The problem was that there can be >1 animation spawned for each
view in a container, if there are multiple events that trigger
a transition. These animations would potentially clobber object
layout values, causing problems as successive animations tried to use those
clobbered values to set up their own animation values.
The fix is to track the created animations and cancel them as future
animations on those same objects get created. This mechanism used to
be in the code (the bug came about when that mechanism went away), but
was removed because of memory leaks of never removing animations that
were set up but never started. The new approach also caches pending
animations, but runs a second aniamtor to delete the entries in that
collection just in case.
Change-Id: If60c7d188712334dea69d0794dc6b4ce29ca6c09
Jean-Baptiste Queru [Fri, 28 Jan 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Delete browerplugin tests - do not merge"
Eric Fischer [Fri, 28 Jan 2011 23:11:14 +0000 (15:11 -0800)]
am
0982dc64: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
0982dc6488a921d9d54d23b9180a9acf33c61526':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 23:09:16 +0000 (15:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Justin Ho [Fri, 28 Jan 2011 23:05:07 +0000 (15:05 -0800)]
am
20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb
* commit '
20af1c57de9651b93a35b67418263b88bc83f3e4':
Correct font size for notifications & control panel.
Justin Ho [Fri, 28 Jan 2011 23:02:55 +0000 (15:02 -0800)]
Merge "Correct font size for notifications & control panel." into honeycomb
Eric Fischer [Fri, 28 Jan 2011 22:54:54 +0000 (14:54 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I385b9dbf5908ad7030263bc586fba2ebdfe7cf85
Brian Muramatsu [Fri, 28 Jan 2011 22:53:07 +0000 (14:53 -0800)]
am
9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
* commit '
9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
Fix TextUtils#commaEllipsize
Brian Muramatsu [Fri, 28 Jan 2011 22:51:10 +0000 (14:51 -0800)]
Merge "Fix TextUtils#commaEllipsize" into honeycomb
Robert Greenwalt [Fri, 28 Jan 2011 22:48:37 +0000 (14:48 -0800)]
Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.
bug:
3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
Romain Guy [Fri, 28 Jan 2011 22:20:01 +0000 (14:20 -0800)]
am
b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #
3400461" into honeycomb
* commit '
b0c939adfa339c5cbb7f458072119269368b3ba5':
Prevent crash when detaching a SurfaceView. Bug #
3400461
Eric Fischer [Fri, 28 Jan 2011 22:19:36 +0000 (14:19 -0800)]
am
5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Romain Guy [Fri, 28 Jan 2011 22:17:45 +0000 (14:17 -0800)]
Merge "Prevent crash when detaching a SurfaceView. Bug #
3400461" into honeycomb
Jamie Gennis [Fri, 28 Jan 2011 22:15:44 +0000 (14:15 -0800)]
am
2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
* commit '
2a8f8d57d23a171eaa367faa143f45fdd2f9cc1c':
Quiet the SurfaceFlingerClient dequeueBuffer error.
Jamie Gennis [Fri, 28 Jan 2011 22:12:57 +0000 (14:12 -0800)]
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 22:11:17 +0000 (14:11 -0800)]
Fix issue #
3403539: WordPress crashes on Honeycomb
Change-Id: Ia86e26b5bd266d8e3362a04e412a58b98a062d5f
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Gilles Debunne [Fri, 28 Jan 2011 22:10:08 +0000 (14:10 -0800)]
am
d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb
* commit '
d11f5d2c5e41b4f2f5bda5ecca793efd2ab2300b':
Fix for TextView's error popup behavior when using soft keyboard.
Gilles Debunne [Fri, 28 Jan 2011 22:07:12 +0000 (14:07 -0800)]
Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb
Adam Powell [Fri, 28 Jan 2011 22:01:06 +0000 (14:01 -0800)]
am
6b2fda9f: Merge "Fix bug
3399992 - Make ActionBar menu text styleable" into honeycomb
* commit '
6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
Fix bug
3399992 - Make ActionBar menu text styleable
Adam Powell [Fri, 28 Jan 2011 21:58:28 +0000 (13:58 -0800)]
Merge "Fix bug
3399992 - Make ActionBar menu text styleable" into honeycomb
Joe Onorato [Fri, 28 Jan 2011 21:43:22 +0000 (13:43 -0800)]
am
cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* commit '
cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
Make keyguard also ask to turn the back button off, now that it is controlled separately.
Allow independent control of the back and the other navigation buttons.
Allow the status bar disable flags to be used as View's system ui visibility fields.
Joe Onorato [Fri, 28 Jan 2011 21:43:17 +0000 (13:43 -0800)]
am
94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
* commit '
94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
Adam Powell [Fri, 28 Jan 2011 21:42:04 +0000 (13:42 -0800)]
Fix bug
3399992 - Make ActionBar menu text styleable
Change-Id: Ic67d167c024332575ca3b79725f012a919146286
Joe Onorato [Fri, 28 Jan 2011 21:40:45 +0000 (13:40 -0800)]
Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* changes:
Make keyguard also ask to turn the back button off, now that it is controlled separately.
Allow independent control of the back and the other navigation buttons.
Allow the status bar disable flags to be used as View's system ui visibility fields.
Joe Onorato [Fri, 28 Jan 2011 21:40:28 +0000 (13:40 -0800)]
Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
Eric Fischer [Fri, 28 Jan 2011 21:16:00 +0000 (13:16 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
Daniel Sandler [Fri, 28 Jan 2011 21:00:53 +0000 (16:00 -0500)]
Correct font size for notifications & control panel.
Bug:
3388577
Bug:
3394785
Dianne Hackborn [Fri, 28 Jan 2011 20:46:51 +0000 (12:46 -0800)]
am
10e4148b: Merge "Fix issue #
3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb
* commit '
10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
Fix issue #
3291173: Problem report for NewsRoom - RSS News Reader
Dianne Hackborn [Fri, 28 Jan 2011 20:44:52 +0000 (12:44 -0800)]
Merge "Fix issue #
3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb
Xavier Ducrohet [Fri, 28 Jan 2011 20:40:30 +0000 (12:40 -0800)]
am
361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
* commit '
361d614822fcda456ba80f166e5d97447adb7e79':
LayoutLib: Update with the new resource map APIs.
Xavier Ducrohet [Fri, 28 Jan 2011 20:38:40 +0000 (12:38 -0800)]
Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 19:30:35 +0000 (11:30 -0800)]
Fix issue #
3291173: Problem report for NewsRoom - RSS News Reader
The framework had started using the LayoutInflator's factory
for itself, which breaks apps that want to use it. Add a hack for
the framework to insert its own private factory.
Also fix a deadlock in the system process.
Change-Id: Iaf80186a5d7e4029faf89e968e184abdaabe514a
Daniel Sandler [Fri, 28 Jan 2011 20:20:11 +0000 (12:20 -0800)]
am
f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
* commit '
f0ca959b02cb9e81c116f7dece0bc345fb54de0c':
Fix overlapping app icon & info in notifications with large icons.
Daniel Sandler [Fri, 28 Jan 2011 20:18:11 +0000 (12:18 -0800)]
Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
Jamie Gennis [Fri, 28 Jan 2011 20:03:52 +0000 (12:03 -0800)]
Quiet the SurfaceFlingerClient dequeueBuffer error.
This is a temporary WAR for the case where dequeueBuffer is called when
all the buffers owned by a SurfaceTexture are not available - either
they're the current texture buffer or the next one. Currently, an error
is returned in that case, and this change just prevents that error from
being logged. In the future this will be fixed to not return an error
in that case.
Bug:
3356050
Change-Id: Ic6cc304881a63ce134cfd0bcb4265e3e3fa94b6a
Dirk Dougherty [Fri, 28 Jan 2011 20:00:51 +0000 (12:00 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Daniel Sandler [Fri, 28 Jan 2011 16:10:14 +0000 (11:10 -0500)]
Fix overlapping app icon & info in notifications with large icons.
Bug:
3398728
Bug:
3394785
Change-Id: I50f065d482815612b2b187f1bc4360489d7455e6
Andreas Huber [Fri, 28 Jan 2011 19:51:16 +0000 (11:51 -0800)]
am
79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb
* commit '
79c4648597dab2b7786c8f067896ab66abe190de':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
Andreas Huber [Fri, 28 Jan 2011 19:49:03 +0000 (11:49 -0800)]
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb
Xavier Ducrohet [Fri, 28 Jan 2011 19:44:21 +0000 (11:44 -0800)]
LayoutLib: Update with the new resource map APIs.
Change-Id: I30d83c2bb4569513f4f5e22670cffe938706f105
Romain Guy [Fri, 28 Jan 2011 19:28:53 +0000 (11:28 -0800)]
Prevent crash when detaching a SurfaceView.
Bug #
3400461
Change-Id: I837d9d47b12bc5a8798b6dbb720de43b7539c3bc
Daniel Sandler [Fri, 28 Jan 2011 19:23:47 +0000 (11:23 -0800)]
am
2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb
* commit '
2ded7ef444d4e089e0ce4874c791f19ec198fc36':
Allow taps to once again penetrate the darkness.
Daniel Sandler [Fri, 28 Jan 2011 19:21:27 +0000 (11:21 -0800)]
Merge "Allow taps to once again penetrate the darkness." into honeycomb