Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,390 Commits 3 Branches 0 Tags
5c28267461abfde7007d4de1069a79e8a757f978
Commit Graph

2829 Commits

Author SHA1 Message Date
John Reck
6a05111556 am 45e84330: am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev 
* commit '45e843304f6f60e45d4371ce637e2fa442f4f28a':
  Use less static synchronized
 2012-09-20 20:27:53 -07:00
John Reck
9f9d34552f Use less static synchronized 
Bug: 6482144

Change-Id: I86161e3298101c10a112add406615001561e649e
 2012-09-20 15:25:16 -07:00
John Reck
91249ce452 am cfe353ba: am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'cfe353bad0e5daed9f2166ce37973f2a6b3d9c54':
  Fix DPI scaling on TVDPI
 2012-09-20 13:00:47 -07:00
John Reck
b6610d8289 Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 2012-09-20 10:21:41 -07:00
John Reck
6ec3d51280 am 76eac735: am 4be07ade: Merge "Revert "Test aggressive throttling"" into jb-mr1-dev 
* commit '76eac7353edc30fa7b09da2bfd89eadf04af14bc':
  Revert "Test aggressive throttling"
 2012-09-20 06:17:28 -07:00
John Reck
6013d8c25b Fix DPI scaling on TVDPI 
Bug: 6891214
 tvdpi has a density of 1.3312501 which we fail on as we assume
 you can take density and multiply by 100, cast to an int, and
 divide by 100f to get back to the original density. Force this
 assumption to be true by truncating density

Change-Id: I0caeb7768ee002f935b41c77a5579ffeed491f82
 2012-09-19 18:33:38 -07:00
John Reck
55bc7efaf9 Revert "Test aggressive throttling" 
Bug: 7182109
This reverts commit c7c85b34da.

Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b
 2012-09-19 14:26:48 -07:00
Kristian Monsen
7f52de24d6 am 7b1be537: am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev 
* commit '7b1be537546481c6687efd03c3c709b266502abf':
  Hiding some of the deprecated android.webkit API's
 2012-09-17 11:29:20 -07:00
Elliott Hughes
c3ff72f5bd Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
(cherry-pick of 47a0539ecaf7d7a15008704bd89f748aebf85d47.)

Conflicts:

	core/res/res/values/public.xml

Bug: 6811501
Change-Id: Ifb2e030a9fda85a7f664feac812b63e67780e68f
 2012-09-14 20:22:17 -07:00
Kristian Monsen
4cb846b8de Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev 2012-09-14 14:01:37 -07:00
Selim Gurun
4c6e2bb822 am 2d449a48: am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 
* commit '2d449a482c08d87a0d5409c1dda0695db0843c77':
  Minor update to addjavascriptinterface documentation
 2012-09-12 17:03:11 -07:00
Selim Gurun
36562741f9 am 6e28f1aa: am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 
* commit '6e28f1aacfa4c82ab0c8b740a24ed233b031272f':
  Make JavascriptInterface annotation public.
 2012-09-12 17:02:51 -07:00
Brian Carlstrom
0829a09f72 am 2e96c791: am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 
* commit '2e96c791e24454cf55144c64fe77321a31b746fe':
  Tracking upgrade to bouncycastle 1.47
 2012-09-12 17:02:47 -07:00
Kristian Monsen
f77e52e110 am 5710a2f1: am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 
* commit '5710a2f1269180c169855b98a8d33f2f12ced1a1':
  Deprecating methods (and a constant) for JB MR1
 2012-09-12 17:02:11 -07:00
Selim Gurun
c5c68d9789 am 77f02ca9: am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev 
* commit '77f02ca908e114df2e14a7671824f3374a509280':
  Deleting the defunct SearchBox interface.
 2012-09-12 15:28:53 -07:00
Selim Gurun
2137aa2afc am cccad2d8: am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev 
* commit 'cccad2d8c2ea309a73b9408f8c36e7d964627570':
  Added annotations for injected accessibility objects
 2012-09-12 15:15:04 -07:00
Selim Gurun
41ecd35fd9 am 3591fa3b: am 2fa10c67: Fix build break 
* commit '3591fa3bcd6c5204c6b0d470a186535b65b14042':
  Fix build break
 2012-09-12 15:14:09 -07:00
Selim Gurun
5977ecef0e am a7a5fa82: am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev 
* commit 'a7a5fa82cc997953b0206c4dd1d2ecc1b27f0cf2':
  Remove defunct searchbox implementation from webview.
 2012-09-12 15:13:43 -07:00
Selim Gurun
b4c02e6ffd Minor update to addjavascriptinterface documentation 
Change-Id: I67525673e3d061e00fbe8989c08050ad84e78920
 2012-09-12 13:36:21 -07:00
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Brian Carlstrom
0efca17105 Tracking upgrade to bouncycastle 1.47 
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
 2012-09-12 10:01:00 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00
Selim Gurun
e91d5bee24 Make JavascriptInterface annotation public. 
Bug: 7073422

This change makes @JavascriptInterface public and it requires
using this annotation to allow javascript access to public java
methods for API level JELLY_BEAN_MR1 and above. The behavior
does not change for API levels JELLY_BEAN and below.

Change-Id: I4108b17cf71b9ac273d7b61b1c8f7f5581e922ee
 2012-09-12 08:04:26 -07:00
Selim Gurun
79ccb1e8a9 Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev 2012-09-11 15:01:21 -07:00
Selim Gurun
a7094734ae Deleting the defunct SearchBox interface. 
Change-Id: Iecb698dbe942d3c9680ad1135ba0d604aa211856
 2012-09-11 13:27:08 -07:00
Selim Gurun
faed98a161 Merge "Added annotations for injected accessibility objects" into jb-mr1-dev 2012-09-11 13:23:45 -07:00
Selim Gurun
2fa10c675b Fix build break 
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
 2012-09-11 11:32:44 -07:00
Selim Gurun
0e9292b94a Remove defunct searchbox implementation from webview. 
The search box implementation has not been in use since ICS. This
removes dead code from webview.

Change-Id: I8a28eeeec556619abc4a902a3abec2ac52bad319
 2012-09-11 10:40:28 -07:00
Selim Gurun
b743a23fc5 Added annotations for injected accessibility objects 
Bug: 7073422

Provided @JavascriptInterface to methods that are accessible from
js.

Change-Id: If3bf8f5aa2b6ff38fe5358aad534ea31f6f546ae
 2012-09-11 10:24:44 -07:00
Selim Gurun
6eb6157da6 am d2d3bff2: am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev 
* commit 'd2d3bff22c339bc30452a6c79b703b6d22f08d3b':
  Control access to inherited methods of jsinterface objects
 2012-09-10 18:21:14 -07:00
John Reck
8627875d1c am 814b9a6c: am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev 
* commit '814b9a6cc161da3ec5c897783776faf48877d2e5':
  Fix some destroy bugs
 2012-09-10 17:16:53 -07:00
Teng-Hui Zhu
607caa925c am f6cc1ddc: am 4db5d23d: Merge "Back key to dismiss full screen video" into jb-mr1-dev 
* commit 'f6cc1ddc35d30a7314201011353840bd0aa8935b':
  Back key to dismiss full screen video
 2012-09-10 17:05:48 -07:00
Selim Gurun
94740e6c33 Control access to inherited methods of jsinterface objects 
Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Change-Id: I41927248e6bc4b09d17c0707c60fe5e6ab681e66
 2012-09-10 16:43:35 -07:00
John Reck
095e8aa02b Fix some destroy bugs 
Bug: 6961494
 Don't call clearHelpers in destroy(). It is already called
 in onDetach, which is where it needs to be. It can't be
 called by the finalizer

 Switch onCancel listener to onDismiss listener. Fixes an issue
 where destroying can live the webcore thread hung because onCancel
 won't be called, but onDismiss is

Change-Id: I669c389c8c9a81d92c27f88d83bcb711c6c0a5ee
 2012-09-10 16:07:04 -07:00
Ben Murdoch
040887f12a Merge "Proxy View.dispatchDraw through WebViewProvider." 2012-09-07 14:31:15 -07:00
Ben Murdoch
e623e24484 Proxy View.dispatchDraw through WebViewProvider. 
Provide a no-op implementation in WebViewClassic.

Change-Id: I44e64c261fb8b4387cb53f0625300c3527ba2e40
 2012-09-07 22:26:32 +01:00
Kristian Monsen
f4912580e6 Hiding some of the deprecated android.webkit API's 
Change-Id: I1775a2ff615d1633fe9a20a5af49623222d3d27b
 2012-09-07 15:34:20 -04:00
Kristian Monsen
5cc2351ded Deprecating methods (and a constant) for JB MR1 
Change-Id: I3eb0eaff5ea5d8984ad143f801efa19e25bd0685
 2012-09-07 15:34:13 -04:00
Teng-Hui Zhu
4db5d23dea Merge "Back key to dismiss full screen video" into jb-mr1-dev 2012-09-07 11:49:54 -07:00
Teng-Hui Zhu
5558eacfbf Back key to dismiss full screen video 
Also cleanup some warnings.

bug:6722752

Change-Id: Ib612cf79e9546d40a048c5f09a1be6ca37ce51f8
 2012-09-06 16:20:14 -07:00
Selim Gurun
fadf962d3c am a106ab46: am 18e87680: Merge "remove defunct javascript interface" into jb-mr1-dev 
* commit 'a106ab46ae07e1658ecfae20216995a275c11707':
  remove defunct javascript interface
 2012-09-05 16:30:08 -07:00
Selim Gurun
18e8768067 Merge "remove defunct javascript interface" into jb-mr1-dev 2012-09-05 15:04:07 -07:00
Selim Gurun
d773ca8ff2 remove defunct javascript interface 
Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Change-Id: I9441d461caf189467e4ad45de958c13b81f4ff17
 2012-09-05 11:53:44 -07:00
Adam Powell
1cab7d049f am e8f8fae5: am deeade34: Merge "Make WebView track focal points more accurately" into jb-mr1-dev 
* commit 'e8f8fae548d67f658d5627081e6a0167f68544ae':
  Make WebView track focal points more accurately
 2012-09-04 18:24:38 -07:00
Adam Powell
1027ed2aca Make WebView track focal points more accurately 
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
 2012-09-04 14:42:11 -07:00
John Reck
aeca6831fc am 7884112a: am fef288b0: am 8f58dfa9: am da5cd308: am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed." 
* commit '7884112af40607172e80afe30506affa60cf8712':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
 2012-08-30 11:50:39 -07:00
John Reck
fef288b01c am 8f58dfa9: am da5cd308: am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed." 
* commit '8f58dfa975d01c5c50de513848a6aa8a4460d32c':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
 2012-08-30 11:45:47 -07:00
John Reck
da5cd30802 am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed." 
* commit 'ae03afda41ace0721e48ed15ce35345bfa033116':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
 2012-08-30 11:41:38 -07:00
Johan Redestig
8655e9085c onSavePassword dialog can leak when WebViewClassic is destroyed. 
The AlertDialog creates in onSavePassword method leaks if
WebViewClassic is destroyed when the dialog is shown.

Change-Id: I81f20e1dd138467a6413766c0a081b389b334ae0
 2012-08-30 10:13:41 +02:00
Selim Gurun
49444838dc am 3b82c5de: am 8506ce1a: Merge "Provide referer to browser on download request." into jb-mr1-dev 
* commit '3b82c5de7f8da48cdfb45654be1773ac67cf6729':
  Provide referer to browser on download request.
 2012-08-29 15:44:46 -07:00