41785 Commits

Author SHA1 Message Date
Mathias Agopian
1955a5c9da Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:14 -08:00
Mathias Agopian
d0441f921b Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:09 -08:00
Mathias Agopian
043a3cddf6 Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:05 -08:00
Mathias Agopian
d3fcd0a1c9 Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread 2011-01-25 14:42:59 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
2011-01-25 14:41:55 -08:00
Adam Powell
e2b03a62e5 Fix bug 3387855 - Menu flashes on left side of screen
Post popup menu click events rather than executing inline so that the
popup can close undisturbed.

Change-Id: I01481bd37d7921c10c6b8b484eab33f0d25447ff
2011-01-25 14:40:36 -08:00
Jeff Hamilton
f126ad3b64 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
2011-01-25 16:32:26 -06:00
Scott Main
31e5c30f02 Merge "docs: revise and amend platform notes for preview" into honeycomb 2011-01-25 14:21:28 -08:00
Jeff Brown
3168a13723 Merge "Fix surface frame size reporting." into honeycomb 2011-01-25 14:21:00 -08:00
Gilles Debunne
47fc854ae9 Merge "Fix for a call to startActivity from outside of an app." into honeycomb 2011-01-25 14:20:09 -08:00
Mathias Agopian
21956040a7 fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.

The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.

This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.

Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.

now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.

noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
2011-01-25 14:19:13 -08:00
Mathias Agopian
68d3478860 partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
We used to guarantee that a layer in SurfaceFlinger would never be
destroyed before all references (to its ISurface) on the client
side would be released. At some point, this guarantee got
relaxed to allow to free gralloc resources sooner. This last
change was incorrect, because:
- in implementations with reference-counting the gralloc resources
wouldn't be released anyways, until all the mapping were gone
- in implementations without ref counting, the client side
would most likely crash or do something bad
- it also caused the SharedBufferStack slot to be reallocated
to another surface, which could be problematic if the client
continued to use the surface after the window manager destroyed it.

So, we essentially reinstate the guarantee that layers won't be
destroyed until after all references to their ISurface are
released.

NOTE: This doesn't entirely fix 3306150 because there is another
problem there where the Browser continues to use a surface after it
has been destroyed.

also improve SurfaceFlinger 'dumpsys' log

list the purgatory, which shows windows that have been closed,
but for which the client still has references.
2011-01-25 14:19:13 -08:00
Mathias Agopian
8aa11d82f3 fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
we were not clearing the screen entirely, which caused garbage when
the screen wasn't entirely covered by windows.

Change-Id: Ia7aa13c36a8a314e0e8427d419b16b9aa2165ddf
2011-01-25 14:18:58 -08:00
Mathias Agopian
84c6f5a44c workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.

Change-Id: I450430d1e4d1ee9ce1023970642378c42cdcfa4c
2011-01-25 14:18:29 -08:00
Mathias Agopian
728d849fc9 minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
2011-01-25 14:18:15 -08:00
Scott Main
7afdaf0b9c docs: revise and amend platform notes for preview
Change-Id: Ief10e85ae7c1a9c56381342e0f3b880ebe57d8ca
2011-01-25 14:09:11 -08:00
Dianne Hackborn
a290977312 am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb
* commit '4426f643ec3833e830bc2f9b8af5088343de1315':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
2011-01-25 14:08:10 -08:00
Dianne Hackborn
4426f643ec Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 2011-01-25 14:06:01 -08:00
Justin Ho
6954e9b0d9 am d00d2925: Merge changes I282a8421,I53d15f37 into honeycomb
* commit 'd00d2925ca9997c2f0fab1a8b149d91d77b79010':
  Merging Gingerbread assets into Honeycomb
  Removing old assets from SystemUI in drawable-hdpi
2011-01-25 14:03:55 -08:00
Justin Ho
d00d2925ca Merge changes I282a8421,I53d15f37 into honeycomb
* changes:
  Merging Gingerbread assets into Honeycomb
  Removing old assets from SystemUI in drawable-hdpi
2011-01-25 14:01:25 -08:00
Jaikumar Ganesh
e4d494b495 am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
  Rename virtual call API to ScoUsingVirtualCall.
2011-01-25 14:00:32 -08:00
Romain Guy
535602fe55 am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb
* commit '3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
2011-01-25 13:58:08 -08:00
Jaikumar Ganesh
5cbb162262 Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 2011-01-25 13:56:02 -08:00
Romain Guy
3ac1b0f0d4 Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb 2011-01-25 13:55:14 -08:00
Jaikumar Ganesh
dde68c64fd Rename virtual call API to ScoUsingVirtualCall.
This API makes more sense with regard to headset profile.
Bug: 3381532

Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
2011-01-25 13:49:35 -08:00
Gilles Debunne
a5b43a0492 am c927ec50: Merge "Overscoll bounce amplitude is smaller." into honeycomb
* commit 'c927ec50497bf5f477663deb7b366b37185d46b0':
  Overscoll bounce amplitude is smaller.
2011-01-25 13:47:24 -08:00
Daniel Sandler
f844dc4fa8 Fit and finish on status bar:
- Clock color fixed. [3374581]
  - Clock vertically aligned. [3388224]
  - Clock uses system font assets now. [3385564]
  - Solid version of AndroidClock added to build. [3385564]
  - Extraneous background glow removed from notification panel.
  - Removed solid black background from notifications. [3388223]
  - Added background image behind large notification icons
    and increased large size to 64dip [3388434, 3384355]
  - Corrected size & leading of notification text [3388577]

Bug: 3374581
Bug: 3384355
Bug: 3385564
Bug: 3388223
Bug: 3388224
Bug: 3388434
Bug: 3388577
Change-Id: I8e443da5758deca412d1ce5944f887b35f6265ed
2011-01-25 16:46:43 -05:00
Adam Powell
41cd1ce1b9 am f72a13ec: Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb
* commit 'f72a13ec76517ff0be297f194c88ceb0d84b85e8':
  Fix bug 3378333 - Holo-style layout for granting permissions
2011-01-25 13:45:19 -08:00
Gilles Debunne
c927ec5049 Merge "Overscoll bounce amplitude is smaller." into honeycomb 2011-01-25 13:44:32 -08:00
Adam Powell
f72a13ec76 Merge "Fix bug 3378333 - Holo-style layout for granting permissions" into honeycomb 2011-01-25 13:42:49 -08:00
Gilles Debunne
d9ed795ca5 Fix for a call to startActivity from outside of an app.
Bug 3246715

Regression introduced by https://android-git.corp.google.com/g/#change,86174

Change-Id: Icba170746d196386bd9b0309582f724cb076d937
2011-01-25 13:40:06 -08:00
Adam Powell
c91466f56a Fix bug 3378333 - Holo-style layout for granting permissions
Change-Id: Ie1bb925db3ddd8343c9756e220a0d821f4d31c6d
2011-01-25 13:34:28 -08:00
Santosh Madhava
a6714ce2bb Fix for issue 3385068 : Play gets out of sync
Change-Id: Iaf5e2f246b9cbfc5c8093d34ed085fe255ae500b
2011-01-25 13:15:43 -08:00
Jeff Brown
30bc34f191 Fix surface frame size reporting.
The SurfaceHolder provided by the wallpaper service was not reporting
the correct size in getSurfaceFrame().  This broke an optimization in
the ImageWallpaper.  The old code happened to work because calling
lockCanvas on the SurfaceHolder with a null dirty rectangle happened
to have the side-effect of updating the SurfaceHolder's surface frame
size field because it passed mSurfaceFrame as the dirty rect, causing
mSurfaceFrame to be set to the size of the region to be drawn.

However, relying on this side-effect is wrong.  Among other things,
the dirty region could actually be smaller than the surface frame.

This patch fixes WallpaperService, SurfaceView and ViewRoot to ensure
that the surface frame size is always set explicitly and is not modified
by calls to lockCanvas.

Change-Id: I10948f5ec269409ceaf0f7d32b3f6731e9499ebc
2011-01-25 13:10:30 -08:00
Romain Guy
6e81e57b52 Prevent crash in View when gathering attributes without an AttachInfo.
Bug #3385339

Change-Id: I06b6f03721b52ab0b9d13c2fb3e133ae25d99970
2011-01-25 12:59:00 -08:00
Dheeraj Sharma
4ba9e68fa9 am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb
* commit 'b8942108826893657ca0b8b6d5d6d153739a76f6':
  Video Editor:Fix for 3375632
2011-01-25 12:52:38 -08:00
Dheeraj Sharma
b894210882 Merge "Video Editor:Fix for 3375632" into honeycomb 2011-01-25 12:50:34 -08:00
Amith Yamasani
7abd7429d6 am 6bcbf54f: Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb
* commit '6bcbf54feed8ca7c1bf9b509f8581684988d45dd':
  Heed the focusability flag in SearchView and set the default to true.
2011-01-25 12:38:40 -08:00
Jeff Brown
1f26ea1306 am 561a434b: Merge "Fix emulator trackball." into honeycomb
* commit '561a434b9769217b8936eea40b564bb9615f1a12':
  Fix emulator trackball.
2011-01-25 12:36:26 -08:00
Amith Yamasani
6bcbf54fee Merge "Heed the focusability flag in SearchView and set the default to true." into honeycomb 2011-01-25 12:35:06 -08:00
Jeff Brown
561a434b97 Merge "Fix emulator trackball." into honeycomb 2011-01-25 12:33:50 -08:00
Patrick Scott
85b69e0390 Turn off picture splitting for now.
Splitting the content was causing a mismatch between the base content picture
and composited layers.  It was also happening on every single inval.

Bug: 3372320
Change-Id: I09da2d0f3cba028c355ceba2b4c8e34da5a77028
2011-01-25 15:19:45 -05:00
Amith Yamasani
7f8aef6d5b Heed the focusability flag in SearchView and set the default to true.
Bug: 3385804

Also, allow navigation through keyboard.

Change-Id: I444f142518172b35f33c2a5129179ac996d80dc7
2011-01-25 12:10:56 -08:00
Gilles Debunne
5d1c76095e am bb37b647: Merge "Fixed CAB background and selection color for legacy applications." into honeycomb
* commit 'bb37b6477fe76a045654290f2b998a61ff2632b9':
  Fixed CAB background and selection color for legacy applications.
2011-01-25 11:39:39 -08:00
Gilles Debunne
bb37b6477f Merge "Fixed CAB background and selection color for legacy applications." into honeycomb 2011-01-25 11:37:54 -08:00
Gilles Debunne
2b5a62afde am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb
* commit '2a32a39e9a0455732724bbbbbdce41e12a8ffb1e':
  Removed warnings in DynamicLayout
2011-01-25 11:36:21 -08:00
Gilles Debunne
2a32a39e9a Merge "Removed warnings in DynamicLayout" into honeycomb 2011-01-25 11:34:19 -08:00
Dianne Hackborn
7187ccb93e Fix issue #3385839: Fragment.onCreateView is passing in activity...
...context for a DialogFragment

Change-Id: I434ebca64d2738da4c27321db8dbbded2cbe167d
2011-01-25 11:28:39 -08:00
Gilles Debunne
8ce7aab79e Overscoll bounce amplitude is smaller.
Per Dan's request for poor behavior on low speed Overscrolls.

Change-Id: I184133df5e6cc68d8d9bf39edb62d42e13d27a90
2011-01-25 11:23:30 -08:00