Irfan Sheriff
8b38dca1e5
am 135531b2: am ef76b830: am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
...
* commit '135531b20a2ad50c6b12e5d66ce8176bfd7ecb4b':
Do not add unsolicited events to queue
2011-01-21 14:40:46 -08:00
Jeff Brown
76141fab6f
am 4f762900: (-s ours) am b26c516c: (-s ours) am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
...
* commit '4f76290026fe061ca9fcfe7a1a581378d990c150':
Filter virtual keys after touches. (DO NOT MERGE)
2011-01-21 14:40:42 -08:00
Brad Fitzpatrick
a950cffb6c
am 7f1b722d: am 02bbbc11: am 069e810c: Merge "Fixing memory leak in PreferenceScreen."
...
* commit '7f1b722dd1003b12f016145d8985f31dbf96c460':
Fixing memory leak in PreferenceScreen.
2011-01-21 14:40:38 -08:00
Brad Fitzpatrick
b8febbe12e
am 8a82de2f: am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
...
* commit '8a82de2fcae11a2a9cba25132c37cad83ccc859f':
frameworks/base: remove redundant code in WindowManager
2011-01-21 14:40:35 -08:00
Martijn Coenen
8c3713b058
am ed0c705f: am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().
...
* commit 'ed0c705f3e5879d20c6e6f0ae45529755f8636e0':
Check NDEF before calling makeReadOnly().
2011-01-21 14:40:30 -08:00
Irfan Sheriff
135531b20a
am ef76b830: am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread
...
* commit 'ef76b8306fd6147d9dd7e3b7dce10354eff8033c':
Do not add unsolicited events to queue
2011-01-21 14:37:14 -08:00
Jeff Brown
4f76290026
am b26c516c: (-s ours) am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
...
* commit 'b26c516c03beffaf60460d3589b3807c0799c344':
Filter virtual keys after touches. (DO NOT MERGE)
2011-01-21 14:37:07 -08:00
Brad Fitzpatrick
7f1b722dd1
am 02bbbc11: am 069e810c: Merge "Fixing memory leak in PreferenceScreen."
...
* commit '02bbbc1122eac6ab02c10c3c1bb34092914e3743':
Fixing memory leak in PreferenceScreen.
2011-01-21 14:36:54 -08:00
Brad Fitzpatrick
8a82de2fca
am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"
...
* commit '4bb180d62f71658d04a7d6800707de83c10b01a5':
frameworks/base: remove redundant code in WindowManager
2011-01-21 14:36:43 -08:00
Martijn Coenen
ed0c705f3e
am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().
...
* commit 'c4eee776ad9d3de99032984fe20f5de395888bc7':
Check NDEF before calling makeReadOnly().
2011-01-21 14:36:33 -08:00
Nick Pelly
3a3ae4e593
am ed8bb922: Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'ed8bb922c22cb2b409318e3b777fdd892111bc4f':
Implement IsoDep timeout handling (API).
2011-01-21 14:36:06 -08:00
Leon Scroggins
d022c697c2
am 12871245: am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb
...
* commit '12871245c7920df992341fa095dc83df94ee763c':
Restart input when the webpage changes the text.
2011-01-21 14:35:58 -08:00
Nick Pelly
ed8bb922c2
Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-21 14:34:03 -08:00
Jason Sams
b74a7b017f
am 0629ac78: am 8418474d: Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
...
* commit '0629ac78fcf849b7695ba59e999ad51cf8d2fd49':
fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking.
2011-01-21 14:33:40 -08:00
Leon Scroggins
12871245c7
am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb
...
* commit '6013013829d1f97970d3ed426006d2522303826f':
Restart input when the webpage changes the text.
2011-01-21 14:33:03 -08:00
Yu Shan Emily Lau
6e045cf867
am 58fc2d39: am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
...
* commit '58fc2d39e80c926bc42272fd2878395fb7d9b87d':
Change the default ssid from GoogleGuest to the opennet for the power test.
2011-01-21 14:31:31 -08:00
Jason Sams
0629ac78fc
am 8418474d: Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
...
* commit '8418474dab412596c44c71497c0f4a3c39de597e':
fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking.
2011-01-21 14:30:56 -08:00
Leon Scroggins
6013013829
Merge "Restart input when the webpage changes the text." into honeycomb
2011-01-21 14:30:50 -08:00
Jason Sams
8418474dab
Merge "fix bug 3375251 Copying arrays of objects would generate an exception due to excessive internal type checking." into honeycomb
2011-01-21 14:28:55 -08:00
Yu Shan Emily Lau
58fc2d39e8
am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
...
* commit '588b1e4511d67f080449c3d49fd0d4bfc2bec79f':
Change the default ssid from GoogleGuest to the opennet for the power test.
2011-01-21 14:28:52 -08:00
Yu Shan Emily Lau
588b1e4511
Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb
2011-01-21 14:27:06 -08:00
Leon Scroggins
a51063c059
Restart input when the webpage changes the text.
...
Bug:3375518
Change-Id: I0a18d0ca764ce428d86bd5f6d13f8764668acea6
2011-01-21 17:14:36 -05:00
Yu Shan Emily Lau
3d273da8fa
Change the default ssid from GoogleGuest to the opennet for the power test.
...
Change-Id: I63bae360d283dc5224790aaccbd879015402187d
2011-01-21 14:06:22 -08:00
Nick Pelly
8bb36dbbf3
resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp
...
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
2011-01-21 14:01:54 -08:00
Romain Guy
6f6c8df476
am 11ad95c4: am d8b9d7cd: Merge "Don\'t set a Toast\'s view to null when enqueued several times. Bug #3374386 " into honeycomb
...
* commit '11ad95c49b9c954cf6410b4bcdfb3749cdc2a1cd':
Don't set a Toast's view to null when enqueued several times. Bug #3374386
2011-01-21 13:27:01 -08:00
Romain Guy
11ad95c49b
am d8b9d7cd: Merge "Don\'t set a Toast\'s view to null when enqueued several times. Bug #3374386 " into honeycomb
...
* commit 'd8b9d7cd1b2327b02e41edcddf94e64d481419d1':
Don't set a Toast's view to null when enqueued several times. Bug #3374386
2011-01-21 13:25:02 -08:00
Romain Guy
d8b9d7cd1b
Merge "Don't set a Toast's view to null when enqueued several times. Bug #3374386 " into honeycomb
2011-01-21 13:23:25 -08:00
Andreas Huber
149234e91e
am 9a62d902: am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
...
* commit '9a62d902ead8f94fa0ce071300e3767bfb976d8b':
Some tweaks to HTTP live / nuplayer behaviour
2011-01-21 13:19:42 -08:00
Andreas Huber
9a62d902ea
am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
...
* commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8':
Some tweaks to HTTP live / nuplayer behaviour
2011-01-21 13:17:42 -08:00
Patrick Dubroy
65da49fef0
am 338ebe14: am 40c37043: Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb
...
* commit '338ebe14921cd5aab4bb886787b32d62cd852651':
Update Bitmap.recycle() doc for heap-allocated pixel data
2011-01-21 13:17:38 -08:00
Patrick Dubroy
338ebe1492
am 40c37043: Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb
...
* commit '40c37043367f7cefd3467c41c57ec7be169b681f':
Update Bitmap.recycle() doc for heap-allocated pixel data
2011-01-21 13:15:37 -08:00
Andreas Huber
05aa082770
Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
2011-01-21 13:14:30 -08:00
Patrick Dubroy
40c3704336
Merge "Update Bitmap.recycle() doc for heap-allocated pixel data" into honeycomb
2011-01-21 13:13:17 -08:00
Jason Sams
ed5bab93c6
fix bug 3375251
...
Copying arrays of objects would generate an exception
due to excessive internal type checking.
Change-Id: Ic89c24962408f1a95dc0385b74618a70d6ff5859
2011-01-21 13:08:02 -08:00
Huahui Wu
106e8620cf
am 48c4199e: am 17d25c56: Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb
...
* commit '48c4199ee6f33e132226dd9b7b527a47eba8d008':
b/3369602 Using Math.round() to convert float coordinates to integers.
2011-01-21 13:07:29 -08:00
Huahui Wu
48c4199ee6
am 17d25c56: Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb
...
* commit '17d25c564da50cfdcef6705ccc592ced2bd7c960':
b/3369602 Using Math.round() to convert float coordinates to integers.
2011-01-21 13:05:24 -08:00
Huahui Wu
17d25c564d
Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb
2011-01-21 13:03:49 -08:00
Leon Scroggins
2c2aa7c4d2
am 62fd9903: am d5188657: Do a better job of lining up text with page text.
...
* commit '62fd9903a756eb5d8e7bcafbbc5a3a311fdbcefc':
Do a better job of lining up text with page text.
2011-01-21 13:01:08 -08:00
Leon Scroggins
62fd9903a7
am d5188657: Do a better job of lining up text with page text.
...
* commit 'd5188657dcde0f40a6954a00d569c0575bf6095a':
Do a better job of lining up text with page text.
2011-01-21 12:59:05 -08:00
Leon Scroggins
d5188657dc
Do a better job of lining up text with page text.
...
Bug:3085564
Bug:3196224
Bug:3321608
Remove Touch.getMaxScrollX(), which is incorrect for my
purpose, and is not used anywhere else. Instead use the
layout to determine the maximum horizontal scroll of a
textfield.
Now that textareas use layers, scroll the layer's picture
in the UI thread for vertical movement. When passing a
click to webcore, also pass a message to scroll the actual
textarea so the click will be in the correct place.
Lastly, do not override bringPointIntoView, which allows
moving the insertion handler beyond the edge of a field to
scroll it. Instead, override requestRectangleOnScreen to
do nothing, since my actual goal is to prevent the TextView
from changing the scroll of the WebView, which is done by
webkit.
Requires a change to external/webkit.
Change-Id: Ib91907599b792287c373d3678cb04e0cb5e34471
2011-01-21 15:42:03 -05:00
Jesse Wilson
0943f81f7e
am b5fe803f: am 276677f2: Merge "Move URLTest tests to libcore." into honeycomb
...
* commit 'b5fe803ff5324087ca96c089cfa7f73c7b967871':
Move URLTest tests to libcore.
2011-01-21 12:39:59 -08:00
Jason parks
ca615748cf
am a55e3670: am 0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb
...
* commit 'a55e367027fcd37aae83bf3e61225c45db0cf1cf':
Add and enforce the permission for encrypting/decrypting.
2011-01-21 12:39:55 -08:00
Jason parks
18e9cf0faa
am bee8a768: am 0f2ef34b: Merge "Update encryption commands." into honeycomb
...
* commit 'bee8a7686d380a7dc696756699411696d7685551':
Update encryption commands.
2011-01-21 12:39:49 -08:00
Jesse Wilson
b5fe803ff5
am 276677f2: Merge "Move URLTest tests to libcore." into honeycomb
...
* commit '276677f2ac821e5eb8a7f6a4204242ee47501d6e':
Move URLTest tests to libcore.
2011-01-21 12:36:24 -08:00
Jason parks
a55e367027
am 0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb
...
* commit '0512d080a5ae7eccb154be4302aaf4b5fb8aa5a6':
Add and enforce the permission for encrypting/decrypting.
2011-01-21 12:36:20 -08:00
Jason parks
bee8a7686d
am 0f2ef34b: Merge "Update encryption commands." into honeycomb
...
* commit '0f2ef34b5a7158ab105edfb0d6c5904ae23e89fa':
Update encryption commands.
2011-01-21 12:36:01 -08:00
Romain Guy
2152ca58c2
Don't set a Toast's view to null when enqueued several times.
...
Bug #3374386
Change-Id: I0fc6f96b37c8866ad1e890813054dafbaf2cc13e
2011-01-21 12:31:53 -08:00
Jesse Wilson
276677f2ac
Merge "Move URLTest tests to libcore." into honeycomb
2011-01-21 12:13:11 -08:00
Patrick Dubroy
a383b3f646
Update Bitmap.recycle() doc for heap-allocated pixel data
2011-01-21 12:08:51 -08:00
Robert Greenwalt
a9a4f5cc88
Merge "Switch from NetworkUtils to netd for iface config."
2011-01-21 12:06:16 -08:00