summaryrefslogtreecommitdiff
path: root/src/com/android/browser/BrowserActivity.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix 2 NPEs in the Browser.Patrick Scott2009-06-221-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | The first was from freeMemory getting a tab back that had already been freed. This is a really hard case to reproduce but it appears that it can happen. So just check for a null mMainView before trying to free the tab. The second was a null mTabOverview during the onAnimationStart method when animating to the tab overview. I think this is caused by message delays not being accurate enough to ensure the overview has been created. A check for null fixes the problem for now but I am working on a better solution to ensure animation message order.
* | Use a grid view for bookmarks page.Leon Scroggins2009-06-181-0/+43
| | | | | | | | | | | | | | | | | | | | | | The BrowserProvider now stores another blob for a screenshot of the page. If the current page is a bookmark, store a screenshot. When viewing bookmarks, show a gridview of screenshots of the bookmarks. Requires a change to framework to add THUMBNAIL to Browser.BookmarkColumns and to the HISTORY_PROJECTION
* | am 99189435: Update browser to use new Intent URI expansion.Dianne Hackborn2009-06-171-5/+16
|\| | | | | | | | | | | | | Merge commit '9918943559193e3e047a1c18442e2cdb0fe22b15' * commit '9918943559193e3e047a1c18442e2cdb0fe22b15': Update browser to use new Intent URI expansion.
| * Update browser to use new Intent URI expansion.Dianne Hackborn2009-06-171-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | This changes the browser's URI->intent processing to use the new generic "intent:" scheme supported by Intent. Doing so allows the user to provide links to arbitrary intents in a web page. The browser restricts which intents can actually be execute to those supported by the BROWSABLE category by adding this to the resulting Intent and making sure there is no explicit component in the Intent. With the addition of package-specific Intents, this allows people to have a link that is guaranteed to launch an activity in their own package, not allowing others to intercept it.
* | am 7944b7de: conflict fixMitsuru Oshima2009-06-171-3/+4
|\| | | | | | | | | | | | | Merge commit '7944b7def8b04c3dc0cb8815a8527aba8c91b219' * commit '7944b7def8b04c3dc0cb8815a8527aba8c91b219': conflict fix
| * conflict fixMitsuru Oshima2009-06-161-3/+4
| |
* | resolved conflicts for merge of 60e095c1 to masterGrace Kloba2009-06-161-53/+52
|\|
| * Add location info if the VIEW action to the Browser has ↵Grace Kloba2009-06-161-3/+48
| | | | | | | | EXTRA_APPEND_LOCATION on.
* | resolved conflicts for merge of 95d601f6 to masterPatrick Scott2009-06-111-7/+8
|\|
| * Shorten the tab animation duration and the overview delay.Patrick Scott2009-06-111-6/+6
| | | | | | | | Also fix a few NPEs from the UrlData change.
* | Only show the host portion of the url in the title bar.Leon Scroggins2009-06-111-1/+1
| | | | | | | | | | | | | | For security reasons, we want to ensure that the domain name of the current page is being shown in the title bar. Use BrowserActivity's method of building the url for the title bar, which also shows https if it is a secure site.
* | Merge commit '3b0a65' into fixMitsuru Oshima2009-06-111-37/+100
|\| | | | | | | | | | | Conflicts: src/com/android/browser/BrowserActivity.java
| * Squashed commit of the following:Mitsuru Oshima2009-06-101-34/+97
| | | | | | | | | | | | | | | | | | commit a81c695597665c0bae7e0af2ab98bf0d7ef96cbc Author: Mitsuru Oshima <oshima@google.com> Date: Wed Jun 10 14:45:55 2009 -0700 * added inline scheme support that shows content using WebKit#loadDataWithURL * removed data scheme from manifest
* | Updates to the browser's custom title bar.Leon Scroggins2009-06-091-12/+7
| | | | | | | | | | | | | | | | Use an asset copied from the Market for the background. Since this background is dark, change the title's text to white, as well as the dividing line. Changed the functionality of the buttons on the title bar. Also flipped the title and the url, and fixed a bug where "Loading..." remained for too long. Also added the drop shadow below the title bar.
* | am 0d7ae0ed: Fix a monkey crash.Leon Scroggins2009-06-051-0/+6
|\| | | | | | | | | | | | | Merge commit '0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8' * commit '0d7ae0ed82e21d472cde8cf92b5657d8ee8ca0d8': Fix a monkey crash.
| * Fix a monkey crash.Leon Scroggins2009-06-051-0/+6
| | | | | | | | | | | | | | The monkey crashed because getTopWindow() returned null. Ensure that we either have a top window, or we are in the tab picker. If neither is true, return false, to avoid the null pointer exception.
* | When a JavaScript console message is received from WebCore, write it to the log.Ben Murdoch2009-06-051-0/+11
| |
* | am bc5b9f35: Include ACCEPTED_URI_SCHEMA in url patterns to skip.Satish Sampath2009-06-041-0/+1
|\| | | | | | | | | | | | | Merge commit 'bc5b9f358a2b75bf3a104b9f5cd477ad2f6f740f' * commit 'bc5b9f358a2b75bf3a104b9f5cd477ad2f6f740f': Include ACCEPTED_URI_SCHEMA in url patterns to skip.
| * Include ACCEPTED_URI_SCHEMA in url patterns to skip.Satish Sampath2009-06-041-0/+1
| | | | | | | | | | | | Without this inclusion, the web search detection code thought that URLs of the format about:blank or about:debug were web searches and passed them on to the search provider.
* | Use a custom title bar that is touchable.Leon Scroggins2009-06-041-26/+85
| | | | | | | | | | | | The new title bar is thicker and has areas that can be touched to open the search bar, zoom in, zoom out, and stop a load. Also inserted a flag to use the old title bar.
* | am 598c9ccf: Do not use the original url in onReceivedTitle.Patrick Scott2009-06-041-1/+1
|\| | | | | | | | | | | | | Merge commit '598c9ccf8641e0e4563bba2fd5613bcb4de766ec' * commit '598c9ccf8641e0e4563bba2fd5613bcb4de766ec': Do not use the original url in onReceivedTitle.
| * Do not use the original url in onReceivedTitle.Patrick Scott2009-06-041-1/+1
| | | | | | | | | | | | | | | | We used to use the original url because that was what was entered into the history database. Now, with a change in webkit, the correct url will be passed to updateVisitedHistory if the server sent a redirect. This allows for the correct url and title to be displayed in the title bar as well as the correct url and title to be stored in the history.
* | resolved conflicts for merge of 565505 to masterSatish Sampath2009-06-031-27/+99
|\|
| * Use system default web search & suggestions providers.Satish Sampath2009-06-031-27/+99
| | | | | | | | | | | | - Web search was hard coded to Google and suggestions in the search dialog were hard coded to the GoogleSearch suggest provider package. Both now point to the system default web search/suggest provider which can include third party search engines. - I also removed the intent filter to handle action.WEB_SEARCH from the browser because it should no longer provide web search functionality for other apps, that feature is provided by the recently added WebSearchProvider package. Removing this intent filter also removes the browser from the list of web search providers in the system settings. - As part of this change I had to factor out the search shortcut code to a separate function, add a couple of new functions and modify the browser provider code to access cursor fields in a safe manner.
* | call webview's onPause/onResume in the right places:Mike Reed2009-05-281-12/+15
| | | | | | | | | | - pause when a view is in a non-current tab - pause the current view when the activity itself is paused
* | Add location info to the SEARCH and change it to use postUrl instead of ↵Grace Kloba2009-05-261-15/+60
| | | | | | | | | | | | | | | | loadUrl() when it is needed. Have to change the signature of sendAnimateFromOverview to include the extra postData field. Temp add ""&action=devloc" to enable server side location query.
* | Merge commit 'f2c5c1b555904400f4092888ae81b8ed74bfe026' into manualfixGrace Kloba2009-05-261-2/+4
|\| | | | | | | | | Conflicts: src/com/android/browser/BrowserSettings.java
| * Fix #1722851. Move the Browser's default home page to the resource so that ↵Grace Kloba2009-05-261-2/+4
| | | | | | | | we can localize it easily.
* | am 123ecfb2: bug fix: browser was not replacing whitepsace in url if scheme ↵Mitsuru Oshima2009-05-181-4/+4
|\| | | | | | | | | | | | | | | | | is not fully lowercased. Merge commit '123ecfb21e7ca670e3d04efe58780b3bac54a9a1' * commit '123ecfb21e7ca670e3d04efe58780b3bac54a9a1': bug fix: browser was not replacing whitepsace in url if scheme is not fully lowercased.
| * bug fix: browser was not replacing whitepsace in url if scheme is not fully ↵Mitsuru Oshima2009-05-181-4/+4
| | | | | | | | lowercased.
* | Track the package manager. So if there is a Browser plugin installed or ↵Grace Kloba2009-05-151-5/+52
| | | | | | | | unintalled, we will update the WebView properly.
* | Add UI support in the browser for HTML5 databasesNicolas Roard2009-05-111-6/+22
| |
* | Avoid using a deprecated method.Leon Scroggins2009-05-081-7/+6
| | | | | | | | | | | | The Cursor method commitUpdates has been deprecated, in favor of using ContentResolver.update. Eliminate this call of commitUpdates.
* | am 910ac1a: Merge change 1006 into donutAndroid (Google) Code Review2009-05-071-2/+19
|\| | | | | | | | | | | | | Merge commit '910ac1a8b53218984608d0d4ebde767f2c6c7f63' * commit '910ac1a8b53218984608d0d4ebde767f2c6c7f63': Update google_search_base for chinese language.
| * Update google_search_base for chinese language.Bill Napier2009-05-071-2/+19
| | | | | | | | Changed default search base for china to be www.google.cn and changed the language param.
* | Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the ↵Ben Murdoch2009-04-301-0/+29
| | | | | | | | browser.
* | am 761b3b5: Merge change 423 into donutAndroid (Google) Code Review2009-04-291-4/+3
|\| | | | | | | | | | | | | Merge commit '761b3b5a23c06b64b9ecb99953665d2059e3b145' * commit '761b3b5a23c06b64b9ecb99953665d2059e3b145': Show the saved picture for freed tabs.
| * Show the saved picture for freed tabs.Patrick Scott2009-04-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a small class containing the data needed to display the saved or current picture. For freed tabs, inflate the picture and use the saved state from mSavedState. Reorganize populatePickerData to use the current top window or the saved state depending on if the tab has been freed. There was another bug where onNewPicture would update the wrong FakeWebView due to ListViews reusing the same view. Have the tab manage the new picture and invalidate the FakeWebView. When reusing the view, clear out the tab's FakeWebView field. Wipe all the picker data at the same time the ImageGrid and ImageAdapter are cleared.
* | Merge donut into masterJean-Baptiste Queru2009-04-221-24/+30
|\|
| * Browser: Remove references to android.util.ConfigDave Bort2009-04-131-24/+30
| | | | | | | | | | | | | | The semantics of Config.DEBUG will be changing soon, and all other Config.* fields will become deprecated/hidden. BUG=1780938
| * Automated import from //branches/donutburger/...@142729,142729Grace Kloba2009-03-251-14/+0
| |
| * Automated import from //branches/donutburger/...@142261,142261Grace Kloba2009-03-241-0/+14
| |
| * Automated import from //branches/donutburger/...@141637,141637Ramanan Rajeswaran2009-03-241-2/+3
| |
| * Automated import from //branches/donutburger/...@140604,140604Patrick Scott2009-03-241-9/+71
| |
* | Check for null before animating the tab/webview.Patrick Scott2009-04-201-7/+13
| | | | | | | | | | | | The tab will most likely not be null but the top window could easily be null if the tab has been freed due to low memory. Update getTabIndex to return -1 if the tab is null.
* | Merge branch 'readonly-p4-master'Grace Kloba2009-04-141-9/+20
|\ \
| * | AI 146114: Fix #1770479. When a window is opened by "Open in new window", ↵Grace Kloba2009-04-141-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | back should take it back to the window where it is opened from. BUG=1770479 Automated import of CL 146114
* | | Merge branch 'readonly-p4-master'Patrick Scott2009-04-081-2/+4
|\| |
| * | AI 145181: There might not be a current tab during onDestroy so check beforePatrick Scott2009-04-081-2/+4
| | | | | | | | | | | | | | | | | | | | | detaching it from the view system. BUG=1746760 Automated import of CL 145181
* | | Use the new download manager APIs introduced in change 7400Jean-Baptiste Queru2009-03-311-10/+10
|/ / | | | | | | | | | | Conflicts: src/com/android/browser/BrowserActivity.java
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-23 07:58:19 +0000