summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
Commit message (Collapse)AuthorAgeFilesLines
* Use a grid view for bookmarks page.Leon Scroggins2009-06-184-4/+295
| | | | | | | | | | | 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.
| * When searching the browser history, search titles.Leon Scroggins2009-06-151-2/+5
| | | | | | | | | | Copy of change https://android-git.corp.google.com/g/Gerrit#change,2450 into donut.
* | Fix a null pointer exception.Leon Scroggins2009-06-151-1/+4
| | | | | | | | | | In setTitleAndUrl, check to make sure url is non null before calling url.toString().
* | Merge change 4094Android (Google) Code Review2009-06-154-170/+202
|\ \ | | | | | | | | | | | | * changes: Consolidate bookmark add/delete code in the browser.
| * | Consolidate bookmark add/delete code in the browser.Leon Scroggins2009-06-154-170/+202
| | | | | | | | | | | | | | | Driven by a desire to put bookmarking functionality into the title bar, I have consolidated the code for adding and removing bookmarks.
* | | am e2c52f76: Merge change 4105 into donutAndroid (Google) Code Review2009-06-151-14/+63
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit 'e2c52f7689c684ff6b962b20d45f41f52e8749cc' * commit 'e2c52f7689c684ff6b962b20d45f41f52e8749cc': Honor the system setting of whether to show web suggestions.
| * | Merge change 4105 into donutAndroid (Google) Code Review2009-06-151-14/+63
| |\ \ | | | | | | | | | | | | | | | | * changes: Honor the system setting of whether to show web suggestions.
| | * | Honor the system setting of whether to show web suggestions.Leon Scroggins2009-06-121-14/+63
| | | |
* | | | Add browser settings for DOM storage support.Ben Murdoch2009-06-151-1/+5
| | | |
* | | | 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-112-2/+2
| |_|/ |/| | | | | | | | | | | | | | | | | 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
* | Call the WebViewCore's freeMemory instead of just clearCacheDerek Sollenberger2009-06-101-3/+3
| |
* | Updates to the browser's custom title bar.Leon Scroggins2009-06-092-46/+55
| | | | | | | | | | | | | | | | 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 bd34f7db: Merge change 3134 into donutAndroid (Google) Code Review2009-06-041-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit 'bd34f7dbbb25059121c2eb9f0d3d8478d78e7e63' * commit 'bd34f7dbbb25059121c2eb9f0d3d8478d78e7e63': Change the default client id for better stats
| * Merge change 3134 into donutAndroid (Google) Code Review2009-06-041-1/+1
| |\ | | | | | | | | | | | | * changes: Change the default client id for better stats
| | * Change the default client id for better statsRamanan Rajeswaran2009-06-031-1/+1
| | |
* | | 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-042-26/+221
| | | | | | | | | | | | | | | | | | 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-032-61/+162
|\ \ | |/
| * Use system default web search & suggestions providers.Satish Sampath2009-06-032-61/+162
| | | | | | | | | | | | - 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.
* | am c5f4f732: Use "unknown" as the default value for the client id to avoid ↵Patrick Scott2009-06-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | crashing. Merge commit 'c5f4f732aea6303e5c3630d982847a26d41715f5' * commit 'c5f4f732aea6303e5c3630d982847a26d41715f5': Use "unknown" as the default value for the client id to avoid crashing.
| * Use "unknown" as the default value for the client id to avoid crashing.Patrick Scott2009-06-021-1/+1
| |
* | Enable setting home page from bookmarks/history.Leon Scroggins2009-05-282-1/+14
| | | | | | | | | | | | | | Fix for issue 1482954: Longpress on bookmark or history should set homepage [1/1]. Add a string for set homepage. Add the option in both the context menu for the browser history and for browser bookmarks. In BrowserHistoryPage and BrowserBookmarksPage handle the new option by setting the new homepage.
* | call webview's onPause/onResume in the right places:Mike Reed2009-05-282-39/+64
| | | | | | | | | | - 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 change 2450Android (Google) Code Review2009-05-261-2/+5
|\ \ | | | | | | | | | | | | * changes: Searching the history now checks for matches to the title.
| * | Searching the history now checks for matches to the title.Leon Scroggins2009-05-261-2/+5
| | | | | | | | | | | | | | | Fix for http://b/issue?id=1853732 : Searching the browser provider does not match bookmarks based on title.
* | | Merge commit 'f2c5c1b555904400f4092888ae81b8ed74bfe026' into manualfixGrace Kloba2009-05-262-9/+17
|\ \ \ | |/ / |/| / | |/ | | Conflicts: src/com/android/browser/BrowserSettings.java
| * Fix #1722851. Move the Browser's default home page to the resource so that ↵Grace Kloba2009-05-262-4/+17
| | | | | | | | we can localize it easily.
* | Merge change 2255Android (Google) Code Review2009-05-261-11/+12
|\ \ | | | | | | | | | | | | * changes: Fix an issue where bookmarking https: sites doesn't work.
| * | Fix an issue where bookmarking https: sites doesn't work.Leon Scroggins2009-05-211-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | Fix for issue 1863535. We were storing https:// sites in the database without https:, so it was stored as a non secure site. Then going back to that bookmark does not work. Now, use the truncated url to compare, but store the original url (with https at the beginning)
* | | Do not display unvisited sites in the history.Leon Scroggins2009-05-211-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for issue 1831854: An unvisited, bookmarked site shows up in the history under "1 month ago". This is because although the site will be in the database with a visited date of 0, it has some visits, so that it will raise its priority in other lists. Now, ignore any sites with a visited date of 0 (or less) in the history page. Make the HistoryAdapter's member variables private, and make the where clause final. modified: src/com/android/browser/BrowserHistoryPage.java modified: src/com/android/browser/BrowserHistoryPage.java
* | | Remove an unnecessary field.Leon Scroggins2009-05-211-2/+0
| | | | | | | | | | | | | | | This string was used for logging error messages, but it is not used.
* | | [findbugs] Add the static keyword to unchanging integers.Leon Scroggins2009-05-211-3/+3
|/ / | | | | | | | | mUrlIndex, mTitleIndex, and mBookmarkIndex are member variables which are the same for all MyAdapters, so change them to static.
* | Merge change 1898Android (Google) Code Review2009-05-211-6/+7
|\ \ | | | | | | | | | | | | * changes: Fix issues found by FindBugs.
generated by cgit v1.1 at 2025-01-26 22:05:34 +0000