Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,391 Commits 3 Branches 0 Tags
cd820f9ff1d39ef5f08c9b101b528ffd7082f67e
Commit Graph

2555 Commits

Author SHA1 Message Date
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
Ben Murdoch
82a83da301 am d36bde24: am 93e3bf12: Merge "Fix up the WebCoreThreadWatchdog" into jb-dev 
* commit 'd36bde2494a8635bc633d4bbd02f82bbfb72b7db':
  Fix up the WebCoreThreadWatchdog
 2012-05-21 12:39:40 -07:00
George Mount
4527a8d641 Consider fixed layers when scrolling the edit box. 
Bug 6147580
 Webkit Change: I810891decf0bad682e90f29f0f65c6b765b7d6d6

Change-Id: Idaa538824e611acd64eb5a4ccb7866d3c978a077
 2012-05-18 13:56:27 -07:00
John Reck
76c0c612cd Merge "Don't send an ontouchmove until slop is exceeded" into jb-dev 2012-05-17 09:22:06 -07:00
George Mount
3c8140723f Merge "Only clear the caret when in caret selection mode." into jb-dev 2012-05-17 09:05:37 -07:00
George Mount
84c4b08bd4 Merge changes Ia5729aaf,I91584b7d into jb-dev 
* changes:
  Remove selection highlight when replacing/deleting.
  Don't do character add/delete when there is a selection.
 2012-05-17 09:05:30 -07:00
Ben Murdoch
74d37b9653 Fix up the WebCoreThreadWatchdog 
Make the WebCoreWatchdog aware of the WebViews it is monitoring
(rather than the Activity context which may become stale) and
ensure that the code for the prompt dialog is run on the UI
thread.

Bug: 6420310
Change-Id: Ied003938edb04858c85bcc2491c4b2c4c0ede6eb
 2012-05-17 12:38:07 +01:00
John Reck
94c478e9e5 Don't send an ontouchmove until slop is exceeded 
Bug: 6490959

Change-Id: I0f447f65c84f9ce208ce52caba05e7dcb2f76bc5
 2012-05-16 20:34:48 -07:00
John Reck
b27a4f9b0e Merge "Remove custom scrollbar logic" into jb-dev 2012-05-16 17:35:08 -07:00
John Reck
7c2e329ef2 Remove custom scrollbar logic 
Bug: 6505722
 When we scroll the base layer we do so by calling scrollTo on the view,
 which handles all the scrollbar logic for us. Remove the custom keep alive
 code which floods the handler queue, as well as remove the unnecessary
 invalidate and awakenScrollbar calls (View does that for us)

Change-Id: Ia2503c549a22ec71d99295fe62b676fecc367ea3
 2012-05-16 15:21:18 -07:00
George Mount
c4c3bc9b83 Remove selection highlight when replacing/deleting. 
Bug 6506101

Change-Id: Ia5729aafa30cbb502e94adf92f7534cb552199a6
 2012-05-16 15:20:03 -07:00
George Mount
0925a76bb9 Only clear the caret when in caret selection mode. 
Bug 6506761

Change-Id: I5772691053bff30c25870e6068f5d85b850b7b81
 2012-05-16 15:01:46 -07:00
John Reck
435e6f5fd2 Fix android:focusableInTouchMode support 
Bug: 6448106

Change-Id: I17161754eaf08145623466a6db25893e3e5b2e16
 2012-05-16 14:56:20 -07:00
George Mount
5d09bf69e2 Don't do character add/delete when there is a selection. 
Bug 6506644

Change-Id: I91584b7df23951bc5e735b25161ed6e0bcdbc2b7
 2012-05-16 14:56:09 -07:00
John Reck
7a59c5aebc Merge "Always do a HIT_TEST" into jb-dev 2012-05-15 16:55:45 -07:00
Chris Craik
6675f691ed Merge "Invalidate on new picture if scale/content size changes" into jb-dev 2012-05-15 15:28:21 -07:00
Chris Craik
02c2f45ea2 Invalidate on new picture if scale/content size changes 
bug:6497496
Change-Id: Id6de6f83f7bf8a9a4ebcfed61e6b3985d7f19efe
 2012-05-15 10:41:49 -07:00
George Mount
899f609f78 Only open CAB for long-press. 
Bug 6182286

Change-Id: I18590c457548e63cf45f5f7b626f5e8bd855f521
 2012-05-15 08:28:28 -07:00
John Reck
41f73bdf4d Always do a HIT_TEST 
Bug: 6490959
 The issue here is that if the page calls preventDefault on a
 touchstart handler WebViewClassic will not do a HIT_TEST as it
 doesn't get the ACTION_DOWN. This means that the mouse is in the
 wrong position when the click ultimately fires.

 This changes it so that WebViewInputDispatcher will always do a
 HIT_TEST at the start of a touch stream, which ensures that the
 mouse is positioned correctly.

Change-Id: I1aaca7692e2c7aeedeb21fa3592cd4cb3223ea25
 2012-05-14 18:40:48 -07:00
Chris Craik
dbd98bfecb Merge "Remove unused native method" into jb-dev 2012-05-14 17:04:10 -07:00
Chris Craik
8230231c88 Remove unused native method 
depends on external/webkit change: https://android-git.corp.google.com/g/#/c/190468/

bug:6486310
Change-Id: Id1c1eabf27135c73e45a489ab4c7cfa26e0c9def
 2012-05-14 15:57:06 -07:00
George Mount
647827a5d3 Change selection to use left/right instead of base/extent. 
Bug 5859620
 Simplify text selection to use left/right rather than
 base/extent. In combination with webkit change, this
 fixes RTL selection. The handle directions are properly-
 facing when the text direction is the same for both
 sides of selection.
 Webkit Change: I3362c5034ce08ce1517a86882c13b78aff35fe3f

Change-Id: Ib88ed2327182ba5b47b3e41584cbe944d05c8ada
 2012-05-14 11:24:56 -07:00
Mangesh Ghiware
05efb04c38 Merge "Maintain the anchor at top/left on orientation change." into jb-dev 2012-05-12 16:04:00 -07:00
Mangesh Ghiware
cf034e3773 Maintain the anchor at top/left on orientation change. 
Bug: 5291151
Change-Id: Id1d5c157668440fe4d0d1214477ba31e8f02d6b6
 2012-05-12 14:46:05 -07:00
John Reck
dee9d9ab9f Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev 2012-05-11 14:23:18 -07:00
John Reck
387c2e8d42 Prevent updateStateTrackers from being affected by preventDefault() 
Bug: 6477996
 Calling e.preventDefault() on a javascript touch handler is apparantly
 not supposed to prevent the default gesture detector, who knew?

Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
 2012-05-11 13:50:57 -07:00
Teng-Hui Zhu
422400f92d Fix a crash. 
End can happen when error happens, but media controller may be not ready yet.

bug:5340224
Change-Id: I94607dfdf26d2dc4c7bbc9c2a62f98deccb8d198
 2012-05-11 13:00:03 -07:00
Teng-Hui Zhu
9ac320406b Merge "Keep the controller when video ended." into jb-dev 2012-05-11 10:00:06 -07:00
Teng-Hui Zhu
6df5ca08f1 Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev 2012-05-11 09:59:57 -07:00
Teng-Hui Zhu
4dd9dc8204 Keep the controller when video ended. 
Use the media controller as a reminder to the user when the video ended.
We don't quit the video here b/c user may want to replay the video.

bug:5340224
Change-Id: I6d5fdb54bb614277b75e1a18ebe0a7dadd47017e
 2012-05-10 17:23:24 -07:00
Teng-Hui Zhu
c2b06d5a83 Avoid inline->fullscreen reload for html5 video. 
Now when a user start inline play and then switch to full screen, there is no
reload any more.
Basically, we change mediaplayer as a static member, and detect possible
situation to skip the prepare work.

bug:5710646

Change-Id: Ida34cf2e919a6cc8e0d52cd1175d51b5f5d527f7
 2012-05-10 16:46:51 -07:00
John Reck
55c68f14e1 Fix locking for skip draw 
Bug: 6469098

Change-Id: I3e6903072994a5a0437c40dcf211ddb707883a69
 2012-05-09 14:08:01 -07:00
Chris Craik
b010601c41 Merge "Pass webview instance when getting base layer / color, and prevent null value" into jb-dev 2012-05-08 16:40:20 -07:00
George Mount
5602d02389 Merge "Scroll edit text into view when keyboard shows." into jb-dev 2012-05-08 16:25:58 -07:00
Chris Craik
b5dc215a19 Pass webview instance when getting base layer / color, and prevent null value 
Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/188470/

bug:6429897
Change-Id: Ic948f102034dbe57c61d7fc6de73a4ddd062f686
 2012-05-08 14:00:32 -07:00
Chris Craik
aa9972943c Merge "Revert "Add temporary functor lifetime logging"" into jb-dev 2012-05-08 13:35:09 -07:00
Chris Craik
12d434a9be Revert "Add temporary functor lifetime logging" 
bug:6445573

This reverts commit 2fe99801e8
 2012-05-08 13:07:13 -07:00
George Mount
312cad6e2f Scroll edit text into view when keyboard shows. 
Bug 6445642

Change-Id: Iaf08b7e441b7abc07499b731575ab0a60c5175a2
 2012-05-08 10:17:16 -07:00
Teng-Hui Zhu
87156c96f5 Merge "Replace tree observer with a JNI call at draw time" into jb-dev 2012-05-08 09:26:46 -07:00
John Reck
7c38077edf Merge "Fix inval issue" into jb-dev 2012-05-08 09:14:50 -07:00
John Reck
0bb0198d5b Fix inval issue 
Bug: 6323847

Change-Id: Ibe9fc46af597cd97ae76339533faacfaa6d952fc
 2012-05-08 09:08:50 -07:00
John Reck
975b9b787a Merge "Delay creating Java objects for WebHistoryItem" into jb-dev 2012-05-08 08:49:39 -07:00
Teng-Hui Zhu
658e99908a Replace tree observer with a JNI call at draw time 
webkit change:
https://android-git.corp.google.com/g/#/c/188148/

bug:6447729

Change-Id: I8062583751cc10fc65b30d10277b2f2271b58661
 2012-05-07 17:48:23 -07:00
John Reck
69adc539e2 Delay creating Java objects for WebHistoryItem 
Bug: 6447632

Change-Id: Ia326f12d0b64ebed10b9647b78ff01a1916533d3
 2012-05-07 16:40:51 -07:00
John Reck
a09b06efff Merge "Remove heldMotionless disabling native scroll mode" into jb-dev 2012-05-07 11:33:13 -07:00
Selim Gurun
ee00b31a54 Merge "Use private key context when necessary" into jb-dev 2012-05-07 10:54:24 -07:00
John Reck
ff0e8cd8b6 Merge "Drain any pending touch events immediately if possible" into jb-dev 2012-05-07 10:05:00 -07:00
John Reck
3ea7f216d9 Remove heldMotionless disabling native scroll mode 
Bug: 6448030

Change-Id: I9c673208eb2302ea772931e15266e02cb0129ce5
 2012-05-06 16:27:32 -07:00