Commit Graph

23289 Commits

Author SHA1 Message Date
Dianne Hackborn
73b4c4023e am 3d2818d3: Remove public resource padding.
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp

* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
  Remove public resource padding.
2010-10-18 18:41:12 -07:00
Shih-wei Liao
1fe3e8de82 Merge "Remove unneeded inclusion of rs_math.rsh." 2010-10-18 18:12:42 -07:00
Jeff Brown
0932017430 Merge "Add support for calibrating touch position." 2010-10-18 17:42:04 -07:00
Adam Cohen
0bf42ba24c Merge "Cleaned up the way StackView draws outside of its bounds" 2010-10-18 17:30:46 -07:00
Jeff Brown
60b5776c87 Add support for calibrating touch position.
Useful for tweaking touch screen alignment without having to modify the
kernel device driver x/y axis bounds.

Change-Id: I6ca43d3c138548f9dfb76aa33150a0c853698fb6
2010-10-18 17:24:49 -07:00
Gilles Debunne
ea91df4541 resolved conflicts for merge of 6775754a to master
Change-Id: Ib03417aa3f13839b7fdf24f7d66b2d449589d41e
2010-10-18 17:19:57 -07:00
Brad Fitzpatrick
221634f633 am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread
Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp

* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
  StrictMode: fix docs to actually compile and add a utility method.
2010-10-18 17:04:55 -07:00
Shimeng (Simon) Wang
8043106caf am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp

* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
  Don't force ended when full screen video is returned manually.
2010-10-18 17:04:47 -07:00
Brad Fitzpatrick
5522e5f34c Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 2010-10-18 16:46:03 -07:00
Ben Murdoch
582179e6dd am 06ff27f0: am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread
Merge commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83'

* commit '06ff27f0cb9eeb53fd35233a30ef5cc5e5586d83':
  Add the HTML5Audio class, to support the audio tag.
2010-10-18 16:42:34 -07:00
Nick Pelly
79912a6c71 am 6b09a90a: am e47150e9: Fix up NFC permissions.
Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e'

* commit '6b09a90a818137de52a0c7325339849ccf584b9e':
  Fix up NFC permissions.
2010-10-18 16:42:18 -07:00
Shimeng (Simon) Wang
95ea513755 Merge "Don't force ended when full screen video is returned manually." into gingerbread 2010-10-18 16:40:25 -07:00
Nick Pelly
519d9127ac am 774b943f: am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
Merge commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65'

* commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
2010-10-18 16:39:30 -07:00
Sylvain Fonteneau
425bfd8dbf am 73cd4fff: am a926540d: Implement methods introduced in draft #5 NFC API.
Merge commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b'

* commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b':
  Implement methods introduced in draft #5 NFC API.
2010-10-18 16:38:50 -07:00
Jaikumar Ganesh
ab414bb763 Merge "Fix race condition between starting of service and getting the Profile Proxy." 2010-10-18 15:59:55 -07:00
Nick Pelly
5a989fc343 am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
Merge commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa' into gingerbread-plus-aosp

* commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa':
  NFC: broadcast intent constants for adapter state change
2010-10-18 15:23:17 -07:00
Nick Pelly
b78ea998eb am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread
Merge commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce' into gingerbread-plus-aosp

* commit '8f1e7b62d87b6e2f5fbc9609baf1dea7873218ce':
  Cleanspec to fix incremental build failures of the form:
2010-10-18 15:20:36 -07:00
Mike Lockwood
8a779d00fa am 5d5a9db5: Merge "GPS: Enable some more logging" into gingerbread
Merge commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747' into gingerbread-plus-aosp

* commit '5d5a9db514a9cf42fbc189fc3af6da602d89b747':
  GPS: Enable some more logging
2010-10-18 15:20:31 -07:00
Nick Pelly
77371310a6 Merge "NFC: broadcast intent constants for adapter state change" into gingerbread 2010-10-18 15:18:59 -07:00
Nick Pelly
bbb2083f33 Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread 2010-10-18 15:17:23 -07:00
Jeff Brown
c0bc4a3976 am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread
Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp

* commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5':
  Fix bug where home presses were not poking user activity.
2010-10-18 15:17:12 -07:00
Andreas Huber
cd7063515e am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.
Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp

* commit 'd68cda472a3646966a203338ccac04f0783293b7':
  An attempt to unregister a handler that's no longer registered should not cause an assertion.
2010-10-18 15:17:07 -07:00
Mike Lockwood
5232a101ad Merge "GPS: Enable some more logging" into gingerbread 2010-10-18 15:14:46 -07:00
Romain Guy
ce3fb26c96 Merge "Small cleanup." 2010-10-18 15:14:16 -07:00
Jeff Brown
d88671ab8c Merge "Fix bug where home presses were not poking user activity." into gingerbread 2010-10-18 15:13:33 -07:00
Romain Guy
096c355ecf Merge "Use VBOs to render most geometries." 2010-10-18 14:58:25 -07:00
Jeff Brown
ef3a823482 Fix bug where home presses were not poking user activity.
We now poke user activity twice: once upon dequeueing an event
for dispatch and then again just before we dispatch it.  The second
poke is to compensate for the fact that it can take a few seconds to
identify the dispatch target (if the application is responding slowly)
but we want to keep the display from going to sleep for X amount of time
after the app gets a chance to actually receive the event.  This mirrors
pre-Gingerbread behavior.

Removed some unnecessary code that filters user activity pokes when sending
events to KeyGuard.  We don't need this because KeyGuard already tells the
power manager to disable user activity.

Bug: 3101397
Change-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db
2010-10-18 14:50:13 -07:00
Adam Powell
64cedc1abe am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
Merge commit '9f85ef4aebf510546355866b7cc458551ae3aa7f' into gingerbread-plus-aosp

* commit '9f85ef4aebf510546355866b7cc458551ae3aa7f':
  DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
2010-10-18 14:23:14 -07:00
Adam Powell
92866ad00b Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread 2010-10-18 14:19:52 -07:00
Mike Lockwood
44dbe44464 am ba2ec2b4: Merge "Enable framework GPS and location manager logging" into gingerbread
Merge commit 'ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1' into gingerbread-plus-aosp

* commit 'ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1':
  Enable framework GPS and location manager logging
2010-10-18 14:19:09 -07:00
Mike Lockwood
b9d9de2bdf Merge "Enable framework GPS and location manager logging" into gingerbread 2010-10-18 14:16:15 -07:00
Gilles Debunne
3aed54cc3a Merge "Fix for text selection at end of line." 2010-10-18 14:10:44 -07:00
Brian Carlstrom
af66eda6e7 Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents" 2010-10-18 13:58:25 -07:00
Eric Rowe
b7f0eeb2b0 am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread
Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp

* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
  DO NOT MERGE Add additional options and receiver to BT tests
2010-10-18 13:56:31 -07:00
Eric Rowe
661ef589b8 Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread 2010-10-18 13:53:48 -07:00
John Huang
99fddbcf44 am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
Merge commit '45bd8303fe20f20843f5a76ddf42a5ace54add58' into gingerbread-plus-aosp

* commit '45bd8303fe20f20843f5a76ddf42a5ace54add58':
  Uncomment SIP/VOIP feature check in SipManager.
2010-10-18 13:44:57 -07:00
John Huang
73aa416a59 am 382717f3: Merge "Set the thread pool size of NIST sip stack to one." into gingerbread
Merge commit '382717f3eeca1a21e9756c7de42b4d31747d1675' into gingerbread-plus-aosp

* commit '382717f3eeca1a21e9756c7de42b4d31747d1675':
  Set the thread pool size of NIST sip stack to one.
2010-10-18 13:42:31 -07:00
John Huang
2d512f5736 Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread 2010-10-18 13:41:04 -07:00
John Huang
c346fa137b Merge "Set the thread pool size of NIST sip stack to one." into gingerbread 2010-10-18 13:39:33 -07:00
Joe Onorato
a02711185b am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread
Merge commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42' into gingerbread-plus-aosp

* commit 'a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42':
  Pressing the power button quickly needs to turn the screen on and off correctly.
2010-10-18 13:16:42 -07:00
Joe Onorato
3e640596eb Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread 2010-10-18 13:14:16 -07:00
Kenny Root
8726da0f64 resolved conflicts for merge of 964eb438 to master
Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e
2010-10-18 13:03:35 -07:00
Stephen Hines
b8fd32a430 Merge "Adding new unit test for rsDebug()." 2010-10-18 12:27:54 -07:00
Steve Block
cd32c632b0 Merge changes I4a85ff69,Idba4acc2
* changes:
  Fix DumpRenderTree2 script to allow only one path to be specified
  Improve error handling in DumpRenderTree2 scripts
2010-10-18 12:23:28 -07:00
Nick Pelly
2f1d7c3b8e am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp

* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
  Prevent use of NFC api if device is not featurized for NFC.
2010-10-18 12:04:16 -07:00
Nick Pelly
8a1c39374c Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 2010-10-18 12:00:48 -07:00
Andreas Huber
c283c2e2c5 am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp

* commit 'bc96c2848dadaa844f95e89708d9941f73bbf400':
  For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
2010-10-18 11:50:19 -07:00
Ying Wang
4564c6510a am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread
Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp

* commit '004f968d0cf60c08d7b393129ed2d6e4304041e5':
  Link against the static libcrypto in external/openssl.
2010-10-18 11:50:08 -07:00
Andreas Huber
0918dd2f05 Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread 2010-10-18 11:46:44 -07:00
Stephen Hines
a3fa97091c Merge "Add support for rsDebug with 64-bit types." 2010-10-18 11:45:16 -07:00