Nick Pelly
3965ebbb03
am 274ee68d: am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit '274ee68d32237d95f05c269c250146d9b3202fbc':
Fix javadoc which broke build.
2011-01-21 15:53:31 -08:00
Nick Pelly
274ee68d32
am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit 'ccc9a9e58247d174d587dee465868a948a07364f':
Fix javadoc which broke build.
2011-01-21 15:50:20 -08:00
Jaikumar Ganesh
6632362a8a
am 32064b67: am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
...
* commit '32064b6727127e275be23eb2eed18eabe84ee3b2':
Temporary Changes for certification of SCO.
2011-01-21 15:47:59 -08:00
Jaikumar Ganesh
32064b6727
am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
...
* commit 'c4cc3ea48add3b7a63a1a97fc3a4c89b24217604':
Temporary Changes for certification of SCO.
2011-01-21 15:45:54 -08:00
Jaikumar Ganesh
c4cc3ea48a
Merge "Temporary Changes for certification of SCO." into honeycomb
2011-01-21 15:43:42 -08:00
Nick Pelly
8dd7a54136
am a4f26c3d: am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit 'a4f26c3d034885f1d9063f484f44e8c78c8495eb':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-21 15:34:00 -08:00
Mathias Agopian
3ca816c132
am 80f3376b: am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit '80f3376b3a0f9c677c37c98382d1021bed6c5633':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-21 15:33:56 -08:00
Gilles Debunne
9543e3e12b
am 48617a51: am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
...
* commit '48617a51346af3463e10a7236fe5043787ed5db4':
Tapping inside an EditText should always pop up the IME.
2011-01-21 15:33:22 -08:00
Jaikumar Ganesh
75c2701454
Temporary Changes for certification of SCO.
...
Bug: 3349475
Change-Id: I555b127a1d9218494cd05c07c9e9f29628f3bc74
2011-01-21 15:17:23 -08:00
Nick Pelly
a4f26c3d03
am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit '4d3ac03ade6184504ad3881def5e86133ae5f2f6':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-21 15:03:19 -08:00
Mathias Agopian
80f3376b3a
am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit 'b92a40ebfaf49783f942b75b413e1499e149c3bb':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-21 15:02:26 -08:00
Gilles Debunne
48617a5134
am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
...
* commit 'b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
Tapping inside an EditText should always pop up the IME.
2011-01-21 14:55:50 -08:00
Gilles Debunne
b5e5b2d99b
Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
2011-01-21 14:53:44 -08:00
Amith Yamasani
54468ba12e
am 610dff54: am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
...
* commit '610dff54fc6f350e1f7976027bb69a813fa055af':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
2011-01-21 14:51:34 -08:00
Michael Kolb
caed391640
am b2b83077: am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
...
* commit 'b2b830774f4aff0bacf30648a4f7efce49e403fd':
Add public API for on screen zoom controls
2011-01-21 14:51:26 -08:00
Amith Yamasani
610dff54fc
am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
...
* commit 'b58b5db4ba8edc075f6524df200aa8d3c678e267':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
2011-01-21 14:49:34 -08:00
Michael Kolb
b2b830774f
am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
...
* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
Add public API for on screen zoom controls
2011-01-21 14:49:30 -08:00
Amith Yamasani
b58b5db4ba
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
2011-01-21 14:47:32 -08:00
Michael Kolb
debb5bbe81
Merge "Add public API for on screen zoom controls" into honeycomb
2011-01-21 14:47:30 -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
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
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
Leon Scroggins
6013013829
Merge "Restart input when the webpage changes the text." into honeycomb
2011-01-21 14:30:50 -08:00
Michael Kolb
5840cd294a
Add public API for on screen zoom controls
...
http://b/issue?id=3378224
This is a simple unhide.
Allow the use of WebView pinch-to-zoom gestures
without the on screen zoom controls.
Currently, enabling pinch to zoom with the public API also shows the
on screen zoom buttons.
If the zoom buttons are not wanted, a custom implementation of pinch to
zoom is required, which can't be done correctly at this point.
Change-Id: I3f94080471c3a4b498b11c91603fff9994dc3c2c
2011-01-21 14:15:16 -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
Nick Pelly
8bb36dbbf3
resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp
...
Change-Id: Idd58a1d4e9b9156e123ccbcbc17a59eedd46af4c
2011-01-21 14:01:54 -08:00
Gilles Debunne
c3e85a712b
Tapping inside an EditText should always pop up the IME.
...
Bug 3374062
When the tap in slightly off the EditText, it receives focus from its parent layout
which dispatches the event. However, the touch event is (correctly) not propagated
in that case.
onFocusChanged should hence do actions similar to what is done on touch up events.
Change-Id: Ia5c04546674fc6239aa4d0b8d051f4951ca91352
2011-01-21 13:35:29 -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
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
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
Robert Greenwalt
a9a4f5cc88
Merge "Switch from NetworkUtils to netd for iface config."
2011-01-21 12:06:16 -08:00
Gilles Debunne
7bc7e36818
am 34aa51b8: am 4569f1a5: Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
...
* commit '34aa51b8f97cce5c49516ffecee2d620f02bcdd9':
Paste popup window is displayed on the side when it would be clipped on top of screen.
2011-01-21 11:36:47 -08:00
Gilles Debunne
34aa51b8f9
am 4569f1a5: Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
...
* commit '4569f1a561b4db77cc87f649e04c352415b65605':
Paste popup window is displayed on the side when it would be clipped on top of screen.
2011-01-21 11:32:30 -08:00
Gilles Debunne
4569f1a561
Merge "Paste popup window is displayed on the side when it would be clipped on top of screen." into honeycomb
2011-01-21 11:29:39 -08:00
Shimeng (Simon) Wang
765b2e2db4
am a2d32f3c: am 7633540c: Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb
...
* commit 'a2d32f3c48283d3c9c7d8e25704de86e26bc62f6':
Keep min/max zoom scale in proportion when zoom density changes.
2011-01-21 11:03:18 -08:00
Nick Pelly
0967c1cbc5
am 11ce84fc: resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp
...
* commit '11ce84fcaadb7051735dd50a35f6e6c234fbe480':
Javadoc updates for NFC.
2011-01-21 11:02:35 -08:00
Nick Pelly
d42cdbe6f7
am df80645a: Merge "resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"" into honeycomb-plus-aosp
...
* commit 'df80645a97d994f20a9fba1311a884bf17d2b774':
New APIs for NDEF Push Protocol.
2011-01-21 11:02:16 -08:00
Ken Wakasa
ed19b88fe2
am 6ddec8be: am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb
...
* commit '6ddec8be1cc23f4b7e8793503420072024884072':
Update class doc for InputMethodSubtype
2011-01-21 11:00:46 -08:00
Brad Fitzpatrick
6700447200
am ca87f0e8: am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb
...
* commit 'ca87f0e832f71226839004c8e854e1389c037234':
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
2011-01-21 11:00:20 -08:00
satok
6a32272af5
am d57c1fcf: am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
...
* commit 'd57c1fcf5a4f8fd9451e4a09aa50ed14c7f94ff2':
Show ime switch icon when there is a hard keyboard
2011-01-21 10:59:32 -08:00
Adam Cohen
047106d436
am f95a963e: am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb
...
* commit 'f95a963e7313b209ab3da5eeac1bde385bca4355':
Cleaning up some StackView bad behavior
2011-01-21 10:59:20 -08:00