40874 Commits

Author SHA1 Message Date
Eric Rowe
993add8297 am a0d4d80f: DO NOT MERGE Cleaned up BT test utils
* commit 'a0d4d80fd2feaa04cb5f5242acd159cd783b25d4':
  DO NOT MERGE Cleaned up BT test utils
2011-01-18 19:06:34 -08:00
Jeff Brown
fb75738ee2 Never drag scroll views with no children.
Fixes a regression from Froyo.  Previously, when a scroll view
had no children, its onTouchEvent would return because the scroll
view would only start dragging if the user touched one of its children.
In Gingerbread, the user can drag from anywhere within the scroll
view, not just by touching a child.  However, it makes no sense
to drag a scroll view that has no children so an empty scroll view
should just ignore touches like any other empty view group would.

This change fixes applications that for some reason or other happen
to have empty scroll views in strange places.

Bug: 3246230
Change-Id: Iada6e886e8363e6778f42fc4861de228512d8bed
2011-01-18 18:42:33 -08:00
Romain Guy
3e4f4b8857 am 064f6ad3: Merge "Recreate the EGL surface when ViewRoot\'s surface changes. Bug #3306150" into honeycomb
* commit '064f6ad3928c51996359694c00a580115b2dabfc':
  Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150
2011-01-18 18:41:29 -08:00
Jason Sams
a11b2e8a34 am e70b445d: Merge "Correctly log debugging info as debug." into honeycomb
* commit 'e70b445d2fb128b831b84408f0c9f2b499918ced':
  Correctly log debugging info as debug.
2011-01-18 18:41:22 -08:00
Jason Sams
17cab460b1 am e6a97e27: Merge "Fix race condition between GC thread and the teardown of RS. The RS context was going away while the objects were being deleted within the finializer." into honeycomb
* commit 'e6a97e27bcc1b8320fbe09d7827aec8050ebef01':
  Fix race condition between GC thread and the teardown of RS.  The RS context was going away while the objects were being deleted within the finializer.
2011-01-18 18:41:14 -08:00
Jason Sams
752d2bf9a9 am 148594a0: Merge "Cleanup logs." into honeycomb
* commit '148594a0151ddf4978a9d796b5541cca3407fb89':
  Cleanup logs.
2011-01-18 18:41:04 -08:00
Guang Zhu
e97cc1a286 am c3db7c8f: Merge "further remove calls to runFinalization" into honeycomb
* commit 'c3db7c8f3bc9af38d0f4ad2c66ff696c115c036a':
  further remove calls to runFinalization
2011-01-18 18:40:55 -08:00
Adam Powell
6cd8a98d6e am 92375756: Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb
* commit '923757567ec834c0a1e2c68f4951990046e6e3c1':
  Fix bug 3362979 - Holo light overflow button has stale focused state
2011-01-18 18:40:51 -08:00
Stephen Hines
5df7b84048 am 66934423: Merge "Provide mechanism to switch between extern/static." into honeycomb
* commit '66934423c8d398b7d0661bba6dba0ddcab2352e3':
  Provide mechanism to switch between extern/static.
2011-01-18 18:40:39 -08:00
Dianne Hackborn
a4605b72c2 am e6413270: Merge "Just a little \'ol activity manager permission change." into honeycomb
* commit 'e64132705279fea1769af3e5ef5c7384a2fef5d4':
  Just a little 'ol activity manager permission change.
2011-01-18 18:40:29 -08:00
Dianne Hackborn
fe86e9793c am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
* commit '661b6cfb2bcecdd335540db7059e5d8e22c2e79a':
  Okay, new plan for dialogs.
2011-01-18 18:40:22 -08:00
Elliott Hughes
b28c5eccab am ea6a3c70: Merge "Minor updates." into honeycomb
* commit 'ea6a3c706ada7db1abeda609aa5d1ba9209c7f2b':
  Minor updates.
2011-01-18 18:39:36 -08:00
Adam Powell
eb7a7a044a am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
* commit '6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590':
  Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
2011-01-18 18:39:10 -08:00
Mathias Agopian
246bd60efa am fc14d42b: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
* commit 'fc14d42b75d25b5062613333331839c895621f3b':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails
2011-01-18 18:39:02 -08:00
Christopher Tate
31cd02ade3 am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
* commit '17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
  API CHANGE: add a no-View ctor for DragShadowBuilder
2011-01-18 18:36:06 -08:00
Romain Guy
069f9b6352 am 745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
* commit '745a529249c346656a404e38333f6d0ce6503fd7':
  Smoother pinch-zoom in Browser.
2011-01-18 18:35:50 -08:00
Jack Palevich
79f74eda8a am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
* commit 'a228e4f833b96e0633571735c2363e30363e155c':
  Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
2011-01-18 18:35:42 -08:00
John Reck
733e2047e7 am c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
* commit 'c098c1d348a183635561c504ccd67a9014a45475':
  Create db path if it doesn't exit
2011-01-18 18:35:35 -08:00
Eric Rowe
f38bddbeb4 DO NOT MERGE Add connect HID/NAP BT stress test
Change-Id: I1d8cd5cb45583d1c4c5e94e72abbd8a9f04f53cf
2011-01-18 18:33:29 -08:00
Eric Rowe
a0d4d80fd2 DO NOT MERGE Cleaned up BT test utils
Change-Id: I905a468a04b5730258a9e6525165e4c4013d30c8
2011-01-18 18:33:29 -08:00
Romain Guy
2a83f001fd Recreate the EGL surface when ViewRoot's surface changes.
Bug #3306150

Change-Id: Ifbf0ab9deca7a34eff7d844ea7276d12d7284788
2011-01-18 18:28:21 -08:00
Romain Guy
064f6ad392 Merge "Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150" into honeycomb 2011-01-18 18:26:22 -08:00
Jason Sams
e70b445d2f Merge "Correctly log debugging info as debug." into honeycomb 2011-01-18 18:22:56 -08:00
Jason Sams
bf2afed1f2 Correctly log debugging info as debug.
Change-Id: I1169e015288d7d91b7ecbdd991e815152740e68d
2011-01-18 18:22:19 -08:00
Jason Sams
e6a97e27bc Merge "Fix race condition between GC thread and the teardown of RS. The RS context was going away while the objects were being deleted within the finializer." into honeycomb 2011-01-18 18:18:06 -08:00
Jason Sams
148594a015 Merge "Cleanup logs." into honeycomb 2011-01-18 18:13:07 -08:00
Jason Sams
d1ac981497 Fix race condition between GC thread and
the teardown of RS.  The RS context was going away while
the objects were being deleted within the finializer.

Add more debugging for playCoreCommands.

Change-Id: I391f0b4db948f43f54017b47b062ab47d6a1ef64
2011-01-18 18:12:26 -08:00
Guang Zhu
c3db7c8f3b Merge "further remove calls to runFinalization" into honeycomb 2011-01-18 18:05:50 -08:00
Guang Zhu
3974be6163 further remove calls to runFinalization
apparently these calls may deadlock as well...

Change-Id: I83132aa50f4e49a170be2b960f6c3236f14745c9
2011-01-18 18:04:34 -08:00
Adam Powell
923757567e Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb 2011-01-18 18:03:23 -08:00
Adam Powell
0e6c3385eb Fix bug 3362979 - Holo light overflow button has stale focused state
Change-Id: Id16dbbe2e800109b3cc2b491f3cd2c1e19c3bac2
2011-01-18 18:02:39 -08:00
Stephen Hines
66934423c8 Merge "Provide mechanism to switch between extern/static." into honeycomb 2011-01-18 17:50:19 -08:00
Dianne Hackborn
e641327052 Merge "Just a little 'ol activity manager permission change." into honeycomb 2011-01-18 17:49:05 -08:00
Dianne Hackborn
661b6cfb2b Merge "Okay, new plan for dialogs." into honeycomb 2011-01-18 17:48:22 -08:00
Dianne Hackborn
ef57575887 Okay, new plan for dialogs.
Don't dismiss by default when tapping outside, even for AlertDialog.

If AlertDialog doesn't have any buttons, tapping outside will dismiss it.

Applications can make their own dialogs (or activities looking like
dialogs) can use the existing and new APIs to control this behavior
themselves so that it does the right thing.

Change-Id: I02bfb9161e169de0033200211b3a7ec80080bd83
2011-01-18 17:35:17 -08:00
Elliott Hughes
ea6a3c706a Merge "Minor updates." into honeycomb 2011-01-18 17:25:05 -08:00
Elliott Hughes
c3839d3242 Minor updates.
Take into account Gingerbread JIT and GC improvements.

Change-Id: I170def3ac1ecac0ba88258b8d6bfdd77cb2f7f9a
2011-01-18 17:13:06 -08:00
Dianne Hackborn
6c2c5fc993 Just a little 'ol activity manager permission change.
We no longer enforce permissions for applications that are accessing
their own components.  This allows an application to require a permission
on one of its components that it does not itself have.  This is useful
for example with the new advanced widgets, which require a system-only
permission on the implementing service to ensure the app's data stays
private but it is nice to allow the application to still touch its own
widget service.

Change-Id: I5d61930a083816919545870039ad191314ed48c6
2011-01-18 17:02:33 -08:00
Jim Miller
31dae92650 Fix 3356338: Add recovery text to AccountUnlockScreen
This adds hint text to visit google.com/account/recovery if
the user forgets their google password.

Change-Id: I4c4c250b9e4116d2769b7760fdc291fa756c3db0
2011-01-18 17:02:04 -08:00
Adam Powell
6cfc7a0acb Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb 2011-01-18 16:57:59 -08:00
Stephen Hines
793786c258 Provide mechanism to switch between extern/static.
Change-Id: I59b1b45cc335278f92b68581594ca68115b9a590
2011-01-18 16:53:19 -08:00
Mathias Agopian
fc14d42b75 Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb 2011-01-18 16:52:33 -08:00
Adam Powell
a1e6358a4c Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
Change-Id: I9e7ec4ab14c6008397d26c499ccf478f8875f918
2011-01-18 16:51:22 -08:00
Nick Pelly
b6b426ad1c Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp 2011-01-18 16:10:48 -08:00
Christopher Tate
17ed60c3d2 API CHANGE: add a no-View ctor for DragShadowBuilder
Cf conversation with the API council.  Also expand the javadoc
a bit.

Change-Id: I9d4edb1042e00492b3db5c6bb7c7d9648581efad
2011-01-18 16:07:06 -08:00
Romain Guy
745a529249 Merge "Smoother pinch-zoom in Browser." into honeycomb 2011-01-18 15:55:31 -08:00
Jack Palevich
a228e4f833 Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb 2011-01-18 15:54:29 -08:00
John Reck
c098c1d348 Merge "Create db path if it doesn't exit" into honeycomb 2011-01-18 15:53:33 -08:00
Jack Palevich
75f2bc04df Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
2011-01-18 15:53:25 -08:00
Mathias Agopian
2e102a05ca fix [3361121] hang in glClear() - device unresponsive, OTA fails
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.

Change-Id: I1f226b1ebdf6918439b687c2723955d55b842c55
2011-01-18 15:51:30 -08:00