summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/Controller.java
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Multimedia feature port from ICS"Ricardo Cerqueira2012-11-191-10/+0
| | | | This reverts commit 9aa4a1b524d567c70967565bce2636f01c298d84.
* Merge commit 'android-4.2_r1' into mr1-stagingRicardo Cerqueira2012-11-191-15/+26
|\ | | | | | | Change-Id: Id36dc68dabccb44bd69de5580c8441cf7a6b6049
| * am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"John Reck2012-09-061-0/+5
| |\ | | | | | | | | | | | | * commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084': Added catch of SQLiteException when updating screenshot
| | * Added catch of SQLiteException when updating screenshotMattias Nilsson2012-09-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error found when running Monkey test. User probably tries to add a bookmark and directly after deleting it. The method updateScreenshot is running an AsyncTask and gets an Exception from the database when the bookmark does not exist. The deletion of the bookmark runs in another thread. Change-Id: I63bb954419f60fb5106c1a6597692b6bac925714
| * | am cf00c263: Merge "Pause WebView timer when Browser is paused"John Reck2012-09-041-5/+4
| |\ \ | | |/ | | | | | | | | | * commit 'cf00c263557e1bd8ba060938cf8a451f2b92af2c': Pause WebView timer when Browser is paused
| | * Merge "Pause WebView timer when Browser is paused"John Reck2012-09-041-5/+4
| | |\
| | | * Pause WebView timer when Browser is pausedMattias Falk2012-09-031-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the Browser is paused while loading a page it shall finish loading the page before the WebView timer is paused. The WebView timer shall be paused in onProgressChanged when the progress has reached 100 not from onPageFinished since onPageFinished is called when the main frame is loaded and at that time subframe and other resources might haven't been finished loaded i.e. the page is still in load, which the result in WebView timers are not paused. With this patch the Browser won't consume system resources if it's minimized while doing a page load. Change-Id: Id971dbcedfbedb5b0e56cba4076cd724d590ac85
| * | | resolved conflicts for merge of 0570344a to jb-mr1-devJean-Baptiste Queru2012-09-041-7/+10
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I5853a3609caacf7b0ff0eecbb1ed697811b7430e
| | * | Pass webview's useragent when downloading via context menuAndreas Sandblad2012-09-031-7/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently null is passed as useragent to the Download Manager when downloading via Browser context menu (causes the Download Provider to use an empty useragent HTTP header). This commit simply passes the webview's useragent instead. This applies to the usecase when choosing save image/link via the context menu (long press). Change-Id: Ie9cc5e81630d0dcefe4708980146cc5ed867e4ad
| * | Pass referer on download requestsSelim Gurun2012-08-291-4/+5
| | | | | | | | | | | | | | | Bug: 6662557 Change-Id: Ib7fdc4b3f1e0f7370631d8a222565faaee550bfb
| * | Disable URL overriding on redirectsJohn Reck2012-06-141-0/+3
| |/ | | | | | | | | | | | | | | Bug: 5334118 When sending an intent for a URL with specialized handlers, tag it with an extra that will surpress subsequent redirections Change-Id: I997aa79192baea86c58958ab213200d57ec4c4f9
| * am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-041-0/+34
| |\ | | | | | | | | | | | | * commit '3c573ac4dbc0e9a117a9540c410911bab52dffa7': Enable voice search in omnibox
| * \ am 244cdfa6: Merge "Prevent the monkies with a sledgehammer" into jb-devJohn Reck2012-05-301-23/+52
| |\ \ | | | | | | | | | | | | | | | | * commit '244cdfa6eb0745a4b681cb704f5564050d88f7ed': Prevent the monkies with a sledgehammer
| * \ \ am f695f6b4: Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'f695f6b4399f3a60a5d9d0aa39b8c341e8b8592a': Tell Browser to monitor the WebCore thread for responsiveness.
| * \ \ \ am 501fa728: Merge "Added a menu item in Browser called Close other tabs"Jean-Baptiste Queru2012-05-171-0/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '501fa7284ae63fe28b8f81f403f24befa7c992dd': Added a menu item in Browser called Close other tabs
| | * | | | Added a menu item in Browser called Close other tabsAfzal Najam2012-05-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes all other tabs except the current one (only for the phone interface) Will submit patch for tablet interface once this is approved. It solves the problem of mass closing unneeded tabs to a certain extent. Preferred method would be to select multiple tabs like list items. Change-Id: I5af00f1c19043104987375f1da396eb6fefb5dd4
* | | | | | Add fullscreen toggle to menuNebojsa Cvetkovic2012-09-121-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7acecfc32dde250685f96354b45a91b93667114e
* | | | | | Adding exception handler for voice recognition activityAbhimanyu Garg2012-09-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs-Fixed: 395193 Change-Id: Icedba4ef192d56dfcc9918b2f8afe96b2c662fb9
* | | | | | Multimedia feature port from ICSDenise Cheng2012-09-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for runtime media preload configuration with 3 options: - Never - Only on WiFi (default) - Always Support video transition animation Change-Id: Idd03f5bb57d6f78ec8b8e407eba01904f392f554
* | | | | | Browser : Open in incognito tabDanesh M2012-07-241-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long click on a link now allows you to choose between opening in incognito/regular tab. Credits: Danesh M Signed-off-by: Arham Jamal <arhamjamal@gmail.com> Change-Id: Iba8e7446e69ae66e0bd957910e6309fdb0e0b947
* | | | | | Added a menu item in Browser called Close other tabsArham Jamal2012-07-241-0/+18
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes all other tabs except the current one (only for the phone interface) Will submit patch for tablet interface once this is approved. It solves the problem of mass closing unneeded tabs to a certain extent. Preferred method would be to select multiple tabs like list items. Credits: Afzal Najam Signed-off-by: Arham Jamal <arhamjamal@gmail.com> Change-Id: I5af00f1c19043104987375f1da396eb6fefb5dd4
* | | | | Enable voice search in omniboxMichael Kolb2012-06-041-0/+34
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6601348 Bring back voice search. Also fixes focus bug for fixed titlebar. Change-Id: I83c8ad96957b62c23ad0bbb35685712687d11213
* | | | Prevent the monkies with a sledgehammerJohn Reck2012-05-301-23/+52
| |_|/ |/| | | | | | | | | | | | | | | | | Bug: 6515134 If we never have a null mController, we can never have a NPE! Change-Id: Idf90b94e6557e0afd6dd92602b8e4dfd189218d1
* | | Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
|/ / | | | | | | | | | | | | | | We no longer enable the WebCore thread watchdog for all WebViews, but we still want the functionality in Browser. Bug: 6447214 Change-Id: I1665bef875d53239203bc6313ac39af4bda6a60b
* | Toggle QC request desktop iconMichael Kolb2012-05-161-1/+2
| | | | | | | | | | | | Bug: 6493939 Change-Id: I7787ab37b57fce8ea2332fefd1ace420357000ec
* | Don't capture pictureMichael Kolb2012-05-071-3/+4
| | | | | | | | | | | | Bug: 6439427 Change-Id: I7704d8c81bbb9e612faf3a3206cee245e746035b
* | Remove voice search handlingMichael Kolb2012-05-031-71/+1
| | | | | | | | | | | | Bug: 6439925 Change-Id: I1b7161a67fa0c20d87f147d6ed19c02e53093054
* | show IME when titlebar is selected in tab switcherMichael Kolb2012-04-241-2/+2
| | | | | | | | Change-Id: I83b60ac504c8300904d76753b92f6fb3a93c172f
* | Merge "Support fallback key events"John Reck2012-04-201-3/+4
|\ \
| * | Support fallback key eventsJohn Reck2012-04-191-3/+4
| | | | | | | | | | | | | | | | | | Bug: 6023055 Change-Id: Ifc36425d6b09d0938f7e08176a749159c27fe088
* | | Save and load snapshots asyncJohn Reck2012-04-191-31/+69
|/ / | | | | | | | | | | Bug: 5416822 Change-Id: I213c3507af61e7ca0354dad7e72ece7a2547f54e
* | Call find in the menuMichael Kolb2012-04-131-0/+1
| | | | | | | | | | | | Bug: 6337808 Change-Id: Ib51e5d34d1800d7216093c06b6881f94ad7bc439
* | Add support for HTML Media Capture "capture" attribute.Ben Murdoch2012-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Receive the value for the new "capture" attribute on HTML file pickers, and do the right thing with it. Requires changes in WebKit (I0a921be31fda79a43c05da4fe22d9c808d92709c) and the framework (I494adc1274ca21ce8fe52a6c7b6b758217927e66). Bug: 5771207 Change-Id: I38dfe2df043fdba1388384dbd3b5370737eb38e5
* | Monkeys everywhereMichael Kolb2012-04-121-2/+4
| | | | | | | | | | | | Bug: 6297208 Change-Id: I5728296944340e19402b2bc681f01e70aeaf8276
* | Submenus in QuickControlsMichael Kolb2012-04-111-12/+31
| | | | | | | | Change-Id: I5d4fe7fdac1fb58e2e89afe00c468eed632428db
* | Add "Share" option back to context menu for images.Victoria Lease2012-03-131-0/+12
| | | | | | | | | | | | Bug: 5904671 Change-Id: Id5b26035ddc8c04decc5f43ae4b859b396839a82
* | handle locale changes directly in BrowserMichael Kolb2012-03-081-0/+2
| | | | | | | | | | | | Bug: 6125790 Change-Id: I1326b5944260fe29ba9d68256d118238bcfdc3a0
* | Fixup browser to use WebView proxyJonathan Dixon2012-03-021-6/+8
| | | | | | | | | | | | | | | | Has to escape out to WebViewClassic whenever it needs a hidden API. Interdepends on https://android-git.corp.google.com/g/165608 Change-Id: Ic61dd7f57f75381864075605d5901f2688648cbd
* | Revert "Temporarily disable saved pages for Skia update"Derek Sollenberger2012-02-271-1/+0
| | | | | | | | This reverts commit efe667469ef06277ad95699c365fe9ba6b44f4d5.
* | Move thumbnail update to onProgressChangedJohn Reck2012-02-211-16/+15
| | | | | | | | | | | | | | | | Bug: 5960873 onPageFinished happens with in-page navigation, but onProgressChanged doesn't. Use that to avoid taking unnecessary thumbnail captures Change-Id: Ifbc83e3f654c81cc01d52a6ece129f96e888bf67
* | Merge "Temporarily disable saved pages for Skia update"Derek Sollenberger2012-02-071-0/+1
|\ \
| * | Temporarily disable saved pages for Skia updateJohn Reck2012-01-261-0/+1
| | | | | | | | | | | | Change-Id: I931def1d52eb792f8ada99946b0c419936e01771
* | | Fix mMenuIsDown trackingJohn Reck2012-02-031-6/+10
|/ / | | | | | | Change-Id: I4aeb1f420c885181dc6016e317c2e716876db549
* | fix anchor link url bar updatesMichael Kolb2011-12-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | Bug: 5621026 Allow onPageFinished to reach Controller for links with anchor tags Note that the bookmark thumbnail update won't overload the async task anymore, since only one update message is active at any given time (see bug: 4517571) Change-Id: Iaeb9950ef15446aa9c824c7196f26a748591c944
* | Another monkey NPEMichael Kolb2011-12-151-0/+1
| | | | | | | | | | | | Bug: 5737769 Change-Id: Ie1a485222df6b470d95ace9130b5cf2591a231df
* | Make Ctl-Tab and Shift-Ctl-Tab cycle tabsMichael Kolb2011-12-151-4/+10
| | | | | | | | | | | | Bug: 5731975 Change-Id: I1dd44b25f718a2270d5965a8f3f5dab096398856
* | am c5b0b2db: Fix yet another Monkey NPEMichael Kolb2011-11-301-1/+2
|\ \ | |/ | | | | | | * commit 'c5b0b2db3b917e658700642763fb50da0057716b': Fix yet another Monkey NPE
| * Fix yet another Monkey NPEMichael Kolb2011-11-291-1/+2
| | | | | | | | | | | | Bug: 5685380 Change-Id: Ida841160df6e76318ebb8e2b3804a40184b96161
* | am 7431a694: Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
|\ \ | |/ | | | | | | * commit '7431a694054d56b5d56410f708f97bc2a81ae5e3': Fix NPE at startup
| * Fix NPE at startupMichael Kolb2011-11-281-1/+1
| | | | | | | | | | | | Bug: 5676863 Change-Id: I673699e577f0ed2cfa85260f905ccccc0d852399