summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Fix the buildJohn Reck2011-07-271-1/+1
| | | | | | | | Change-Id: Ia881cc2e9af6f0a52f969f65cfa32f19ef15c485
* | Merge "Restore overhaul"John Reck2011-07-2717-142/+363
|\ \
| * | Restore overhaulJohn Reck2011-07-2717-142/+363
| |/ | | | | | | | | | | | | | | Bug: 5069192 Store thumbnails in a database restored async for each tab Fix restoring a tab not restoring its current state Change-Id: I2c14e352638aac0ef766fb3bf4036ff220c53ecd
* | Fix dialog crashJohn Reck2011-07-271-1/+9
|/ | | | | | | | Bug: 5007226 This is sort of a "nuke it from orbit" fix to prevent the crash as it is a test blocker. Bug 5086504 filed to track a "proper" fix Change-Id: Ifd02a1fee05a05d61d70724a1ae758701679fc27
* handle preload tab when max count is reachedMichael Kolb2011-07-272-0/+26
| | | | | | | | | | Bug: 5066968 when opening the pre-load tab, check against max count if max count is already reached, replace the least used tab with the pre-loaded tab; it's back/forward history will be lost Change-Id: I091b6b066a3e990f330be458d4aff72f62c8de38
* Merge "add tab dragging"Michael Kolb2011-07-273-30/+169
|\
| * add tab draggingMichael Kolb2011-07-263-30/+169
| | | | | | | | | | | | | | | | Bug: 5081671 enable dragging tabs to close them animations are not correct yet and will be fixed later Change-Id: Ib0a4ca07706fd73464e307f2061c4246863b9ec8
* | Merge "Releasing a SQLite cursor."Kristian Monsen2011-07-271-0/+1
|\ \
| * | Releasing a SQLite cursor.Kristian Monsen2011-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug 5080615 StrictMode violation AccountsChangedReceiver - Cursor not closed Not releasing the cursor is a strict mode violation, see http://strictdroid.prom.corp.google.com/v/16e91826934896b11d2763d0dce226adf9cf5866 Change-Id: I53eaa2d7e2b3328dd69869e6e9fc24babc68aa48
* | | Merge "Show prelogin only once"John Reck2011-07-265-21/+36
|\ \ \ | |_|/ |/| |
| * | Show prelogin only onceJohn Reck2011-07-265-21/+36
| | | | | | | | | | | | | | | | | | Bug: 5081641 Change-Id: I1c625e3528de9a7cd37dae5b8b428ff141759e14
* | | Merge "fix close button style/layout"Michael Kolb2011-07-261-3/+3
|\ \ \
| * | | fix close button style/layoutMichael Kolb2011-07-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5081236 Change-Id: I105c1b7e59d4ad68207f32d4fb4d7c7b47aca2d5
* | | | Merge "Import revised translations."Eric Fischer2011-07-2647-348/+484
|\ \ \ \
| * | | | Import revised translations.Eric Fischer2011-07-2547-348/+484
| | | | | | | | | | | | | | | | | | | | Change-Id: I0fb9ff8d73c9f4aba8ab60f9d31e22b664bfe050
* | | | | Merge "Remove dead code."Jeff Brown2011-07-261-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove dead code.Jeff Brown2011-07-251-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id62f6f1e10c63ecccbe63df3b7218f0454194be2
* | | | | Merge "Remove obsolete usage of WebIconDatabase"John Reck2011-07-266-97/+12
|\ \ \ \ \
| * | | | | Remove obsolete usage of WebIconDatabaseJohn Reck2011-07-266-97/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5019676 Removes some other legacy code Change-Id: I766d9d6f7805b5619a9769e6d72ae2f4c363d3ed
* | | | | | Fix TabControl#canCreateTab.Narayan Kamath2011-07-261-4/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preloaded tabs don't obey the tab limit (yet) so if a single preloaded tab pushes the tab count up to mMaxTabs + 1, canCreateTab will always return true from that point on. This is just a partial fix, because Preloaded tabs still don't obey this limit. bug:5066968 Change-Id: I6bd574485a6e0f94324c9f6d0cb7624b8951e576
* | | | | Merge "Switch to a background thread pool"John Reck2011-07-255-66/+98
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Switch to a background thread poolJohn Reck2011-07-255-66/+98
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5019676 Use a shared thread pool Eliminate some unnecessary use of AsyncTask (which has extra overhead compared to using a thread pool) Change-Id: I01d6c84816a9c9705216c8fdb8ed8c990265626a
* | | | Close FileInputStream in CrashRecoveryHandlerBen Murdoch2011-07-251-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix strict mode violation. Bug: 5073242 Change-Id: I0c4c276f03428666e924f2dccf4b3e4ed8c5dbe8
* | | | apply() instead of commit() SharedPref change in CrashRecoveryHandlerBen Murdoch2011-07-251-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Don't commit shared preference changes on the UI thread. Bug: 5019676 Change-Id: Idffbc085f375c941a1e70a5f7c96517fa6bd559d
* | | Merge changes I78550965,I6e0fe0ba,Ia6db6cf3Ben Murdoch2011-07-253-50/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Cache the factory reset URL. Fix StrictMode violation in InstantSearchEngine Query Private Browsing state for NFC on UI thread.
| * | | Cache the factory reset URL.Ben Murdoch2011-07-251-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hitting the browser provider for the factory reset url is one of our most common strict mode violations, and triggers sqlite disk io. So now read it once in a background thread and cache it for future accesses. Needed to make the requireInitialization() function static, so we now wait/notify on BrowserSettings.class rather than the instance. Bug:5072979 Change-Id: I78550965887e32b4f8ad0eaf0013753e63d6f602
| * | | Fix StrictMode violation in InstantSearchEngineBen Murdoch2011-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get the current URL from the Tab rather than WebView to avoid calling a WebView method on a background thread. Bug: 5072398 Change-Id: I6e0fe0bac525fc772f659068dbc03511f20addf4
| * | | Query Private Browsing state for NFC on UI thread.Ben Murdoch2011-07-251-35/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AsyncTask runs on the thread that created it, which in this case is not necessarily the UI thread. Use a Handler created on the UI thread instead. Bug: 5072522 Change-Id: Ia6db6cf396c3f73cfb51e6d4d227617d95946692
* | | | Merge "Limit the number of preloader sessions to one."Narayan Kamath2011-07-251-13/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Limit the number of preloader sessions to one.Narayan Kamath2011-07-221-13/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behaviour is that a request with another session ID is made when a session is active, the request is denied. This prevents trashing if multiple apps were to request preloads with different IDs. This also means the first one wins always. bug: 5066968 Change-Id: I7454b929255c3f845abd4463dbe07bb2d5afcf5f
* | | Quick disabling of state imagesJohn Reck2011-07-221-1/+1
| | | | | | | | | | | | | | | | | | Bug: 5069192 Change-Id: I9a9e16bb9014c2734cf258526a8579907a9f6791
* | | Preload crash recovery stateJohn Reck2011-07-223-61/+100
| | | | | | | | | | | | | | | | | | Bug: 5069111 Change-Id: Ia19d7b3a8eb483fc4e9076fa388c82d8673894ac
* | | Merge "Fix autologin crash by removing cleverness"John Reck2011-07-221-10/+1
|\ \ \
| * | | Fix autologin crash by removing clevernessJohn Reck2011-07-221-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5007226 The delay dismissing of the dialog opened a situation where the dialog would attempt to be dismissed after the activity was destroyed. This just removes the cleverness (which we can revisit later) Change-Id: I2bde130f5ffe31f5d33db7f107c42e881fea1d45
* | | | Merge "Startup optimization"John Reck2011-07-224-32/+42
|\ \ \ \ | |/ / / |/| | |
| * | | Startup optimizationJohn Reck2011-07-214-32/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5019676 Save one thread by letting CrashRecoveryHandler re-use the BrowserSettings startup thread Lazy initialize the wake lock only if we need it (avoids IPC overhead at startup) Slight ordering shuffle in BrowserActivity to maximize the usefulness of the BrowserSettings startup thread Change-Id: I1fc7412d492f93e0630008fa6030da9e0d726ebb
* | | Adding xhdpi assets and upscaling any hdpi and mdpi assets (reconcile the ↵Justin Ho2011-07-2284-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | phone+tablet assets) Bug: 5066431 Change-Id: I8067edccc8613ae6838406ffc1a0276ed287d60b
* | | Updating Browser assets from design repoJustin Ho2011-07-2226-0/+0
|/ / | | | | | | | | | | | | Moving existing asset in res/drawable into res/drawable-nodpi Bug: 5066431 Change-Id: I58d400e4b0d60c511103bef56765616ab36fa4c6
* | Initialize settings in a threadJohn Reck2011-07-211-44/+76
| | | | | | | | | | | | Bug: 5062581 Change-Id: I6f10b829918cec1d57eeda3958ef9f76216fcd3a
* | ActionBar change for phonesJohn Reck2011-07-204-11/+31
| | | | | | | | | | | | Bug: 5022239 Change-Id: I0ccf131468cd129f4770ef85bde8d023670c33c8