Gilles Debunne
288e4320da
Merge "Fix for an IOOBoundsException in Paint." into honeycomb
2011-01-28 10:58:53 -08:00
Jamie Gennis
fb080b16c5
am c49283e7: am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb
...
* commit 'c49283e7aae0f4f00dc8337d2b98addc01abdd8f':
Add docs about threading to SurfaceTexture.
2011-01-28 10:46:56 -08:00
Jamie Gennis
b9470e7cf6
am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb
...
* commit '3c0f91b0e1312287a271ba890d52cdb8bb75e52d':
Add docs about threading to SurfaceTexture.
2011-01-28 10:44:44 -08:00
Jamie Gennis
732c3a087c
Merge "Add docs about threading to SurfaceTexture." into honeycomb
2011-01-28 10:42:53 -08:00
Andreas Huber
bf0a277b0b
am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
...
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
2011-01-28 10:42:10 -08:00
Leon Scroggins
48bf319f3b
am f53e3155: am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb
...
* commit 'f53e31551aeca325216e72e76d616f06c1fc14f9':
Only send a direction key if we are not in touch mode.
2011-01-28 10:36:34 -08:00
Leon Scroggins
58535fe2fc
am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb
...
* commit 'e891a115a01d377dc17c0dd658ba23fb5d033e23':
Only send a direction key if we are not in touch mode.
2011-01-28 10:34:14 -08:00
Leon Scroggins
d554549b27
Merge "Only send a direction key if we are not in touch mode." into honeycomb
2011-01-28 10:32:35 -08:00
Chet Haase
f8f1178263
am 97908283: am fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb
...
* commit '97908283c8c7f162bf584e2ad769dc2f6b5061aa':
Fix artifact with clipped webview content
2011-01-28 10:20:53 -08:00
Chet Haase
f24293bd8a
am fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb
...
* commit 'fe38b7b79325782f682365ec9d1b8fe2932eec78':
Fix artifact with clipped webview content
2011-01-28 10:18:39 -08:00
Chet Haase
dc5f2c714f
Merge "Fix artifact with clipped webview content" into honeycomb
2011-01-28 10:16:54 -08:00
Robert Greenwalt
05a1b17c74
am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb
...
* commit 'f7784876ed2d731fae9ab8a10119f558a9adf8d7':
Fix data network type notifications.
2011-01-28 09:54:04 -08:00
Robert Greenwalt
3e5aebe951
am b8498f1d: Merge "Fix data network type notifications." into honeycomb
...
* commit 'b8498f1dcf0b4e866c940da482930789cd6554c5':
Fix data network type notifications.
2011-01-28 09:51:34 -08:00
Robert Greenwalt
8e70e7cd29
Merge "Fix data network type notifications." into honeycomb
2011-01-28 09:48:31 -08:00
Andreas Huber
9db55d7f76
am 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
...
* commit '970436ee42bad03940a73666f8150a28c5789713':
More robust parsing of NPT time ranges in RTSP.
2011-01-28 09:43:37 -08:00
Andreas Huber
1193e85b4c
am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
...
* commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4':
More robust parsing of NPT time ranges in RTSP.
2011-01-28 09:41:11 -08:00
Andreas Huber
2f313aa982
Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
2011-01-28 09:38:50 -08:00
Justin Ho
2434964eac
am e5da4b74: am 47db84cc: New stat_notify icons
...
* commit 'e5da4b74d4f4ba5fea63c4608b702d89f433b94c':
New stat_notify icons
2011-01-28 09:28:17 -08:00
Justin Ho
7a8c55c889
am 47db84cc: New stat_notify icons
...
* commit '47db84cca867c5efdd4760cdf451a9c402097668':
New stat_notify icons
2011-01-28 09:25:32 -08:00
Robert Greenwalt
c86824de5e
am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
Update networktype before sending state change.
2011-01-28 09:22:01 -08:00
Robert Greenwalt
2b1e607682
Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-28 09:08:00 -08:00
Robert Greenwalt
d9187088f6
resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
...
Change-Id: Ib9d24c211461329955288180978a7c5d383bba75
2011-01-28 09:06:30 -08:00
Glenn Kasten
16f0453fee
Protected surface API
...
To be used by DRM framework, implemented by display HAL
Change-Id: I054a07a94f4d5dbe792f3a597e2e49a100d90eb2
2011-01-28 08:04:00 -08:00
Ben Murdoch
53d95ddd3e
am 306e96c0: am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
...
* commit '306e96c0dd931c9dd83e3d580c5b79141d093646':
Implement the double tap to zoom animation with HW accleration.
2011-01-28 02:42:39 -08:00
Ben Murdoch
5803c2a5df
am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
...
* commit 'c38b7c820af52c4d5f6f51c750136d18d9897e5e':
Implement the double tap to zoom animation with HW accleration.
2011-01-28 02:35:22 -08:00
Ben Murdoch
4613570b51
Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
2011-01-28 02:27:38 -08:00
Dianne Hackborn
c560e4e3cf
am bb609471: am 256a09b2: Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
...
* commit 'bb6094718b08e7fe2054b7260a85baae635afe48':
Fix issue #3392073 : At times soft keyboard comes up in...
2011-01-27 22:53:20 -08:00
Dianne Hackborn
3a3a6ce7fe
am f1a9ab26: am d23316bc: Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
...
* commit 'f1a9ab2673a2b5e6f684f7ceced177e3fc749ee7':
Maybe fix issue #3358322 : Status and nav bar died while watching youtube
2011-01-27 22:53:13 -08:00
Dianne Hackborn
311559851f
am 256a09b2: Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
...
* commit '256a09b2fa5cc06775818428de771c7957403452':
Fix issue #3392073 : At times soft keyboard comes up in...
2011-01-27 22:50:56 -08:00
Dianne Hackborn
d7f4f7c167
am d23316bc: Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
...
* commit 'd23316bc8b49f269e5adcc91eae5698549faa0a3':
Maybe fix issue #3358322 : Status and nav bar died while watching youtube
2011-01-27 22:50:52 -08:00
Dianne Hackborn
1444bc6f0f
am 6a11185b: am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit '6a11185b9293151cb3c12c296cf989ea0e7cb898':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:50:45 -08:00
Dianne Hackborn
a2ba76d444
Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
2011-01-27 22:48:58 -08:00
Dianne Hackborn
16cda1f7a3
am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:48:32 -08:00
Dianne Hackborn
a3980da2d0
Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
2011-01-27 22:47:50 -08:00
Dianne Hackborn
0891204682
Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
2011-01-27 22:46:44 -08:00
Romain Guy
f40bb427a6
am 24c29867: am d0b54a73: Merge "Add more debug info for profiling." into honeycomb
...
* commit '24c29867a6851ce2c692a0ea61918d37dcb8e8e0':
Add more debug info for profiling.
2011-01-27 22:35:13 -08:00
Romain Guy
a95ea978ae
am d0b54a73: Merge "Add more debug info for profiling." into honeycomb
...
* commit 'd0b54a73941aa5541ed1adc48f6739bda132970b':
Add more debug info for profiling.
2011-01-27 22:33:02 -08:00
Romain Guy
f930d5de48
Merge "Add more debug info for profiling." into honeycomb
2011-01-27 22:30:57 -08:00
Dianne Hackborn
11e0746577
Fix issue #3392073 : At times soft keyboard comes up in...
...
...gallery while attaching picture to gmail message
In various places we could block switching the IME target incorrectly.
Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa
2011-01-27 21:56:33 -08:00
Jason Sams
55047abedd
am 3e232f1c: am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
...
* commit '3e232f1c59eb95a7d3b5b3ea411a383b7a8f1b5b':
Fix another barrier bug 3333866 Atomically update put.
2011-01-27 21:28:22 -08:00
Jason Sams
56d0314731
am 386ef6da: Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
...
* commit '386ef6da5a95243b4a55b3f760621260e20a5e39':
Fix another barrier bug 3333866 Atomically update put.
2011-01-27 21:26:15 -08:00
Jason Sams
61486c0980
Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
2011-01-27 21:24:00 -08:00
Adam Cohen
e3e2f39cd5
am aed413a1: am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
...
* commit 'aed413a18cac6b39d5e88c53b08bdb019ebb6d8d':
Fixing static StackView scenario (Issue: 3399844)
2011-01-27 20:08:35 -08:00
Adam Cohen
5f8f0282ed
am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
...
* commit 'e31ecf61042171242e6f31f22df7691c40f189b2':
Fixing static StackView scenario (Issue: 3399844)
2011-01-27 20:06:09 -08:00
satok
2d8facb844
am fb80d648: am 17945d0e: Merge "Update InputMethodPanel when locale was changed." into honeycomb
...
* commit 'fb80d648e2164fac75d41d6024a4d43137c0561f':
Update InputMethodPanel when locale was changed.
2011-01-27 20:04:31 -08:00
Adam Cohen
460529bb93
Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
2011-01-27 20:04:21 -08:00
satok
f4df38935d
am 17945d0e: Merge "Update InputMethodPanel when locale was changed." into honeycomb
...
* commit '17945d0e05c8a4b0aa59032bc054b942c20d9472':
Update InputMethodPanel when locale was changed.
2011-01-27 20:02:04 -08:00
satok
540494935d
Merge "Update InputMethodPanel when locale was changed." into honeycomb
2011-01-27 20:00:43 -08:00
Stephen Hines
d12ebdcc48
am 6059c395: am 55f8f121: Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb
...
* commit '6059c3955d739ab5fad15f9bf6bb6f743a9b5ac2':
Correctly free resouces bound to scripts when the scripts are deleted.
2011-01-27 19:44:36 -08:00
Stephen Hines
e52dff22ef
am 55f8f121: Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb
...
* commit '55f8f12119ad2fbb6afcb7647a1a18f4aa86f0f5':
Correctly free resouces bound to scripts when the scripts are deleted.
2011-01-27 19:42:20 -08:00