summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | fix restore capture bugMichael Kolb2011-08-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5101265 Not totally sure why this happens; we keep the crash happening so but add some error log line which will help us track down the cause of this Change-Id: I409f8bd20b25a8411ab5e2592903efafd96a2432
* | | Merge "Don't pause webview timers as we're rendering a preloaded tab."Mathew Inwood2011-08-021-1/+1
|\ \ \
| * | | Don't pause webview timers as we're rendering a preloaded tab.Mathew Inwood2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 5109383 Change-Id: I5e94180e8f07986712b3f69ea44af56729dd41a2
* | | | Merge "add correct background to tab switcher"Michael Kolb2011-08-026-28/+2
|\ \ \ \ | |/ / / |/| | |
| * | | add correct background to tab switcherMichael Kolb2011-08-016-28/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5075753 Change-Id: I1c03f6c8c43ec78b888b1756d5937858bd612e78
* | | | Factor Activity dependency out of FetchUrlMimeTypeBen Murdoch2011-08-021-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FetchUrlMimeType doesn't need an Activity, an Application Context will do. Bug: 5084293 Change-Id: Ifcd400e0b639e0120f4f89c292acadfe467f92ab
* | | | Merge "Don't cache the ComboViewActivity"Ben Murdoch2011-08-021-8/+6
|\ \ \ \
| * | | | Don't cache the ComboViewActivityBen Murdoch2011-08-011-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not cache a reference to the ComboViewActivity in CombinedBookmarkHistoryView. Bug: 5084293 Change-Id: I7530c5d4b4710598873b12ea6feacf7f49934bef
* | | | | Merge "Cache the application context instead of Activity."Ben Murdoch2011-08-0216-20/+20
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Cache the application context instead of Activity.Ben Murdoch2011-08-0116-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When storing a reference to a Context, ensure that it's the Application context rather than Activity Context. Bug: 5084293 Change-Id: Ib0be5f8ceb91846bb985d0813a8f22cabd44eaf8
* | | | fix action bar and menuMichael Kolb2011-08-019-39/+43
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5077207 Bug: 5097486 cleaned up action bar items dynamically change menu items based on context bookmarks option added to nav bar menu new tab added to navbar menu find/addbookmark only on real pages removed new incognito tab from tab switcher action bar Change-Id: I973f20a13bb7d9900041f717aff012e7a2c735b8
* | | monkey-proofing animationMichael Kolb2011-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Bug: 5103205 added view null check Change-Id: I5388213e05c65c4bb644757cc999bbdf052f3c49
* | | fix last tab close bugMichael Kolb2011-08-013-24/+23
|/ / | | | | | | | | | | | | | | | | | | | | | | Bug: 5098467 The controller did not update the tab list correctly and called activity finish instead. The adapter got updated and showed the last tab still Now the controller removes the last tab before calling finish, so the visible update to the tab list is correct. Change-Id: Idf29dff7d60181c63f6b3ebcbc8a1562f027b2c1
* | Merge "add accessibility descriptions/events"Michael Kolb2011-07-2912-85/+90
|\ \
| * | add accessibility descriptions/eventsMichael Kolb2011-07-2912-85/+90
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4979091 added content descriptions to the image buttons send event for screen transition Change-Id: I403fe8504cace4aa84a5b1c6ca18f6c10fc9be34
* | | Merge "Fix race condition"John Reck2011-07-291-4/+14
|\ \ \
| * | | Fix race conditionJohn Reck2011-07-291-4/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5042778 There was a chance that the widget refresh would happen before the SQL transaction was committed. Meaning the widget would correctly be notified, but it would refresh before the delete actually occured Change-Id: Ie7ae3104077c9ebeba4928d3fe7b6a6793f31ca1
* | | Snapshot UI updateJohn Reck2011-07-293-18/+79
|/ / | | | | | | | | | | | | Bug: 5045575 Bug: 4982126 Change-Id: Idb446ca8ad7a92942be15436eaf2f5fb8875abeb
* | Merge "Get rid of the recovery dialog"John Reck2011-07-292-58/+16
|\ \
| * | Get rid of the recovery dialogJohn Reck2011-07-292-58/+16
| | | | | | | | | | | | | | | | | | Bug: 5081732 Change-Id: I6cbe0bdcd02735a21e785655df84896d8b79e8ce
* | | Merge "Part of fix for bug 4997380: Some error types unknown to SslError"Kristian Monsen2011-07-292-26/+23
|\ \ \
| * | | Part of fix for bug 4997380: Some error types unknown to SslErrorKristian Monsen2011-07-282-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | Added the new error codes to be displayed with error messages. Change-Id: I06b9bd6b2d6ffb95097228a1843dcda77b85a3e7
* | | | Merge "Add a runtime switch between Raster and Ganesh rendering modes."Derek Sollenberger2011-07-294-2/+18
|\ \ \ \
| * | | | Add a runtime switch between Raster and Ganesh rendering modes.Derek Sollenberger2011-07-284-2/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are corresponding changes in: frameworks/base -- change ID: 120662 external/webkit -- change ID: 120660 bug: 5013645 Change-Id: Ic8dfd24786c2ecc14df840204c7a01cb0defa5e3
* | | | Merge "apply() instead of commit() SharedPrefs change in BookmarkWidget"Ben Murdoch2011-07-291-1/+1
|\ \ \ \
| * | | | apply() instead of commit() SharedPrefs change in BookmarkWidgetBen Murdoch2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a strict mode violation. Bug: 5096309 Change-Id: I9993e0b3396a8a8e7fe3c7a26abfffca54267795
* | | | | Merge "Make snapshot go live a popup menu"John Reck2011-07-293-2/+46
|\ \ \ \ \
| * | | | | Make snapshot go live a popup menuJohn Reck2011-07-293-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4982126 Change-Id: Ic4b6b645e8ec29f18e3b9fcdaf5f4a12ce58de4c
* | | | | | Merge "Fix strict mode violation in GoogleAccountLogin"Ben Murdoch2011-07-291-10/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | Fix strict mode violation in GoogleAccountLoginBen Murdoch2011-07-291-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not call WebView methods from a background thread. Bug: 5090601 Change-Id: If72d86c6a68932787b14d7eb11c3a351ac1f8385
* | | | | Merge "Allow suggestions to span 2 lines"John Reck2011-07-292-1/+3
|\ \ \ \ \
| * | | | | Allow suggestions to span 2 linesJohn Reck2011-07-292-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 4603029 Change-Id: If0d914a559d32f33a7b75cd1103a6a972082f396
* | | | | Merge "Fix resetting defaults triggering prelogin"John Reck2011-07-291-1/+6
|\ \ \ \ \
| * | | | | Fix resetting defaults triggering preloginJohn Reck2011-07-291-1/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4163516 Change-Id: I0a64ab19469c25f8c267699fd6bce4fb599f78f9
* | | | | Fix recovery flowJohn Reck2011-07-291-5/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 5096566 Change-Id: Ib7b7e24d5953d02c5e824fc9ef74468fe80480ec
* | | | Merge "Fix BP1to2UpgradeTests"John Reck2011-07-291-3/+3
|\ \ \ \
| * | | | Fix BP1to2UpgradeTestsJohn Reck2011-07-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5092056 Turns out the test was wrong, not the provider. Oops Change-Id: I46439a342c810035c8dba0423c75a5daa882759c
* | | | | Merge "Turbobox!"John Reck2011-07-292-11/+53
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Turbobox!John Reck2011-07-282-11/+53
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5080207 Fix the omnibox's slow performance. It's now pretty snappy if I do say so myself Change-Id: I42d9ed87bcfa1a30f2413e0241afc254ae1e472d
* | | | remove unused referencesMichael Kolb2011-07-282-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | fixing the build Change-Id: I0eb96c00a50918bc2cbf588c6ee2bce8b7082358
* | | | Merge "fix url menu"Michael Kolb2011-07-284-36/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix url menuMichael Kolb2011-07-284-36/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5003525 removed old context menu Change-Id: Iec6298caf799fa783f6147a153544cdac18cc3c3
* | | | Merge "Tests for BP1->BP2 upgrade"John Reck2011-07-283-2/+167
|\ \ \ \ | |/ / / |/| | |
| * | | Tests for BP1->BP2 upgradeJohn Reck2011-07-283-2/+167
| |/ / | | | | | | | | | | | | | | | Bug: 5087957 Change-Id: Idf70c488baa515222ce8ed905aa5c80a529fd15f
* | | Merge "Fix Strict Mode violation in SnapshotProvider."Ben Murdoch2011-07-281-8/+15
|\ \ \
| * | | Fix Strict Mode violation in SnapshotProvider.Ben Murdoch2011-07-281-8/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | Don't initialise the database helper until we need it - doing it in onCreate hits the disk. Bug: 5090265 Change-Id: I84ddde4da46452804fd3030ef1a49c4ba6eb69b4
* | | Fix for bug 5090755 StrictMode violation BrowserProvider2 - Cursor not closedKristian Monsen2011-07-281-3/+8
|/ / | | | | | | | | | | Closing all cursors in the file that were not closed. Change-Id: I0dd3f4d438d1cb8390ac297322ee38d0afd50fea
* | Merge "add collapse animation to tab switcher"Michael Kolb2011-07-273-16/+99
|\ \
| * | add collapse animation to tab switcherMichael Kolb2011-07-273-16/+99
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5087355 if the tab is not the last tab, the tabs collapse smoothly use animation when close button is used Change-Id: I5dabcbb30317ff634aafd21b6f1b0e2b902b767e
* | | Fix HC -> ICS db upgradeJohn Reck2011-07-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 3249854 When upgrading from HC to ICS, enable account sync for browser as in HC it defaulted to off whereas in ICS we default to on. Change-Id: I69ccd535409c0e5b031efe087c09cc06281c2537