summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* improvement and fixes for bindings test (DO NOT MERGE)Guang Zhu2010-06-163-8/+44
| | | | | | | | | | * the name "testComplete" will cause test runner to actually execute it as a test case, which is not the intention here, changed to "notifyComplete" * the test depends on "/sdcard/bindings_test.html". since the same file is already being carried in the apk as asset, added a setup/teardown step to extract the file. this removes manual setup step for the tests. Change-Id: I74dc42a7ca0442a84910441e535d950c049efc98
* am d72e5655: Import revised translationsKenny Root2010-06-093-3/+3
|\ | | | | | | | | | | | | Merge commit 'd72e5655ac29a4a11d4a97601bebc67a1374290e' into kraken * commit 'd72e5655ac29a4a11d4a97601bebc67a1374290e': Import revised translations
| * Import revised translationsKenny Root2010-06-093-3/+3
| | | | | | | | Change-Id: Ic53da3c82a9c2107063fcb1a477c91efc74da613
* | am f7bd7ee8: Import revised translationsKenny Root2010-05-175-26/+26
|\ \ | |/ | | | | | | | | | | Merge commit 'f7bd7ee84d6588b43758909706969f432994825f' into froyo-plus-aosp * commit 'f7bd7ee84d6588b43758909706969f432994825f': Import revised translations
| * Import revised translationsKenny Root2010-05-175-26/+26
| | | | | | | | Change-Id: Ie400c25c714f97c9ff7b9d1cc1b26d368743af1a
* | merge from open-source masterThe Android Open Source Project2010-05-121-1/+4
|\ \ | | | | | | | | | Change-Id: I53af51f3c14806f2302daeea62a125621851d2cc
| * \ Merge "Prevent browser becoming unresponsive when surfing to a URL with many ↵Jean-Baptiste Queru2010-05-111-1/+3
| |\ \ | | | | | | | | | | | | %-escaped characters."
| | * | Prevent browser becoming unresponsive when surfing to a URL with many ↵Mats Mattsson2010-05-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %-escaped characters. Surfing to a webpage with many %-characters in the URL will hang the browser for several minutes. To reproduce: String url = "http://zh.wikipedia.org/wiki/%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5 %8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8?%E4%B8%AD%E5%8D%8E %E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94 %BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5 %8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E %E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94 %BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5 %8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E %E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94 %BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5 %8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8"; Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); intent.addCategory(Intent.CATEGORY_BROWSABLE); startActivity(intent); The raw URL is used to match previously visited URLs in the history database with the SQL LIKE operator. The LIKE operator does however treat %-signs as wildcards and an exhaustive and unnecessary search is made. The fix uses the ESCAPE functionality of LIKE to treat the %-signs in the URL as non-wildcards. As underscore is treated as also treated as a wildcard, it is escaped as well. Change-Id: I20d182bc76b339c49ad23acc1c4d735414310b04
* | | | merge from open-source masterThe Android Open Source Project2010-05-101-1/+4
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Iaaf00603ec92506775c28cc6a4cc587d3a02939a
| * | | Merge "Fixing a monkey crash in the BrowserSettings"Jean-Baptiste Queru2010-05-101-1/+4
| |\ \ \ | | |/ / | |/| |
| | * | Fixing a monkey crash in the BrowserSettingsHenrik Baard2010-04-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Monkey crash, sometimes the function getCurrentTopWebView() can return null causing a crash in clearFormData(). Change-Id: I27d38fafd448a3922a09bbdf2b31ab6f78fecf88
* | | | merge from open-source masterThe Android Open Source Project2010-05-050-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Idaf3d86b8b54f80ed31e2ef7e7a7ea9d566c43e7
| * | | Merge "Removed findbugs warnings from BrowserActivity."Jean-Baptiste Queru2010-05-041-2/+2
| |\ \ \
| | * | | Removed findbugs warnings from BrowserActivity.Henrik Baard2010-04-211-2/+2
| | |/ / | | | | | | | | | | | | Change-Id: I4b5bc7b66ffb44483d0783f05b02558f709382ee
* | | | merge from open-source masterThe Android Open Source Project2010-05-033-70/+94
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Change-Id: I5dbf9446b7d4409ec843ee800c82ec06bda7c8db
| * | Merge "Fixed FindBugs warnings in BrowserBackupAgent.java"Jean-Baptiste Queru2010-04-291-17/+40
| |\ \
| | * | Fixed FindBugs warnings in BrowserBackupAgent.javaHenrik Baard2010-04-211-17/+40
| | |/ | | | | | | | | | | | | | | | This makes sure that streams are closed in corner cases. Change-Id: I185c0dbddc09338de3a63eab22c57afb8d1a9c1a
| * | Merge "Optimized Maps usage by adding explicit types and improved performance"Jean-Baptiste Queru2010-04-291-44/+45
| |\ \
| | * | Optimized Maps usage by adding explicit types and improved performanceHenrik Baard2010-04-271-44/+45
| | |/ | | | | | | | | | | | | | | | | | | Optimized the use of Maps for improved runtime performance, the site object can be accessed directly. Change-Id: Icfcd020541e806427c4ac7ba0817d30b2c7eb9a5
| * | Fixed FindBugs warnings in ErrorConsoleView.javaHenrik Baard2010-04-271-1/+1
| |/ | | | | | | | | | | Save some memory by marking ErrorConsoleMessageList static. Change-Id: I6034eb295fde9639073f2c15c872743afd5aefe1
* | Import revised translationsKenny Root2010-04-293-35/+35
| | | | | | | | Change-Id: Ia3b502bb0fc75f6904d76b374e6404e068f51d31
* | Fix mismatched tag in stringsKenny Root2010-04-281-1/+1
| | | | | | | | | | Bug: 2633674 Change-Id: Ifb596ec9604cc1860e6d686610dd4876192f4a88
* | Import revised translationsKenny Root2010-04-2815-123/+123
| | | | | | | | Change-Id: I34a5ad5422d17c6547da85be40006009c238d40e
* | Do not translate Latin-1 settingKenny Root2010-04-2722-21/+22
| | | | | | | | | | | | | | | | | | | | | | The string used for comparison against actual encoding values was being translated into different languages which made it not match any available possible values. This change corrects that and also adds in the case to use "SHIFT_JIS" that the Japanese translators had put in when it was translatable. Change-Id: I276bf4c8b2a150e9c2926633ed972bf3f3423831
* | Do not try to open a file that could not be downloaded.Leon Scroggins2010-04-261-1/+2
| | | | | | | | | | | | Bug 2629391 Change-Id: If4edf356d98f90baf9fa0168d995dc0793ff90ae
* | Move queryBookmarksForUrl to background thread.Leon Scroggins2010-04-233-56/+44
| | | | | | | | | | | | Bug 2611964 Change-Id: I8f69ec42fbf880d031cfc2372cffd9719db4e280
* | Now mBookmarksAdapter is created asynchronously,Grace Kloba2010-04-201-0/+1
| | | | | | | | | | we need to check null before using it. Fix http://b/issue?id=2610515
* | Merge "Using ViewStub to defer the inflation of GeolocationPermissionsPrompt ↵Grace Kloba2010-04-204-31/+32
|\ \ | | | | | | | | | until we first show it. This should shave 5% of Browser start up time." into froyo
| * | Using ViewStub to defer the inflation of GeolocationPermissionsPrompt until ↵Grace Kloba2010-04-204-31/+32
| | | | | | | | | | | | | | | | | | | | | we first show it. This should shave 5% of Browser start up time. Fix http://b/issue?id=2604295
* | | Click on notification for unfinished download, open downloads page.Leon Scroggins2010-04-192-28/+43
|/ / | | | | | | | | | | | | | | | | | | | | | | | | BrowserActivity: Use OpenDownloadReceiver as class name, so that it will handle the notification from download manager. OpenDownloadReceiver: If the download is not complete, show the downloads page. Bug 2606772 Change-Id: Ifeeac0943650552c6da232cf98088bbf958fd403
* | When loading a new Intent, remove appTab association.Leon Scroggins2010-04-151-0/+4
| | | | | | | | | | | | Bug 2598904 Change-Id: Ib4ef625606ccdae4b24efd0761f416e4851ca800
* | Merge "Use the green box's padding, and not the TitleBar's padding." into froyoLeon Scroggins2010-04-151-2/+2
|\ \
| * | Use the green box's padding, and not the TitleBar's padding.Leon Scroggins2010-04-151-2/+2
| | | | | | | | | | | | | | | | | | Bug 2566133 Change-Id: Ia780bcc74ad7317dfeea3adfc9a8c5eb4609d1f2
* | | Merge "Update screenshots in a background thread." into froyoPatrick Scott2010-04-151-23/+36
|\ \ \
| * | | Update screenshots in a background thread.Patrick Scott2010-04-151-23/+36
| |/ / | | | | | | | | | | | | Bug: 2591404 Change-Id: I380c77c1144a40b955b4fff321eb75c1c0765606
* | | Import revised translationsKenny Root2010-04-1420-61/+101
|/ / | | | | | | Change-Id: If6d037bcc8a78e790389dd9f573086f82966b1bc
* | Merge "Remove dangling comments from browser strings.xml." into froyoShimeng (Simon) Wang2010-04-121-36/+0
|\ \
| * | Remove dangling comments from browser strings.xml.Shimeng (Simon) Wang2010-04-121-36/+0
| | | | | | | | | | | | | | | bug: 2581328 Change-Id: I650b3434ec65640e78f2fc4b99f2c56a65e0831a
* | | More aggressively free up the background tabs whenGrace Kloba2010-04-121-29/+36
|/ / | | | | | | | | | | | | memory is low. Instead of free one tab per onLowMemory, free half of opened tabs as onLowMemory is not called as often as before. Fix http://b/issue?id=2583335
* | Create the bookmark adapter in a background thread.Patrick Scott2010-04-092-15/+31
| | | | | | | | | | | | | | | | Handling it asynchronously prevented an ANR but it still took forever with large databases. Bug: 2581894 Change-Id: I273375e439d7e3ac048728aabb39c6920fa87e5a
* | Use new assets for green box in voice title bar.Leon Scroggins III2010-04-094-3/+6
| | | | | | | | | | | | | | | | | | | | | | The new assets have a better margin to match the other search field textfields. Also update title_voice.xml to use a pressed state that matches the new assets. In TitleBar.java, do not clear out the vertical padding in voice search mode. Bug 2566133 Change-Id: Icb15d0660d2f06363e66adbdd92537e34b90b64e
* | Remove "Do not translate" and restore translationsKenny Root2010-04-0821-23/+40
| | | | | | | | | | | | | | | | | | | | Some "Do not translate" comments were inadvertently left when removing unused strings which made the translation tools skip the next string entry. This removes those comments and restores the translations for the missing strings. Bug: 2579112 Change-Id: I731217d4cf6581885c122fefd180133c243fa1f7
* | Treat voice searches from within the browser differentlyLeon Scroggins2010-04-082-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from those initiated from outside the browser. Fix for http://b/issue?id=2546173 For a voice search initiated from outside the browser, an appId will be attached. In that case, try to reuse the application tab. In TabControl.recreateWebView, treat this as if the url does not match the old url, so a new WebView will be created with a fresh history list, and the back key will exit the browser. However, if no appId is provided, simply reuse the current tab. In this case, the history list will be preserved, and pressing the back key will return to earlier voice searches. Change-Id: I9ec1efd56454ba94eb2bc348c4476fb6bd025dad
* | use 565 bitmap instead of 4444 to improve qualityCary Clark2010-04-081-1/+1
| | | | | | | | | | | | http://b/2577416 Change-Id: I74f00f700bbe7bc1be9b790e075fec111765341c
* | Update bookmark favicons in the background.Patrick Scott2010-04-061-19/+26
| | | | | | | | | | Bug: 2573890 Change-Id: I7c9ebfd1b561c40d806988e65f7e89d5cd283f89
* | Show the faked title bar even content height is 0.Grace Kloba2010-04-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | Otherwise for the new window, we may have a long delay for showing progress which is only shown in the faked title bar now. I verified that we still get the benefit from the previous change by moving the faked title bar from sub panel to its own window. Fix http://b/issue?id=2568875
* | Merge "add launch performance test for browser" into froyoGuang Zhu2010-04-022-0/+31
|\ \
| * | add launch performance test for browserGuang Zhu2010-04-012-0/+31
| | | | | | | | | | | | | | | | | | this is part of a larger effort to collect app launch performance for the platform. Change-Id: Id7159c67b0d746c9a109988e05f53be6a10921af
* | | Add "android.speech.extras.SEND_APPLICATION_ID_EXTRA"=false to theMike LeBeau2010-04-011-0/+5
| | | | | | | | | | | | | | | | | | voice search intent, as discussed in http://b/2546173 Change-Id: I60650d096a874cfe089a4ba691c9ae44802f2419
* | | Update the JNI bindings unit test in light of b/2540502Ben Murdoch2010-04-013-1/+30
| | | | | | | | | | | | Change-Id: I166331ce198fba188df5365695a20588870374c4