summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translationsEric Fischer2010-08-3021-180/+144
| | | | Change-Id: Iaf4d3c32fe136a36e6bcc076c34898f2ae89cddd
* When checking for possible RLZ insertion, only check http Uri's.Bill Napier2010-08-301-1/+3
| | | | | BUG: 2952725 Change-Id: I0b8808b8b9c53d46ef40c75dd134c8e0bc5ef28a
* Fix browser crash.Patrick Scott2010-08-301-4/+0
| | | | | | | I'm looking at you, Derek... Bug: 2947089 Change-Id: I7a51c7007f46b9e0a2ec1d8ca6d66b879c565aca
* am 2621da48: (-s ours) am 11979e05: DO NOT MERGE remove the pretend cab from ↵Cary Clark2010-08-270-0/+0
|\ | | | | | | | | | | | | | | | | the browser Merge commit '2621da4894d3c73fc966323927a02496e7aad416' * commit '2621da4894d3c73fc966323927a02496e7aad416': DO NOT MERGE remove the pretend cab from the browser
| * am 11979e05: DO NOT MERGE remove the pretend cab from the browserCary Clark2010-08-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit '11979e058c4ea28dd77a5e598071277a8a824475' into gingerbread-plus-aosp * commit '11979e058c4ea28dd77a5e598071277a8a824475': DO NOT MERGE remove the pretend cab from the browser
| | * DO NOT MERGE remove the pretend cab from the browserCary Clark2010-08-261-1/+1
| | | | | | | | | | | | | | | Change-Id: Iab781c8e5a640d897e172a7b1ca50a1d8d81cd88 http://b/2626451
* | | Update to follow clipboard API.Dianne Hackborn2010-08-261-2/+2
| | | | | | | | | | | | Change-Id: I181802a10e921e058d6416a6ab8aa8009dcbbf63
* | | am 399c6b8e: am 552751ea: Avoid crash in browser in systems with no search ↵Mattias Falk2010-08-261-1/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | provider Merge commit '399c6b8ec5b4fda71bbf67edd7e9dcb7fb5b8f00' * commit '399c6b8ec5b4fda71bbf67edd7e9dcb7fb5b8f00': Avoid crash in browser in systems with no search provider
| * | am 552751ea: Avoid crash in browser in systems with no search providerMattias Falk2010-08-261-1/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '552751ea92828f8b78b71533dbba70aa7c316d9d' into gingerbread-plus-aosp * commit '552751ea92828f8b78b71533dbba70aa7c316d9d': Avoid crash in browser in systems with no search provider
| | * | Avoid crash in browser in systems with no search providerMattias Falk2010-08-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there's no activity registered for the intent (action) ACTION_WEB_SEARCH the browser will crash if a search query is entered in the browser. The crash is avoided by catching the ActivityNotFoundException. Change-Id: I021d3210654bb3aa08ccdd15abea86ef415282b1
* | | | Merge "fixed new tab flow bug: http://b/issue?id=2911248 a new tab with ↵Michael Kolb2010-08-252-9/+14
|\ \ \ \ | | | | | | | | | | | | | | | the home page is created before the combo page is shown"
| * | | | fixed new tab flowMichael Kolb2010-08-252-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: http://b/issue?id=2911248 a new tab with the home page is created before the combo page is shown Change-Id: I6bf71810a719125cc426480e33fe70aad73729b7
* | | | | fixed adding bookmark shortcut from home screenMichael Kolb2010-08-255-16/+96
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | bug: http://b/issue?id=2948937 added shortcut activity to host bookmarks page fragment Change-Id: I39db8985b3c07fae6ca800cc57da3747040cb814
* | | | fixed Combo page for phone screenMichael Kolb2010-08-252-6/+8
| | | | | | | | | | | | | | | | Change-Id: I43261d95d896db0bc07ff7db02466050d7c6a242
* | | | am d90e9e00: (-s ours) am 2c326e62: DO NOT MERGE Refactor find and select ↵Cary Clark2010-08-240-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialogs Merge commit 'd90e9e004c74bd049339a3961b109d2055be1cb3' * commit 'd90e9e004c74bd049339a3961b109d2055be1cb3': DO NOT MERGE Refactor find and select dialogs
| * | | am 2c326e62: DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-2015-115/+473
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '2c326e62316884a20822035c5470168d0e3b89ff' into gingerbread-plus-aosp * commit '2c326e62316884a20822035c5470168d0e3b89ff': DO NOT MERGE Refactor find and select dialogs
| | * | DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-2015-115/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry picked from master, https://android-git.corp.google.com/g/#change,53491 ) (This is a work in progress -- assets in particular are not final) Use common code when showing the select and find dialogs. Both now use similarly constructed contextual action bars and share resources where possible. Both share a common base class so supporting code can communicate with either. Companion changes in frameworks/base and external/webkit Change-Id: I476fc72b3386348bc25bcf0a3d30482dea543efe http://b/262451
* | | | Move APK monitoring into WebView.Derek Sollenberger2010-08-241-110/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL removes the logic for monitoring apk's from the Browser and a companion CL adds the logic into the WebView. This allows applications other than the browser to use special features offered by YouTube and plugins. Change-Id: Ifc0cce3a8c23515d79ae4c09527aebdd773f3ef3 http://b/28364603
* | | | Merge "fixed bookmarks widget bug http://b/issue?id=2942821 added check ↵Michael Kolb2010-08-231-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | for null intent when service is started"
| * | | | fixed bookmarks widget bugMichael Kolb2010-08-231-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/issue?id=2942821 added check for null intent when service is started Change-Id: I29906c0cedfa5e37c7cb0ec5a6df6c1f7ce957b6
* | | | | Merge "Properly update the local version when updating bookmarks."Jeff Hamilton2010-08-231-20/+21
|\ \ \ \ \
| * | | | | Properly update the local version when updating bookmarks.Jeff Hamilton2010-08-201-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22c1ba9eed960ba773ecb949edc0b4b2b54fa287
* | | | | | Fix Browser incognito history for intents initiated in the same tab.Elliott Slaughter2010-08-231-7/+11
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: Ic3e8168ded978226eeace1fb86960082e8b9ebfd
* | | | | UI work on CombinedBookmarksHistoryMichael Kolb2010-08-215-11/+71
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Adjust the CombinedBookmarksHistory activity to leave TabBar and UrlBar visible Enable clicks on the top bars to propagate back to the BrowserActivity Change-Id: Ie6aed7dc0777d31dafc7c31807adf17a60f57767
* | | | Merge "Add INSERT_AFTER to the projection map."Jeff Hamilton2010-08-191-0/+1
|\ \ \ \
| * | | | Add INSERT_AFTER to the projection map.Jeff Hamilton2010-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2934767 Change-Id: Ib019936895c128dc9cdb706c1f93fd6d9eb98f0d
* | | | | Add RLZ support to Browser.Jeff Davidson2010-08-194-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RLZ assigns non-unique, non-personally identifiable tracking labels to client products; these labels sometimes appear in Google search queries. See http://code.google.com/p/rlz for more info. Bug: 2927060 Change-Id: I992cd2859d590616df57293adb7ac22038088d49
* | | | | Merge "Import Romansh translations."Eric Fischer2010-08-191-0/+463
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Import Romansh translations.Eric Fischer2010-08-181-0/+463
| | | | | | | | | | | | | | | | | | | | Change-Id: I91d6f4c98bc509e4986b54bfe18f0024aa35c10d
* | | | | incognito mode added for large screensMichael Kolb2010-08-186-0/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I8a3b479acc50c7e658e5d24e83ccf9256f4bf592
* | | | | Merge "Fix Browser crash on search in new Browser session."Elliott Slaughter2010-08-181-1/+1
|\ \ \ \ \
| * | | | | Fix Browser crash on search in new Browser session.Elliott Slaughter2010-08-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I7e96b062223c8ed2a15610dd52fa3b65656710d6
* | | | | Merge "initial checkin of stacked thumbnail bookmarks widget bug #2930549 ↵Michael Kolb2010-08-186-0/+393
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | uses a StackView to let the user flip through the browser bookmark thumbnails"
| * | | | initial checkin of stacked thumbnail bookmarks widgetMichael Kolb2010-08-186-0/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug #2930549 uses a StackView to let the user flip through the browser bookmark thumbnails Change-Id: I3665e98e5fd4c14ede8f28380ec6c85e7cc032f2
* | | | | Switch the bookmarks and history over to fragments.Jeff Hamilton2010-08-188-262/+260
|/ / / / | | | | | | | | | | | | Change-Id: If4edc97d1115bfd261136d5b8cfc82afa21f8ced
* | | | am f3c6c24d: am 179b9a1f: improvement test app\'s handling of irregular ↵Guang Zhu2010-08-181-5/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | status file Merge commit 'f3c6c24d6ba7dd448c67fc064a7becc029c5981f' * commit 'f3c6c24d6ba7dd448c67fc064a7becc029c5981f': improvement test app's handling of irregular status file
| * | | am 179b9a1f: improvement test app\'s handling of irregular status fileGuang Zhu2010-08-181-5/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '179b9a1fe98d371dc2064322ec227ba13065f921' into gingerbread-plus-aosp * commit '179b9a1fe98d371dc2064322ec227ba13065f921': improvement test app's handling of irregular status file
| | * | improvement test app's handling of irregular status fileGuang Zhu2010-08-171-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | if it reads an empty line, or have reached end of file, it will default to the start from beginning scenario. Change-Id: Ife2e49bf8adf70d6caba7a1d65094401990325a2
* | | | Switch the history management over to the new provider.Jeff Hamilton2010-08-1810-262/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix up a bunch of bugs causing things like thumbnails to not be stored properly. Change-Id: I5758ee108734d9b50e741822dcbe86b7cc834e8e
* | | | Use ActionMode for Find-on-page and Copy.Leon Scroggins III2010-08-1813-639/+451
| | | | | | | | | | | | | | | | | | | | Bug: 2641352 Change-Id: Ib5c0dd5997457a8d7b9a5c3e5a3727acc6a2f367
* | | | Add "EUC-KR" to default encoding listsSang-il, Lee2010-08-181-0/+2
| | | | | | | | | | | | | | | | Change-Id: If813a295e101086d04ec080c78ba3959ae6a2f4e
* | | | Import revised translations.Eric Fischer2010-08-1720-0/+40
| | | | | | | | | | | | | | | | Change-Id: I810c08b6bfdce4887f9c0c064981242c0722ceb2
* | | | Store the server unique values for the default folders.Jeff Hamilton2010-08-171-10/+26
| | | | | | | | | | | | | | | | Change-Id: I62173b733bb189b3d7af6aa64f986c7a98249ccf
* | | | Update to the new contract class location.Jeff Hamilton2010-08-176-380/+9
| | | | | | | | | | | | | | | | Change-Id: I3ebf5a9dbac4b3b6ecbc0468242dedf909c23882
* | | | First revision of the new browser provider.Jeff Hamilton2010-08-1617-1115/+1891
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | switched to using action bar for large screenMichael Kolb2010-08-1312-109/+166
| | | | | | | | | | | | | | | | Change-Id: I33b6bcd78d4983e0ce1b503d3756687588dd8ed0
* | | | Fix a threading bug in BrowserProvider and clean up query() a bit.Jeff Hamilton2010-08-111-64/+65
| | | | | | | | | | | | | | | | Change-Id: Ie8eb9c66716c7cc8d6c3f092c5cfa4b8f9420eff
* | | | Merge "New tab flow through Bookmarks/History screen"Michael Kolb2010-08-104-14/+33
|\ \ \ \
| * | | | New tab flow through Bookmarks/History screenMichael Kolb2010-08-094-14/+33
| | | | | | | | | | | | | | | | | | | | Change-Id: I0f21279fea33582229f16f37bf813ad1fca15fc2
* | | | | Import revised translations.Eric Fischer2010-08-1020-7/+47
| | | | | | | | | | | | | | | | | | | | Change-Id: I60ccff27416394dc3f06c32a58004af5a2abf55c