summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 6ac51e2b: am 867c0465: am 430057da: Fixes for changing the search engine.Leon Scroggins III2010-09-155-16/+38
|\ | | | | | | | | | | | | Merge commit '6ac51e2b2defbc33834ec92d8a3e7c904f20811e' * commit '6ac51e2b2defbc33834ec92d8a3e7c904f20811e': Fixes for changing the search engine.
| * am 867c0465: am 430057da: Fixes for changing the search engine.Leon Scroggins III2010-09-145-16/+38
| |\ | | | | | | | | | | | | | | | | | | Merge commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c' into gingerbread-plus-aosp * commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c': Fixes for changing the search engine.
| | * am 430057da: Fixes for changing the search engine.Leon Scroggins III2010-09-145-16/+38
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '430057dad085f3c3dbc386f127b1f5a10a9851da' into gingerbread * commit '430057dad085f3c3dbc386f127b1f5a10a9851da': Fixes for changing the search engine.
| | | * Fixes for changing the search engine.Leon Scroggins III2010-09-145-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a default value for the Select search engine preference. Move the Select search engine preference into advanced settings. When opening the SearchDialog with a SearchEngine other than Google, add a flag to hide the voice search icon. Depends on a change to frameworks/base. Change-Id: I6da2e582789253b3c5ffac9fe1ad3732f99f28ea
* | | | am 7f737ca1: (-s ours) resolve merge of 8bf09b62 to gingerbread-plus-aospJean-Baptiste Queru2010-09-150-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '7f737ca14895f4263c4ff4390a0e7ad0149a7a62' * commit '7f737ca14895f4263c4ff4390a0e7ad0149a7a62': Add user-selected search providers to browser
| * | | resolve merge of 8bf09b62 to gingerbread-plus-aospJean-Baptiste Queru2010-09-1448-94/+2889
| |\ \ \ | | |/ / | | | | | | | | Change-Id: If94475b19837abf8f1ee427cf6f6da929cdcf105
| | * | am d2670653: Add user-selected search providers to browserBjorn Bringert2010-09-1348-88/+2889
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb' into gingerbread * commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb': Add user-selected search providers to browser
| | | * Add user-selected search providers to browserBjorn Bringert2010-09-1348-88/+2889
| | | | | | | | | | | | | | | | | | | | | | | | The lists of search providers are taken from Chrome. Change-Id: I7af6dc1258950d1fc5cf86013f8be9f3c5db0f1a
* | | | Add user-selected search providers to browserBjorn Bringert2010-09-1549-89/+2890
| | | | | | | | | | | | | | | | | | | | | | | | The lists of search providers are taken from Chrome. Change-Id: I320f43f06d3a79a3b7a065c73859853dedf0a6b5
* | | | Merge "Import revised translations."Eric Fischer2010-09-1321-575/+284
|\ \ \ \
| * | | | Import revised translations.Eric Fischer2010-09-1021-575/+284
| | | | | | | | | | | | | | | | | | | | Change-Id: Iede24c9716d55aedb927ef78feae47e8b0fa46a9
* | | | | UI theme workMichael Kolb2010-09-1018-63/+151
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed styles for action bar changed URLInput layout suppress selection acion mode for url input Change-Id: Ia5dbab792057b7d172e797c01f07f06ca190c88b
* | | | Updated for framework changes in ActionBar style attributesAdam Powell2010-09-092-2/+2
| | | | | | | | | | | | | | | | Change-Id: I6bb73ccf5e2523615833ec458173626f362f25dd
* | | | checkpoint for moving UI to Holo styleMichael Kolb2010-09-0871-259/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mostly final assets dialogs are not styled correctly Change-Id: Ib98312ca9465ded3efc2743f9828fe9a815814cc
* | | | Quiet some logs in private browsing mode.Jeff Hamilton2010-09-082-35/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, always direct load URLs in the WebView when in private browsing mode so external apps can't intercept the URLs you visit and they aren't logged by the ActivityManager. Change-Id: I727a94220d35c242fa0a0cd7f52d483c1a935cd0
* | | | If the title is empty, do not attempt to save a bookmark.Leon Scroggins III2010-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 2952641 Change-Id: I9efa2536478ceedaaeaac992bd70efa2e538f615
* | | | Merge "fixed multiple tabs selected bug, open new tab to home page ↵Michael Kolb2010-09-082-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | http://b/issue?id=2975213"
| * | | | fixed multiple tabs selected bug, open new tab to home pageMichael Kolb2010-09-072-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/issue?id=2975213 Change-Id: I21c37cb54ab309568386e0bc5f83a30bb16779b8
* | | | | fix edit bookmark bugMichael Kolb2010-09-071-12/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | http://b/issue?id=2950270 Change-Id: I8ff44737c33b03c895cf158b8bcfd5c237c6b111
* | | | Merge "disable zoom buttons"Michael Kolb2010-09-072-0/+14
|\ \ \ \
| * | | | disable zoom buttonsMichael Kolb2010-09-032-0/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I6b99b74bb1930c6a66903bd4894f51f3aaf33e89
* | | | | Merge "Don't show deleted bookmarks in the default page view."Jeff Hamilton2010-09-071-1/+1
|\ \ \ \ \
| * | | | | Don't show deleted bookmarks in the default page view.Jeff Hamilton2010-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9cae028d7ccb491dc1e1d323e9abb0aef442455
* | | | | | am e5c06198: (-s ours) am 23cbeb79: DO NOT MERGE remove save/restore picture ↵Cary Clark2010-09-070-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | from browser app Merge commit 'e5c06198330df7c57cc4e04db068629765ecb32c' * commit 'e5c06198330df7c57cc4e04db068629765ecb32c': DO NOT MERGE
| * | | | am 23cbeb79: DO NOT MERGE remove save/restore picture from browser appCary Clark2010-09-073-26/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '23cbeb795fe865a5c64f275bf51217fb55363cc0' into gingerbread-plus-aosp * commit '23cbeb795fe865a5c64f275bf51217fb55363cc0': DO NOT MERGE
| | * | | DO NOT MERGECary Clark2010-09-073-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove save/restore picture from browser app These pictures may be arbitrarily large, and with the newer caching mechanism, are rarely used. Also, remove any old pictures when the Browser starts. Change-Id: I0277a08735dc40e0495bf78c68fee5d95b913e27 http://b/2650945
* | | | | Fix JNI Bindings Browser Test.Ben Murdoch2010-09-061-1/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JNI bindings test was broken after BrowserFrame.documentAsText started to take a parameter to determine if it should capture the main or child frames. Update the call here to pass the correct parameter. Change-Id: I5142214164db371d9106d799bfa4e5bd7293dad3
* | | | Merge "Make the bookmark thumbnails larger."Jeff Hamilton2010-09-035-51/+26
|\ \ \ \
| * | | | Make the bookmark thumbnails larger.Jeff Hamilton2010-09-025-51/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I33e72e55e0cad9c73b3c50cb30277ed22eb511cb
* | | | | Merge "Add char limit for localization."Shimeng (Simon) Wang2010-09-021-1/+2
|\ \ \ \ \
| * | | | | Add char limit for localization.Shimeng (Simon) Wang2010-09-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue: 2912382 Change-Id: I39fe19f22fa998953458c62f1d5aa9eecfb84dca
* | | | | | Adds creation and modification timestamps to the bookmarks content provider. ↵Cyrus Master2010-09-021-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See change I44fec169. Change-Id: I8542547d09b8202c8f60a44945369933c79292eb
* | | | | | resolved conflicts for merge of c8687ffc to masterBrad Fitzpatrick2010-09-023-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | Change-Id: I38f42b9671a56e85f2aa8a8e325120d6f6a59427
| * | | | am 1a6e0e8c: Use new apply() instead of commit().Brad Fitzpatrick2010-09-024-5/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '1a6e0e8cdd0898bd63f9f27df1b86cbe6722f3bb' into gingerbread-plus-aosp * commit '1a6e0e8cdd0898bd63f9f27df1b86cbe6722f3bb': Use new apply() instead of commit().
| | * | | Use new apply() instead of commit().Brad Fitzpatrick2010-09-014-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply() starts an async disk write and doesn't have a return value but is otherwise identical in observable effects. Change-Id: Id1199cd43d62882cfe7343d46e283b32404dea5d
* | | | | Merge "Change searches to do an upsert on insert()."Jeff Hamilton2010-09-021-13/+28
|\ \ \ \ \
| * | | | | Change searches to do an upsert on insert().Jeff Hamilton2010-09-021-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1d2f3ec678b37620f0907981c3d39cee634d9d7
* | | | | | Fix for saving a WebArchive when the external storage isn't mounted.Elliott Slaughter2010-09-011-10/+19
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I572da2013b5ba988c899ba2f64453dfc908b4fec
* | | | | Browser incognito mode session expiration.Elliott Slaughter2010-09-013-8/+61
| | | | | | | | | | | | | | | | | | | | Change-Id: I3736ce91bd5ecbcead7a80228680c9fcbf7c374b
* | | | | Cleanup temporary incognito mode files after last tab closes.Elliott Slaughter2010-09-012-0/+17
| |_|/ / |/| | | | | | | | | | | Change-Id: Ia685fb162d7449d2cd850e87607eff39cc8893a5
* | | | Move Find on page and Select into the framework.Leon Scroggins2010-09-0117-507/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2938052 Depends on a change to frameworks/base Change-Id: I28db6d06fa248913091455e82853ef151a0561b0
* | | | Merge "Add comments for translations."Patrick Scott2010-08-311-0/+1
|\ \ \ \
| * | | | Add comments for translations.Sang-il, Lee2010-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I57a2c6b39a25d236c83b2b538b5ac174fe2b2d40
* | | | | Merge "Import revised translations"Eric Fischer2010-08-3021-180/+144
|\ \ \ \ \
| * | | | | Import revised translationsEric Fischer2010-08-3021-180/+144
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf4d3c32fe136a36e6bcc076c34898f2ae89cddd
* | | | | | am 97c74768: am cba8d0ef: Merge "Difficult to bookmark History items on ↵Jean-Baptiste Queru2010-08-301-4/+2
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | ldpi-screens" Merge commit '97c7476875bcd8dd72ff448754acf44eee5bc64a' * commit '97c7476875bcd8dd72ff448754acf44eee5bc64a': Difficult to bookmark History items on ldpi-screens
| * | | | am cba8d0ef: Merge "Difficult to bookmark History items on ldpi-screens"Jean-Baptiste Queru2010-08-301-4/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cba8d0efd388146f6814c83a363f4facdec5be2f' into gingerbread-plus-aosp * commit 'cba8d0efd388146f6814c83a363f4facdec5be2f': Difficult to bookmark History items on ldpi-screens
| | * \ \ \ Merge "Difficult to bookmark History items on ldpi-screens"Jean-Baptiste Queru2010-08-301-4/+2
| | |\ \ \ \
| | | * | | | Difficult to bookmark History items on ldpi-screensMattias Falk2010-08-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a History item as a bookmark by touching the star is difficult since the touch area of the star is of the size of the star. The problem is more apparent on ldpi-screens since the star is small and it's hard to hit with a finger. The browser loads the url of the History item if the star is missed. Enlarging the touch area of the star to cover the whole right part of the History item solves the problem. The user doesn't has to hit the star only the right part of the History item. Change-Id: I87b8fc555896cf88eac805c96bf31981c2aacbf5
* | | | | | | When checking for possible RLZ insertion, only check http Uri's.Bill Napier2010-08-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 2952725 Change-Id: I0b8808b8b9c53d46ef40c75dd134c8e0bc5ef28a