Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,337 Commits 3 Branches 0 Tags
80ee5aaeea9b8b5fb159ce27fe8460fea998632f
Commit Graph

2616 Commits

Author SHA1 Message Date
George Mount
9c8d63f48e am acd796b1: am 20c15a42: Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev 
* commit 'acd796b1a6f217e0798d008ba88dc101b5ace34e':
  Fix monkey NPE in AutoCompletePopup
 2012-05-30 07:43:48 -07:00
George Mount
20c15a4271 Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev 2012-05-30 07:36:11 -07:00
John Reck
4c11a92b62 am 4a53b519: am 2cd50c9d: Merge "Don\'t long press if preventDefault is called" into jb-dev 
* commit '4a53b51955e6d166a81ac09bdb1633b9224839ab':
  Don't long press if preventDefault is called
 2012-05-29 16:30:15 -07:00
John Reck
2dc3ffd31a Don't long press if preventDefault is called 
Bug: 6554060

Change-Id: Iad263c78a0e1504dd10e9ef5b92505bca6991cbc
 2012-05-29 16:02:23 -07:00
George Mount
7a2cb35513 Fix monkey NPE in AutoCompletePopup 
Bug 6554866

Change-Id: I2942e55d98bc768f5c5c563240c1841c7e869b3c
 2012-05-29 15:39:50 -07:00
Ben Murdoch
1bd37b176e Deprecate WebChromeClient.onJsTimeout 
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.

Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
 2012-05-28 14:20:07 +01:00
John Reck
83a40e8e64 am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev 
* commit '2611f1eced80db74d07563e03bb99a146aa461b6':
  Copy over the scroll position for the scrolling layer
 2012-05-25 15:56:48 -07:00
John Reck
7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev 2012-05-25 15:49:15 -07:00
John Reck
ec1b71adc6 Copy over the scroll position for the scrolling layer 
Bug: 6557664

Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
 2012-05-25 14:02:26 -07:00
Teng-Hui Zhu
0926424028 am 314745cd: am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev 
* commit '314745cd5661db8672505ec753a6f88b9e80e609':
  Better support for HTML5 audio loop.
 2012-05-25 10:18:09 -07:00
Teng-Hui Zhu
65e08329ee Merge "Better support for HTML5 audio loop." into jb-dev 2012-05-25 10:10:11 -07:00
John Reck
fcf4c34545 am 731327a9: am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 
* commit '731327a93a9e5f1550effaf48fb944d8cae507d5':
  Support skipping a touch stream due to lack of handlers
 2012-05-24 18:18:07 -07:00
John Reck
f738810247 Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 2012-05-24 18:11:36 -07:00
John Reck
c1e80a360a Support skipping a touch stream due to lack of handlers 
Bug: 6317798

Change-Id: Ia1652e9030e877e270326e9e8a8b040810b89f09
 2012-05-24 15:31:13 -07:00
Teng-Hui Zhu
6f62ef32e2 Better support for HTML5 audio loop. 
Loop is trigger by a seek to 0 when ended on native side but there is no play
call. So on java side, we detect this and call into native side to trigger a
play after completion.
This fixed the UI problem and keep in sync with the native mode.
Beyond that, we don't need to reload for looping and we don't have the seek
to play artifacts.

bug:5461143

webkit change:
https://android-git.corp.google.com/g/#/c/193750/

Change-Id: I779f3e1fbc789832a1a99d1f17823db6b57b35df
 2012-05-24 15:24:29 -07:00
George Mount
a893591ff6 am 4f313676: am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev 
* commit '4f3136768038398e109a66d393d74858d2754a34':
  Use setCustomSelectActionModeCallback to disallow action bar.
 2012-05-24 11:13:25 -07:00
Ben Murdoch
b9fcb1334d resolved conflicts for merge of cde7efde to master 
Change-Id: I44433670a897c23b3bd388cbba9cfacf80e3345f
 2012-05-24 18:02:56 +01:00
George Mount
222f561350 Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev 2012-05-24 09:53:17 -07:00
George Mount
7e9f62ef48 Use setCustomSelectActionModeCallback to disallow action bar. 
Bug 5993716
 Use setCustomSelectActionModeCallback rather than
 setLongClickListener to disallow custom action block so
 that long press can bring up the paste window.

Change-Id: I916e77dcea7914c02191f0ecda37cd126318807d
 2012-05-24 07:43:27 -07:00
Ben Murdoch
2b5d66824b Make the WebCore thread watchdog opt in. 
Add a setting on WebViewCore to control whether we monitor
the responsiveness of the WebCore thread. Default is not
to monitor.

Bug: 6447214
Change-Id: Ia95e5c769d458dcd24ae50660b2f22e93851956f
 2012-05-24 13:01:57 +01:00
George Mount
cf73e52825 am 5354a327: am 8871403a: Merge "Show caret handle when clicking in the middle of text." into jb-dev 
* commit '5354a3277736b57daa0003409ce37c5b5f3b2236':
  Show caret handle when clicking in the middle of text.
 2012-05-23 15:00:47 -07:00
George Mount
c2813fa759 Show caret handle when clicking in the middle of text. 
Bug 6545325

Change-Id: Ibea6daca1da12eec38b05f7f451561d31bb3c983
 2012-05-23 14:04:54 -07:00
Chris Craik
7d35738a2d am 9970bbac: am 3534e134: Merge "Avoid crash if onDetachedFromWindow called after destroy" into jb-dev 
* commit '9970bbac1f4951f5910aa5148e189a0a284f9e46':
  Avoid crash if onDetachedFromWindow called after destroy
 2012-05-22 17:26:44 -07:00
Chris Craik
3534e13486 Merge "Avoid crash if onDetachedFromWindow called after destroy" into jb-dev 2012-05-22 17:20:07 -07:00
Chris Craik
9e08012869 Avoid crash if onDetachedFromWindow called after destroy 
This also removes the temporary logging from commit
f8dafa14e0.

bug:6535911
Change-Id: Icf1d0438b349a0e92e7d9cefed57a252eed2b9b0
 2012-05-22 16:52:00 -07:00
Svetoslav Ganov
727242f960 am ecd2fe57: am 956f28ed: Merge "Always reference injector using get method." into jb-dev 
* commit 'ecd2fe5796061f98656088dc1ce0621cc12d9a62':
  Always reference injector using get method.
 2012-05-22 15:37:59 -07:00
Svetoslav Ganov
956f28edae Merge "Always reference injector using get method." into jb-dev 2012-05-22 15:32:19 -07:00
Chris Craik
b3e1de71ba am 49413bcc: am 7a9328a3: Merge "Add temporary functor lifetime logging" into jb-dev 
* commit '49413bcccbd735be4e8ad4cf98b3ab2f892225e4':
  Add temporary functor lifetime logging
 2012-05-22 14:46:25 -07:00
Chris Craik
7a9328a311 Merge "Add temporary functor lifetime logging" into jb-dev 2012-05-22 14:39:13 -07:00
Chris Craik
f8dafa14e0 Add temporary functor lifetime logging 
bug:6535911

Change-Id: Ida5cc1def7fe1fc314317bbc5df50e1465753deb
 2012-05-22 14:26:15 -07:00
alanv
500b91ebac Always reference injector using get method. 
Bug: 6535301
Change-Id: If1d55c3229603d12c568213bd2f271c7cb6ab139
 2012-05-22 14:22:48 -07:00
Steve Block
9bc26c0d8e Merge "Remove unused WebViewCore::isPaused() and setIsPaused()" 2012-05-22 10:32:03 -07:00
George Mount
12221d1540 DO NOT MERGE Consider current scroll position to move text field into view. 
Bug 6530008

Change-Id: I6542dab70b64f809ec5dd4deb3511f8aa38278e1
 2012-05-22 09:46:13 -07:00
George Mount
b999b22eca DO NOT MERGE Consider fixed layers when scrolling the edit box. 
Bug 6147580
 Webkit Change: I810891decf0bad682e90f29f0f65c6b765b7d6d6

Change-Id: Idaa538824e611acd64eb5a4ccb7866d3c978a077
 2012-05-22 09:40:23 -07:00
Steve Block
1866b3fe5d Remove unused WebViewCore::isPaused() and setIsPaused() 
The last caller of these methods was removed in
I7be5b4224555bc8c3893b75275ac3a997a6677d1.

See WebKit change Ie645cb657407c34a63e5df6b0ade050f1780a7f0.

Change-Id: I9e5c0fd914f53d11e130ffcdc0e749f45dfe4013
 2012-05-22 16:00:04 +01:00
George Mount
43857a8ddb Merge "Consider current scroll position to move text field into view." 2012-05-22 07:56:40 -07:00
Steve Block
7c22b1810c Merge "Switch Geolocation DRT methods to control client-based mock" 2012-05-22 06:15:07 -07:00
Steve Block
f3f60d9328 Switch Geolocation DRT methods to control client-based mock 
Note that we plumb DRT Geolocation mock calls via WebView. This is required
because the WebCore client-based mock is not a static but is tied to the Page.

See WebKit change Ib74a3c05991593e75c3138415d4ac0bf0c9aefa9.

Bug: 6511338
Change-Id: I6d88d5dce5c2148812b191a5b452718bf0854aeb
 2012-05-22 12:07:55 +01:00
Michael Kolb
56cb79416a am d4755c95: am ab68bbaf: Merge "add flag to websearch intent" into jb-dev 
* commit 'd4755c952985c60b3b376a198e30bdee01048f9f':
  add flag to websearch intent
 2012-05-21 14:33:00 -07:00
George Mount
f7a1a84d85 Consider current scroll position to move text field into view. 
Bug 6530008

Change-Id: I6542dab70b64f809ec5dd4deb3511f8aa38278e1
 2012-05-21 13:30:48 -07:00
John Reck
85712e6180 am 1f00a987: am 88b756cd: Merge "Don\'t show the touch highlight for double taps" into jb-dev 
* commit '1f00a987ac693a81cbd3739b903e981465451305':
  Don't show the touch highlight for double taps
 2012-05-21 12:44:09 -07:00
Charles Chen
828328489e am a48374db: am c6015df1: Merge "Add actions to non-JavaScript accessibility handler." into jb-dev 
* commit 'a48374db17a04f12a60e9363721769dbfff01e65':
  Add actions to non-JavaScript accessibility handler.
 2012-05-21 12:43:08 -07:00
Charles Chen
2e19d34137 am 4d39ba26: am 9a9a041c: Merge "Add movement actions to JS accessibility." into jb-dev 
* commit '4d39ba269c890e2746f439ac52d91704744c25f3':
  Add movement actions to JS accessibility.
 2012-05-21 12:43:05 -07:00
John Reck
0bbce0e8fb am ce619a96: am 3d6f7ead: Merge "Tweak show/hide of touch highlight" into jb-dev 
* commit 'ce619a9675bcb2278bf9a078fb44bb4b1d728dd3':
  Tweak show/hide of touch highlight
 2012-05-21 12:43:02 -07:00
George Mount
314fcc396f am aa5f8581: am ea1603de: Merge "Update the IME with selection and composing region changes." into jb-dev 
* commit 'aa5f858176c903e94fa8ce07f5777d4935ef3a4e':
  Update the IME with selection and composing region changes.
 2012-05-21 12:42:17 -07:00
George Mount
8d47082d8f am e0df34f6: am bb8549db: Merge "Sync the selection cursor when adjusting caret handle." into jb-dev 
* commit 'e0df34f60374ce94b409b4360504fc7d2680db53':
  Sync the selection cursor when adjusting caret handle.
 2012-05-21 12:42:13 -07:00
Svetoslav Ganov
d47ddda1ce am 91408aae: am 308904dc: Merge "Refactor WebView accessibility code into a separate class." into jb-dev 
* commit '91408aae7ad61c2c38145ba1da235fffcb826544':
  Refactor WebView accessibility code into a separate class.
 2012-05-21 12:40:26 -07:00
John Reck
a12712f836 am 5653f280: am 76c0c612: Merge "Don\'t send an ontouchmove until slop is exceeded" into jb-dev 
* commit '5653f28030ef9ed5d457216cec67e1082c6b7ec4':
  Don't send an ontouchmove until slop is exceeded
 2012-05-21 12:39:55 -07:00
George Mount
1b4aab6640 am 23542062: am 3c814072: Merge "Only clear the caret when in caret selection mode." into jb-dev 
* commit '2354206216f13ace061c5000f045db066f6e074d':
  Only clear the caret when in caret selection mode.
 2012-05-21 12:39:47 -07:00
George Mount
2a21049117 am 45240cb3: am 84c4b08b: Merge changes Ia5729aaf,I91584b7d into jb-dev 
* commit '45240cb33ac88c5839df2e9c7e55c18b0aa7b517':
  Remove selection highlight when replacing/deleting.
  Don't do character add/delete when there is a selection.
 2012-05-21 12:39:44 -07:00