summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserProvider.java
Commit message (Collapse)AuthorAgeFilesLines
* Transfer data from BP1 to BP2John Reck2011-05-181-1148/+0
| | | | | | Also move BP1 to provider package Change-Id: I082df8f675d32e2b9072914eab4ee1d50543e169
* Browser settings refactorJohn Reck2011-04-261-1/+0
| | | | Change-Id: I6fc1b21f7ea692fbe37a17bf900e9b7408a9c077
* Adding search_client_id which includes the "ms-" or "tablet-" client-id ↵Reena Lee2011-03-041-6/+18
| | | | | | | | | | prefix, set in GooglePartnerSetup. Retaining client-id (which does not include the client-id prefix) for legacy purposes, if Browser is used with an older version of GooglePartnerSetup. Bug #3483276 Change-Id: Ice4788ef78f4b58c5d981b50d5248aa51a53733d
* am 6c767e7d: am 6d25c81e: Merge "Protection against bookmarks with url=null ↵Jean-Baptiste Queru2010-10-121-2/+24
|\ | | | | | | | | | | | | | | | | in the database" Merge commit '6c767e7dc1a6fd9adc5ea8930ad1432a48b74b95' * commit '6c767e7dc1a6fd9adc5ea8930ad1432a48b74b95': Protection against bookmarks with url=null in the database
| * am 6d25c81e: Merge "Protection against bookmarks with url=null in the database"Jean-Baptiste Queru2010-10-111-2/+24
| |\ | | | | | | | | | | | | | | | | | | Merge commit '6d25c81ef7ddfc6cbc36094388b2de987dd77dae' into gingerbread-plus-aosp * commit '6d25c81ef7ddfc6cbc36094388b2de987dd77dae': Protection against bookmarks with url=null in the database
| | * Protection against bookmarks with url=null in the databaseMagnus Lindhult2010-09-301-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | Modified the database to only accept bookmarks with a url != null, as a bookmark without url has no meaning and also makes the Browser crash in a number of places. Change-Id: I0a90c32a5c8846b96a231fb95b203aef4761f52d
* | | Fix build break from conflict merge.Leon Scroggins III2010-09-171-1/+1
| | | | | | | | | | | | Change-Id: If31ecc6175f152870572763361f25f5766bbb188
* | | resolved conflicts for merge of fc2c6f1d to masterLeon Scroggins III2010-09-171-2/+1
|\ \ \ | |/ / | | | | | | Change-Id: I708443617cf602a957a90a5770deab77c47c776f
| * | am 8774c667: Remove "Show web suggestions" from browser settingsLeon Scroggins III2010-09-171-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8774c667dd446346dca5f5d3c89092fbc86448d0' into gingerbread * commit '8774c667dd446346dca5f5d3c89092fbc86448d0': Remove "Show web suggestions" from browser settings
| | * | Remove "Show web suggestions" from browser settingsLeon Scroggins III2010-09-171-1/+0
| | | | | | | | | | | | | | | | | | | | Bug:3011374 Change-Id: I44d57431d127e48d25a957915a2fb93dc96b1053
| * | | am d2670653: Add user-selected search providers to browserBjorn Bringert2010-09-131-65/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb' into gingerbread * commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb': Add user-selected search providers to browser
| | * | Add user-selected search providers to browserBjorn Bringert2010-09-131-65/+12
| | |/ | | | | | | | | | | | | | | | The lists of search providers are taken from Chrome. Change-Id: I7af6dc1258950d1fc5cf86013f8be9f3c5db0f1a
* | | Add user-selected search providers to browserBjorn Bringert2010-09-151-60/+13
| | | | | | | | | | | | | | | | | | The lists of search providers are taken from Chrome. Change-Id: I320f43f06d3a79a3b7a065c73859853dedf0a6b5
* | | resolved conflicts for merge of c8687ffc to masterBrad Fitzpatrick2010-09-021-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I38f42b9671a56e85f2aa8a8e325120d6f6a59427
| * | Use new apply() instead of commit().Brad Fitzpatrick2010-09-011-1/+1
| |/ | | | | | | | | | | | | apply() starts an async disk write and doesn't have a return value but is otherwise identical in observable effects. Change-Id: Id1199cd43d62882cfe7343d46e283b32404dea5d
* | First revision of the new browser provider.Jeff Hamilton2010-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This one has support for bookmarks sync, has the bookmarks and history in separate tables, and supports hierarchical bookmarks. Compatibility with the old APIs is not yet complete. The Bookmarks UI has been switched over to the new provider. Creating bookmarks puts them in the UIs root folder. Change-Id: Ib21713ddd19f43d178d49dbac977f749e7103368
* | Fix a threading bug in BrowserProvider and clean up query() a bit.Jeff Hamilton2010-08-111-64/+65
| | | | | | | | Change-Id: Ie8eb9c66716c7cc8d6c3f092c5cfa4b8f9420eff
* | tabbed title bar workMichael Kolb2010-07-271-12/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | bug # http://b/issue?id=2712871 added tab bar added tab status callbacks to Tab and TabControl added compact progress/stop/refresh button added UrlInputView for auto-complete suggestions modified BrowserProvider for url input suggestions modified BrowserActivity to use TitleBarXLarge Change-Id: I62db2be5b89f4c4f27c09dbc6fee7b3b0d5e91b5
* | When the string is empty, just return an empty list.Grace Kloba2010-06-151-3/+2
|/ | | Fix http://b/issue?id=2771338
* Use system setting for default geolocation permissionsBjorn Bringert2010-03-251-38/+1
| | | | | | | | | | This reverts change I0be5dbf4d99d07ca13b07fb299155c5aa17a51bd and adds an observer on the new default geolocation permission secure setting. Bug http://b/issue?id=2535598 Change-Id: I4edcbd3080b7d3af5dc6d74f26779b6d92248010
* Use a Thread instead of an AsyncTask for removing Gears. This is becauseAndrei Popescu2010-03-231-9/+8
| | | | | | | the database upgrade method can be invoked on any thread (e.g. a Binder thread, when QSB makes an IPC call to the Browser content provider). Fix b: 2529299
* Refactor android.backup -> android.app.backupChristopher Tate2010-03-051-1/+1
| | | | Change-Id: Ifc005e14e8b7ac921ffa1a56a46c5c4083b4ea2d
* Use SUGGEST_COLUMN_TEXT_2_URL in browser suggestionsBjorn Bringert2010-03-031-32/+23
| | | | | | | | | | | | | | | Before, the Browser used an HTML <font> tag to style URLs in history / bookmark suggestions. The color used was a hidden framework resource, it assumed that the caller knew to interpret HTML mark-up, and it only worked on a light colored background. Now a separate column is used for displayed URLs, letting the caller decide how to style URLs. Part of the fix for http://b/issue?id=2380681 Change-Id: I1c3981de22bccf9cba2f2b903225ef1b50226758
* Change where "Search for web"'s position.Grace Kloba2010-03-011-19/+41
| | | | | | | If there is a matching history/bookmark, it will be in the second place. Otherwise it will be in the first place. Fix http://b/issue?id=2314166
* Update to reflect android-common no longer in framework.Dianne Hackborn2010-02-241-1/+1
|
* Remove our dependency on gsf.Patrick Scott2010-02-241-4/+21
| | | | | | | | Hardcode the account values when looking up the hosted domain. We also hardcode the settings uri for looking up the client id. This is the better solution for now because the client id is written only once. If the partner setup were to write the value to the BrowserProvider, it would get erased if the user decided to reset the Browser.
* Backup bookmarks when a new bookmark is added.Leon Scroggins2010-02-231-16/+12
| | | | Fix for http://b/issue?id=2332942
* Use SearchManager.getWebSearchActivity() for web suggestionsBjorn Bringert2010-02-181-10/+3
| | | | | | | | This makes sure that the web suggestions come from the global search package. With the old code, web suggestions could break if some random app had a default intent filter for ACTION_WEB_SEARCH. Change-Id: I67ecbe90433c01dc7a51921573c584d888a819d6
* Add geolocation permissions to BrowserProviderBjorn Bringert2010-02-111-1/+38
| | | | | | | | | | | | | | | | | | | | The old hidden Google-specific framework setting Settings.Secure.USE_LOCATION_FOR_SERVICES has been removed and replaced by a setting in GoogleSettingsProvider. Since Browser can't read from GoogleSettingsProvider, I've instead changed SetupWizard and the Google search settings (in GoogleQuickSearchBox) to write to this new geolocation content provider in the Browser. The geolocation permission content provider is write-only, and requires a signatureOrSystem permission to write to. So only system apps can add geolocation permissions, and the only system apps that do so are SetupWizard and GoogleQuickSearchBox. Bug: http://b/issue?id=2428694 Change-Id: I0be5dbf4d99d07ca13b07fb299155c5aa17a51bd
* This should fix the build.Jeff Hamilton2010-02-031-1/+1
| | | | Change-Id: Ib03e2d8500a53b5f8742b19415a421a602947ec3
* Use the constants defined in RecognizerResultsIntent for voice search.Leon Scroggins2010-02-011-1/+2
|
* Handle the voice search intent.Leon Scroggins2010-01-291-2/+92
| | | | | | | | Once the voice search intent has been handled, the title bar background changes to green, and touching it displays other voice search possibilities. Fixes http://b/issue?id=2390686
* Move the "Search web ..." to the first in theGrace Kloba2010-01-281-27/+31
| | | | | suggestion list. http://b/issue?id=2314166
* Change SearchableInfo importBjorn Bringert2009-12-041-1/+1
| | | | | | | | | SearchableInfo has moved from android.server.search to android.app. This is part of http://b/issue?id=2270838 Change-Id: Ie2888363484b24b08715e5959a873e5fa59722f9
* Only show manually entered URLs in suggestions.Leon Scroggins2009-11-251-5/+10
| | | | | | | | | | | | In the bookmarks database, add a column to keep track of whether the url was entered by the user. When providing a Cursor for suggestions, do not show visited websites that were not entered by the user. In BrowserActivity, add manually entered urls to the database, so that they can be seen in the suggestons. Requires a change to frameworks/base. Fixes http://b/issue?id=2281371
* Change android.text.util.Regex to com.android.common.PatternsDan Egnor2009-11-181-4/+5
|
* Pass search intent extra data through the browserBjorn Bringert2009-09-221-1/+17
| | | | | | This is needed by some web search providers for logging. Change-Id: I7a6dba26d79ee97e4a4628269b212e80151ad9ee
* Remove Gears filesAndrei Popescu2009-09-211-0/+53
|
* Remove clientid from the url before it is added to the database. So that weGrace Kloba2009-09-091-1/+5
| | | | | | | won't show them in the auto-complete list. Update the browser.db and remove history only entries who has clientid. Fix http://b/issue?id=2099727
* Implement onReceivedTouchIconUrl.Patrick Scott2009-08-051-2/+7
| | | | | | | | | | | Add DownloadTouchIcon, an AsyncTask that downloads the apple-touch-icon for urls that are marked as bookmarks. The touch icon is stored in the bookmark database similar to favicons and thumbnails. If a shortcut is created for a bookmark containing a touch icon, the touch icon is used (with rounded corners). Refactor the bookmarks query to be a static function. The function uses the original url and new url to look for matching bookmarks. This takes care of redirects as well as bookmarks containing queries.
* More precise determination of when to back up the bookmarksChristopher Tate2009-07-291-13/+64
| | | | | | | | | | | | | | | | | Instead of blindly assuming that any change to the bookmark table requires a backup pass, we now attempt to discern whether the change is a user-visible alteration of the bookmark set. We do this in the provider's hooks for insert/delete/update operations. Insert is easy; we simply check for bookmarks=1 in the field values of the row being added, and request backup if it's there. Delete and update operations are more problematic; we need to check whether the record being acted on is part of the bookmark set. To do this unambiguously requires querying the record's bookmark field, so we do that if it looks like the operation might be one relevant to the bookmark backup [either deleting a bookmark row, or changing the title/url of an existing bookmark, or changing whether a given row represents a bookmark].
* First real cut of bookmarks backup agentChristopher Tate2009-07-271-2/+27
| | | | | | | | | | | | | | | | | | | The agent now does backup/restore of the bookmarks table. Whether to back up is determined by flattening the bookmark table, CRCing the flattened representation, and comparing the CRC with the previous backup pass's version. If they differ (or if the file size differs), the table is deemed to have changed and we send the flattened file off to the server as a single key. On restore, the bookmark records are read individually from the flattened representation, the existing bookmarks table is queried for a matching URL, and if none exists the bookmark is inserted into the table. Bookmarks.addBookmark() now takes a boolean argument "retainIcon." When false, the implementation will not call into the web icon database. This is necessary during restore because the web icon database is only available from the Browser app's main thread, but restore happens without the app proper being involved. The other call points for addBookmark() have been updated to pass 'true,' i.e. preserving the current behavior.
* am 60d24e21: Make suggestion text color change based on the item stateSatish Sampath2009-07-101-9/+5
|\ | | | | | | | | | | | | Merge commit '60d24e219b1763bc294974e042c67a1a6cadd8d5' * commit '60d24e219b1763bc294974e042c67a1a6cadd8d5': Make suggestion text color change based on the item state
| * Make suggestion text color change based on the item stateSatish Sampath2009-07-101-9/+5
| | | | | | | | | | This is dependant on change https://android-git/g/6623 Bug: http://b/issue?id=1865037
* | am 378e5722: set default client idRamanan Rajeswaran2009-07-021-1/+2
|\ \ | |/ | | | | | | | | | | Merge commit '378e5722d0cad2b082afb42ea64405286de332a5' * commit '378e5722d0cad2b082afb42ea64405286de332a5': set default client id
| * set default client idRamanan Rajeswaran2009-07-011-1/+2
| |
* | am d1c2a433: Merge change 5160 into donutAndroid (Google) Code Review2009-06-231-1/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'd1c2a433c79451aac4340aef8f0d83081977df84' * commit 'd1c2a433c79451aac4340aef8f0d83081977df84': Return the url of a browser history item in the intent query column of the
| * Return the url of a browser history item in the intent query column of theMike LeBeau2009-06-231-1/+5
| | | | | | | | | | | | | | | | | | suggestion. This is so that global search can rewrite a query in the search dialog (i.e., fill in the search box with the url of the suggestion when the user rolls over to select the suggestion). Browser uses android:searchMode="rewriteQueryFromData" to accomplish this but global search does the default thing of using the intent query column, if present, as a rewrite for the current query.
* | am d8b0ad28: Use SearchManager.getSuggestions() non-statically.Bjorn Bringert2009-06-221-3/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'd8b0ad28ce8a3a6b5dfab954e4f7aa7b0af2674f' * commit 'd8b0ad28ce8a3a6b5dfab954e4f7aa7b0af2674f': Use SearchManager.getSuggestions() non-statically.
| * Use SearchManager.getSuggestions() non-statically.Bjorn Bringert2009-06-221-3/+5
| |