Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,458 Commits 3 Branches 0 Tags
607b414d0444067e166fa54d8ea37563f2715ea3
Commit Graph

2964 Commits

Author SHA1 Message Date
Marco Nelissen
13bfebd6b7 Add VideoView.getAudioSessionId() 
This lets apps get the audio session id of the video being played, so
they can apply effects to the audio track.
b/8767565

Change-Id: Iaa39d97d0b6fb528ed04b52d579afa58444ebcfe
 2013-05-09 15:50:38 -07:00
Alan Viverette
76f0c217fc Avoid crash when TextToSpeech calls onInit() from the constructor. 
If construction of a TextToSpeech object fails, it may call the
initialization listener's onInit() method before the assignment
of the constructed TextToSpeech object to a variable has occurred.

BUG: 8744558
Change-Id: I3404fdb39308009762371154b05d3653bab81ab2
 2013-04-29 14:59:04 -07:00
Kristian Monsen
5866570947 Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 2013-04-26 00:06:16 +00:00
Kristian Monsen
62cadf153f Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B 
Catching all excptions from reading from the AssetManager

Change-Id: I53f99484deda3778307eab2ae86ca9fc0ad2fead
 2013-04-24 16:41:24 -07:00
Selim Gurun
940718d859 am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit 'a68545796da33bd7fde616958e6abc7548d0a975':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:38:31 -07:00
Selim Gurun
a68545796d am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit 'fa1f7d21e97b7225f1e7553abc0eebe06cc79367':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:35:29 -07:00
Selim Gurun
3c4fa65480 am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:19:41 -07:00
Geremy Condra
464be7975f am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp 
* commit '30504327364a7ad641c09a227f7930b9fba91614':
  Add a delimiter between scheme and host
 2013-04-19 23:19:20 -07:00
Geremy Condra
b7787a317f DO NOT MERGE Merge commit '8225df00' into bp 
Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
 2013-04-18 11:40:09 -07:00
Kristian Monsen
87c67f315c Merge "Part of fix for bug 8629392" into jb-mr2-dev 2013-04-17 02:22:26 +00:00
Kristian Monsen
083c4dc1ac Part of fix for bug 8629392 
Adding extra logging to fix cts bugs that are only on bots

Change-Id: I24b4b7aad200ffc23c002f4a8f0fe9246991c4f0
 2013-04-16 18:14:47 -07:00
Kristian Monsen
639857f7f4 Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev 2013-04-15 23:54:43 +00:00
Kristian Monsen
98dedf7ccc Fix for bug 8607049: Improve javascript dialogs for classic 
Make a common JsDialogHelper for classic and chromium webview
Improve on before unload dialog

Change-Id: Ib9711e4f95189ef8b2b31fc64aec7c0cb535d0e4
 2013-04-15 10:22:34 -07:00
Ben Murdoch
7e157f321c Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 2013-04-15 15:48:25 +00:00
Kristian Monsen
03499a23f9 Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 2013-04-12 21:05:15 +00:00
Kristian Monsen
83b002584c Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev 2013-04-12 04:50:20 +00:00
Ben Murdoch
924ac51ea6 Deprectate WebViewDatabase password methods. 
Bug: 8593749
Change-Id: I3d87fa43731a275af95f00933a5439d17a16ae80
 2013-04-11 13:51:59 +01:00
Kristian Monsen
b5cd8c0a81 Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread 
Mostly copied and pasted from the bug report.

Change-Id: I57cd19961f51fce266025d76ad9273a24f629c5b
 2013-04-10 19:04:40 -07:00
Kristian Monsen
0e0b2daa98 Fix for bug 8589670: Marking a not called WebChromeClient as deprecated. 
This is just a documentation improvement, the method is not called anymore.

Change-Id: I6f704f7f1a5eef5048b7bf2c52c0589bc8e99839
 2013-04-10 15:04:59 -07:00
Jonathan Dixon
f38b070b31 Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev 2013-04-09 20:09:29 +00:00
Jonathan Dixon
0bf4781ece Hide PlusinsEnabled/PluginsPath methods 
These have been deprecated since API level 8 / 9. Plugins are deprecated
overall now, so there's no requirement for apps to call these any more.

Change-Id: I1a27557644238477df00979f9badc9aab0a526c6
 2013-04-08 16:37:38 -07:00
ztenghui
7ce7b0068c Merge "HTML5Audio should handle content URI" into jb-mr2-dev 2013-04-08 19:58:22 +00:00
ztenghui
4233ec728d HTML5Audio should handle content URI 
Change-Id: Ib7ef4ad5fdd5b6b051ae32b0968a9bddef5c65ba
 2013-04-08 11:42:53 -07:00
Kristian Monsen
4ac0462e71 Merge "Adding new Chomium-WebView property key, and deprecating old key." into jb-mr2-dev 2013-04-05 17:17:25 +00:00
Selim Gurun
679c8f689f am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '38915fd4d466cc233189bf5b5c11d7f03a416d35':
  Revert "Add a delimiter between scheme and host"
 2013-04-04 11:00:46 -07:00
Selim Gurun
38915fd4d4 Revert "Add a delimiter between scheme and host" 
This reverts commit aa2163dd2a

Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
 2013-04-04 17:14:29 +00:00
Selim Gurun
8225df007e am aa2163dd: Add a delimiter between scheme and host 
* commit 'aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8':
  Add a delimiter between scheme and host
 2013-04-03 21:05:40 -07:00
Selim Gurun
aa2163dd2a Add a delimiter between scheme and host 
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
 2013-04-01 16:04:23 -07:00
Jared Duke
b0e35846b8 Adding new Chomium-WebView property key, and deprecating old key. 
Also adding isExperimentalWebViewAvailable(), which is required to show/hide the corresponding setting in Developer Options.

BUG=8383477

Change-Id: I82608cb4a3c7a85c3ad9091365913df5f2663f9c
 2013-03-28 15:39:51 -07:00
Alan Viverette
8586af3050 Don't recycle accessibility event after sending. 
Bug: 8434656
Change-Id: Ic2ad41804280d58a3c58968a9cb7dd85b97fab86
 2013-03-20 16:27:33 -07:00
John Reck
93f99846df am bd5ee4d3: am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard" 
* commit 'bd5ee4d39c8d7d1fc2c1f94980875f1900880880':
  Fix NPE when pasting non-text from Clipboard
 2013-03-12 14:34:29 -07:00
Nils Holmström
df337f30e9 Fix NPE when pasting non-text from Clipboard 
When copying a link from a bookmark and then pasting it into
a textfield a NullPointerException will occur.
A ClipData.Item is not guaranteed to always contain a text string
and therefore getText() can be set to null.

Using method coerceToText() instead of getText() makes sure that
a text string is always returned.

Change-Id: I81343c0371835a3a7a52045dcd1760e69e59a967
 2013-03-12 20:49:14 +09:00
Selim Gurun
2905e18b03 Add a delimiter between scheme and host 
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
 2013-03-08 14:29:56 -08:00
Victoria Lease
913f3c8f17 am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel" 
* commit '263554ae5f51fe1181c0c80123ec7f489e124f1a':
  FIX Null Pointer Exception on dialog cancel
 2013-03-05 23:53:48 +00:00
Victoria Lease
b2f91e7b23 am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually" 
* commit '8ef243cf861044eec35ee3d8207561251e34c77c':
  Audio continue to played even if paused manually
 2013-03-05 23:53:46 +00:00
Victoria Lease
7d4e52baee Merge "FIX Null Pointer Exception on dialog cancel" 2013-03-05 23:25:16 +00:00
Roger Chen
002ecd2122 Audio continue to played even if paused manually 
Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.

This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
 resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.

Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-03-05 13:05:34 +00:00
Brian Carlstrom
42ca4975dc am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding" 
* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
 2013-03-05 00:56:05 +00:00
Ben Murdoch
4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 2013-03-04 19:40:55 +00:00
Selim Gurun
7be6d4c421 Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev 2013-03-01 21:46:42 +00:00
Selim Gurun
2bca22b2a5 Clarify the API documentation for WebSQL database. 
Bug: 8231270

WebSQL database is disabled by default. And setting change to
enable it must precede the first url navigation. This change
is to clarify this behavior.

Change-Id: Ic0aab764821daece83f3482b30df4bebc7ff1f37
 2013-03-01 13:35:12 -08:00
Jonathan Dixon
1001012808 Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev 2013-03-01 21:09:06 +00:00
Brian Carlstrom
6bae82a2ae Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding 
Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5
 2013-03-01 09:13:26 -08:00
Ben Murdoch
95afb3b11a Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE 
Trivial cherry pick from master, see
Id1182537e073a9dd7746e23eec20accacedd9fc8

historyURL must be a valid URL.

Bug: 7907196
Change-Id: I1f32a9bda4ae627f242b2533eca18aef3ba25411
 2013-03-01 17:12:16 +00:00
Jonathan Dixon
6877006646 Merge "Fix javadoc build" into jb-mr2-dev 2013-02-28 23:37:23 +00:00
Jonathan Dixon
98fac170b1 Fix javadoc build 
Change-Id: I99eb6713fb221e1a3a8e54d621038104913dc03a
 2013-02-28 15:32:10 -08:00
Jonathan Dixon
0af1c59762 Merge "Deprecate various WebView related methods" into jb-mr2-dev 2013-02-28 22:11:36 +00:00
Jonathan Dixon
835b1fcc31 Deprecate various WebView related methods 
WebSettings:
PluginState - plugins depreacted and will not be supported in future.
setRenderPriotity - b/6335436
setLightTouchEnabled - b/7683972 it's s no-op.
setAppCacheMaxSize - has a sensible default and will  be obsolete in
                     future with HTML Quota Management API. b/6236763

WebStorage.setQuotaForOrigin - same as setAppCacheMaxSize

WebView:
clearView, showFindDialog - buggy, can be achieved otherways
savePassword - not useful/usable in practice; see b/5012826
             - stock browser used hidden APIs to achieve this feature

WebIconDatabase:
Other than the open() method, this does nothing useful. b/7331507

Change-Id: I01793f7b34978046eb54033477fca2da96e69c2e
 2013-02-28 13:01:48 -08:00
Jonathan Dixon
89f48e9ffc Remove obsolete target-densitydpi documentation 
Bug: 7999930

In general WebView.java is not a good place for HTML/CSS reference
guide, and more specifically target-densitydpi is an obsolete CSS
feature that is being phased out in modern browsers.
http://petelepage.com/blog/2013/02/viewport-target-densitydpi-support-is-being-deprecated/

Change-Id: Idd5cf09bb44e9f5f13f57e5f1c4b5c8ae1fc069b
 2013-02-27 16:48:28 -08:00
Ben Murdoch
52643e0ceb Update WebView#PictureListener for JBMR2. 
Now JBMR2 constant is defined, update code and docs to use it.

Bug: 8241082
Change-Id: If221c6524b79cc259ffc71fc218b141ffe6ed790
 2013-02-27 11:38:25 +00:00