Romain Guy
7dfe1ab587
am 069f9b63: am 745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
...
* commit '069f9b6352951134a8c0b3d5320e31290e681206':
Smoother pinch-zoom in Browser.
2011-01-18 21:58:24 -08:00
Jack Palevich
1e686175a6
am 79f74eda: am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
...
* commit '79f74eda8a6ba96519bb3a084f656fcacb1cd2e7':
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
2011-01-18 21:58:11 -08:00
John Reck
ded2bc5c5f
am 733e2047: am c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
...
* commit '733e2047e7dbb53d5b3b2514bfb76edbcef8a149':
Create db path if it doesn't exit
2011-01-18 21:58:01 -08:00
Nick Pelly
5a6e65ed2e
am b6b426ad: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp
...
* commit 'b6b426ad1c953555dd6393844c29be5c9a9cd700':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-18 21:57:31 -08:00
Andreas Huber
07ff585c30
am f9846fcd: am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
...
* commit 'f9846fcdf89432d05c713a5f356a0bd1447d3cf1':
Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-18 21:57:06 -08:00
Dianne Hackborn
7fc5d4b8e7
am 2ec5a716: am 36c84403: Merge "Fix issue #3362484 : Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
...
* commit '2ec5a7160b3d32887b2428edef7a751ee3700809':
Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog
2011-01-18 21:56:45 -08:00
Jeff Brown
7cca7e0b28
am 761a6b7f: am f4368c95: Merge "Filter virtual keys after touches." into honeycomb
...
* commit '761a6b7fdbe2bcc6db4306af9705dcb22b036068':
Filter virtual keys after touches.
2011-01-18 21:56:31 -08:00
Eric Fischer
7927859e10
am 18a7428d: (-s ours) am 2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '18a7428dcb7cd3008d2c898efaaf8fe20604fdf3':
Import revised translations. DO NOT MERGE
2011-01-18 21:55:34 -08:00
James Dong
c0c48d285f
am d2225a06: am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
...
* commit 'd2225a06a315db9988236dcf5c5bca743f6d457d':
Fix the sluggish preview during timelapse video recording because software encoder is used.
2011-01-18 21:54:39 -08:00
Costin Manolache
b8c581ec64
am bf8e1627: am b8b671df: Merge "Add back NEW_TASK flag." into honeycomb
...
* commit 'bf8e162702d0e56a8f5bf97de4c40b0a87fd78a4':
Add back NEW_TASK flag.
2011-01-18 21:54:17 -08:00
Stephen Hines
ed6b96f68a
am 780816b3: am 0e5f4e54: Merge "Validate that version pragma is correct." into honeycomb
...
* commit '780816b306876ad3e82fa5181f5d77a44720c497':
Validate that version pragma is correct.
2011-01-18 21:54:03 -08:00
Eric Laurent
4a515f1543
am 2d1362b7: am 74ff70d2: Merge "Fix typo" into honeycomb
...
* commit '2d1362b7b4c090157878212edfddba282f831502':
Fix typo
2011-01-18 21:53:48 -08:00
Kenny Root
3f56e4a53b
am 67f23166: am 11ebdd6a: Merge "Erase OBB files when removing packages" into honeycomb
...
* commit '67f23166d00d0b965d5b913bcc0cfb442c0e9506':
Erase OBB files when removing packages
2011-01-18 21:53:21 -08:00
Romain Guy
977dd49047
am 4a809367: am 553889a6: Merge "Fix 9patches, again... Bug #3365243 " into honeycomb
...
* commit '4a80936778b1e20f063df89869f089444f46797f':
Fix 9patches, again... Bug #3365243
2011-01-18 21:53:07 -08:00
Mike Lockwood
e28ef04acc
am 14032e3b: am 5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb
...
* commit '14032e3b3e9b5f31d7dd1264a8d0c79e2bc633e7':
MTP: Set modification date for abstract playlists
2011-01-18 21:52:18 -08:00
Brad Fitzpatrick
6b6156a96b
am fe384670: am 3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb
...
* commit 'fe3846707b7fbe86681e49e88c9368213f0eb16a':
Fixing memory leak in PreferenceScreen.
2011-01-18 21:52:05 -08:00
James Dong
d91ee38d51
am 1b67fec7: am 0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb
...
* commit '1b67fec7e16860d6f605f810ae422375ec3a567d':
Fix the build break in git_master-without-vendor
2011-01-18 21:51:52 -08:00
Mike Lockwood
19bb5b5a7b
am b5f08714: am 26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb
...
* commit 'b5f08714597c7a50388336480a6b72f3dc698735':
MTP: Strip ".pla" file extension from name field for WMP playlists
2011-01-18 21:51:17 -08:00
Kenny Root
83239a4693
am 189854d0: am 241fc72b: Merge "Don\'t cache return of getService in Environment" into honeycomb
...
* commit '189854d0735eae7b251d39360c9582cbcbb0a642':
Don't cache return of getService in Environment
2011-01-18 21:51:04 -08:00
Brad Fitzpatrick
aef99bbc69
am 7adf8481: am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb
...
* commit '7adf848183b39ac4d0b8b67435ace94909ca3076':
StrictMode class instance limit interface.
2011-01-18 21:50:45 -08:00
Romain Guy
68a60f8913
am a7d666ab: am 713440d2: Merge "Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #3360888 " into honeycomb
...
* commit 'a7d666ab59cab888a07065099226023745486ba2':
Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #3360888
2011-01-18 21:50:19 -08:00
Jack Palevich
0cf7ecc640
am 3ee50921: am b54407f2: Merge "Add support for preserving EGL contexts when pausing / resuming." into honeycomb
...
* commit '3ee50921957a00a91a951707aeff83208d293f2f':
Add support for preserving EGL contexts when pausing / resuming.
2011-01-18 21:50:06 -08:00
Andreas Huber
d5af25c624
am 63e99c39: am 529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
...
* commit '63e99c39e1e1a0dd7989bb858447b3ca76738554':
Implement parsing of vbv buffering info in RTSP.
2011-01-18 20:44:04 -08:00
John Wang
e732ab01f0
am ae451252: am 8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
...
* commit 'ae451252f425525efd4ade9adbd023a00a89c3e7':
Enable AUTO_TIME_ZONE settings.
2011-01-18 20:43:41 -08:00
Bryan Mawhinney
e0dda5ac4a
am 6d7d0da9: am 3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb
...
* commit '6d7d0da9fb5bc52282b3d1d1fc2ac6ad8a4eb01b':
Don't report 100% buffered when the stream ends prematurely.
2011-01-18 20:43:22 -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
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
Gloria Wang
797297456e
Merge "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/"
2011-01-18 16:09:44 -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
Romain Guy
4f066784ec
Smoother pinch-zoom in Browser.
...
Change-Id: Ie5a403b76ab25483a980324cd7b31976359fa796
2011-01-18 15:43:46 -08:00
John Reck
798378ee6c
Create db path if it doesn't exit
...
Bug: 3241808
Make sure the directory the caller is trying to open the icon db
in actually exists and create it if it doesn't.
Change-Id: Ie5e4a09210e9430edc318846a551542119969053
2011-01-18 15:42:49 -08:00
Nick Pelly
06a00bd2d2
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
...
The later feels less clumsy.
Change-Id: I1bad37031c5d57f51b04c8ea6e41805dcd2935ec
2011-01-18 15:39:34 -08:00
Andreas Huber
f9846fcdf8
am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
...
* commit '39560507215774873ba64b5f0ff61648488924ea':
Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-18 15:37:58 -08:00
Andreas Huber
3956050721
Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
2011-01-18 15:35:35 -08:00
Dianne Hackborn
2ec5a7160b
am 36c84403: Merge "Fix issue #3362484 : Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
...
* commit '36c84403ec07439d11ed284ac5f9a9db807fbf92':
Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog
2011-01-18 15:32:44 -08:00
Dianne Hackborn
36c84403ec
Merge "Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog" into honeycomb
2011-01-18 15:31:21 -08:00
Jeff Brown
761a6b7fdb
am f4368c95: Merge "Filter virtual keys after touches." into honeycomb
...
* commit 'f4368c959fa9436d75feb2543cb65da0d46521e5':
Filter virtual keys after touches.
2011-01-18 15:29:28 -08:00
Dianne Hackborn
cfaf8878de
Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog
...
Change-Id: Idc2fe5a86c61e8f94fe9d902a0087a05f6f7918e
2011-01-18 15:28:41 -08:00
Andreas Huber
eee580a495
Apparently our native TCP sockets do not return an error from blocking "connect"
...
if the network interface is shutdown while connecting.
Change-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0
related-to-bug: 3362836
2011-01-18 15:26:40 -08:00
Jeff Brown
f4368c959f
Merge "Filter virtual keys after touches." into honeycomb
2011-01-18 15:26:15 -08:00
Gloria Wang
7a5321d4d8
rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
...
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
2011-01-18 15:23:51 -08:00
Eric Fischer
18a7428dcb
am 2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '2c0d22e72c0e3fa1705e39eeaedfdbad89a785ce':
Import revised translations. DO NOT MERGE
2011-01-18 15:16:59 -08:00
Eric Fischer
2c0d22e72c
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-18 15:13:06 -08:00
Jeff Brown
fe50892af3
Filter virtual keys after touches.
...
Adds a new virtualKeyQuietTimeMillis configuration resource that sets
the duration for which virtual keys will be dropped after recent touches
on screen. The default value is 0; it is intended to be overridden
per device using a resource overlay.
This change is designed to help in two cases:
1. Swipes from touchscreen into virtual key area.
2. Accidental taps in virtual key area while using on-screen keyboard.
Bug: 3089163
Change-Id: Ib912d4f8a4df9966a39cd537d3ec7c24afab7225
2011-01-18 15:10:45 -08:00
James Dong
d2225a06a3
am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
...
* commit '1418de7eff012c37cf34328eb368a547d70a1441':
Fix the sluggish preview during timelapse video recording because software encoder is used.
2011-01-18 14:44:58 -08:00