summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Prevent WebViewPreview from scrolling"John Reck2011-09-081-0/+7
|\
| * Prevent WebViewPreview from scrollingJohn Reck2011-09-071-0/+7
| | | | | | | | | | | | Bug: 5265951 Change-Id: I844e1fe4f0d2cdf2376147c733e589c700d4e7be
* | Merge "Change default preload setting to 'Always'."Mathew Inwood2011-09-081-1/+1
|\ \
| * | Change default preload setting to 'Always'.Mathew Inwood2011-09-071-1/+1
| |/ | | | | | | | | | | | | Also some tidying up to that the default is only specified in a single place. Change-Id: I6d66739a8b0d307f8af3c29c62d122a3044c4943
* | Do not feed the monkeyMichael Kolb2011-09-071-0/+1
| | | | | | | | | | | | Bug: 5261282 Change-Id: I8c982436e9fb45e6d79afe0a6294389d626b6276
* | Merge "Fix omnibox ordering"John Reck2011-09-071-2/+0
|\ \ | |/ |/|
| * Fix omnibox orderingJohn Reck2011-09-061-2/+0
| | | | | | | | | | | | | | | | | | Bug: 5155207 The group by to prevent dupes screwed up the ordering. Allow dupes for now so that ordering is correct (duples will only appear if you actually have duplicate bookmarks) Change-Id: Ibde0ea715ae2702a16e918843efbc997bb51d5df
* | Merge "Support for measuring page load times."Mathew Inwood2011-09-074-11/+158
|\ \
| * | Support for measuring page load times.Mathew Inwood2011-09-064-11/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An app can attached a pending intent to an intent sent to the browser which will be send when the load completes. The browser will fill in the timestamp of when the page load completed, and details of preloading success or otherwise if this was used. Bug: 5259031 Change-Id: I2d025caabd6055ac25f06e69897a03d5c57c4f41
* | | Merge "More fine-grained config for 'Search result preloading' setting."Mathew Inwood2011-09-073-7/+62
|\ \ \ | |_|/ |/| |
| * | More fine-grained config for 'Search result preloading' setting.Mathew Inwood2011-09-053-7/+62
| |/ | | | | | | | | | | | | Instead of a checkbox, it's now a setting always/wifi only/never. Bug: 5086576 Change-Id: I265a22968eafee547571dc86c10c5d5421a305e8
* | Merge "Monkey protection"John Reck2011-09-062-3/+13
|\ \
| * | Monkey protectionJohn Reck2011-09-062-3/+13
| | | | | | | | | | | | | | | | | | Bug: 5134204 Change-Id: Id61b16b17b4a054ab7f1948614399f157f52821f
* | | Clear accounts after cursors are closedJohn Reck2011-09-062-1/+2
|/ / | | | | | | | | | | Bug: 5240198 Change-Id: I27704c165a22cecd49a903e66055547f3bd3cb50
* | Merge "Grid align omnibox on tablet"John Reck2011-09-061-6/+19
|\ \
| * | Grid align omnibox on tabletJohn Reck2011-09-061-6/+19
| |/ | | | | | | | | | | | | Bug: 5155161 Offset for popup window padding Change-Id: I586bdfdffdd0c21466001492ecae8d74f3581617
* | Don't strip www from URLsJohn Reck2011-09-061-4/+4
|/ | | | | | | | | | Bug: 5253063 As there is a technical difference between google.com and www.google.com, avoid stripping the www. from URLs. Some sites still require the www. to be present, and in those cases it leads to a confusing experience if the www. is stripped Change-Id: Iacb5fdb148fc65c1f992339b463264e8cbf100e2
* Merge "Fix NPE in setActiveTab"Bart Sears2011-09-021-2/+1
|\
| * Fix NPE in setActiveTabMichael Kolb2011-09-021-2/+1
| | | | | | | | | | | | | | | | Bug: 5248939 5214748 The second bug is actually different, and was not repeatable but the first case is now protected Change-Id: I26f16ee3a828f6e9208c02cde89faa43a0423428
* | Merge "Fix focus highlight bug"Michael Kolb2011-09-022-4/+29
|\ \
| * | Fix focus highlight bugMichael Kolb2011-09-022-4/+29
| |/ | | | | | | | | | | | | | | Bug: 5240233 post the layout change on state change add clear button when editing Change-Id: I9db16619cd39611153503b28757d4b16e52ab9e3
* | Merge "Small startup perf improvement"John Reck2011-09-021-1/+4
|\ \ | |/ |/|
| * Small startup perf improvementJohn Reck2011-09-021-1/+4
| | | | | | | | | | | | Bug: 5019676 Change-Id: Ib5f6f5ee8116b53936c927884a32dd4a4765364d
* | Assign urlbar background to actionbarMichael Kolb2011-09-021-1/+0
| | | | | | | | | | | | | | Bug: 5242700 changed phone style to have urlbar background Change-Id: I145480b25e1691281eaa0cc154eae5198c61fdc5
* | Merge "Clear back stack after submitted query into preloaded page."Mathew Inwood2011-09-022-9/+29
|\ \
| * | Clear back stack after submitted query into preloaded page.Mathew Inwood2011-09-022-9/+29
| | | | | | | | | | | | | | | | | | | | | This ensures that the blank searchbox page does not appear in the back stack. Bug: 5252128 Change-Id: I93e2e7f7c1c69e6e0e93b38acf1c7c9dc887ec19
* | | Merge "Make sure preloaded tabs have unique IDs."Mathew Inwood2011-09-023-0/+16
|\ \ \ | |/ /
| * | Make sure preloaded tabs have unique IDs.Mathew Inwood2011-09-023-0/+16
| |/ | | | | | | | | Bug: 5251821 Change-Id: I6dd7561a2461805912268a5faf967199cf39fd8c
* | Merge "URL bar pull down tweaks"John Reck2011-09-022-5/+21
|\ \ | |/ |/|
| * URL bar pull down tweaksJohn Reck2011-09-012-5/+21
| | | | | | | | | | | | Bug: 5222990 Change-Id: If5c4154dca892410f6884cae8d39fb25fbb0575f
* | Merge "Unregister the NFC callback onPause."Ben Murdoch2011-09-012-3/+14
|\ \
| * | Unregister the NFC callback onPause.Ben Murdoch2011-09-022-3/+14
| |/ | | | | | | | | | | | | | | This prevents us from leaking BrowserActivity when we go to the background. Bug: 5233864 Change-Id: Idf59de67637c8c9eb39ea9f8b9cb93320c4afa99
* | Refine search provider checkMichael Kolb2011-09-011-1/+8
|/ | | | | | | | Bug: 2868373 the search provider test is now restricted to the authority oart of the url only Change-Id: Iee6adec7df70347ed8443d3e61500e3d5e4eb8d4
* Show n-best resultsMichael Kolb2011-08-311-1/+2
| | | | | | | | Bug: 5231143 regression from introducing short/long form urls in the url bar Change-Id: I17055bb16e5930877cb664a058ce26f7518a4aad
* Merge "Fix blank page activity selection bug"John Reck2011-08-293-13/+17
|\
| * Fix blank page activity selection bugJohn Reck2011-08-293-13/+17
| | | | | | | | | | | | | | | | | | | | Bug: 5191031 Sets an app id on the tab so that if the intent comes back to us, it is opened in the current tab. Close empty tabs correctly if the intent goes elsewhere Fix Tab.syncCurrentState to deal with WebView.getUrl() == null correctly Change-Id: I31e1e1f6688fb5c5c31ba07dde4e6b3bad34fb13
* | Fix issues with state save/restoreJohn Reck2011-08-293-22/+50
|/ | | | | | | | | | | | | Bug: 5144214 Tracked down the issue with messed up state to a bug where tab ids were not unique, and would actually get messed up in restore. Switched it to the tab's responsibility to assign an id to itself in the ctor to make sure all possible paths where a tab is created are fixed as well as the tab being the best informed about whether or not it has an ID to restore from. Added some checks to watch for a similar problem in the future as well. Change-Id: Icd8333232a0baca7a3639323538886ea595de05a
* Merge "Security warning dialog update"John Reck2011-08-292-65/+45
|\
| * Security warning dialog updateJohn Reck2011-08-262-65/+45
| | | | | | | | | | | | Bug: 5222843 Change-Id: I0d387a0564c82e1234ea14dee723a52e1ba9cade
* | Updates for NDEF push API change.Nick Pelly2011-08-252-40/+27
| | | | | | | | Change-Id: I2390665d59f6b3868b5a3a27bfc38ea4c9cdf0d4
* | Drop active tab check when blocking eventsMichael Kolb2011-08-241-14/+5
| | | | | | | | | | | | | | Bug: 5198309 The active tab check was freezing the browser Change-Id: I3376c84bb178c02d02deb54bf23fa1149809963d
* | Check current tab before making activeMichael Kolb2011-08-241-1/+4
| | | | | | | | | | | | Bug: 5202966 Change-Id: I62fc806176d178193c4a9f0b658efa45b4d96584
* | Merge "Fix icon resources"Michael Kolb2011-08-241-1/+1
|\ \ | |/ |/|
| * Fix icon resourcesMichael Kolb2011-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 5066431 updated remaining icons: secure/partial/overlay progress various bookmark icons Change-Id: I474a1cd3981474eddbd4be0a38a8d0d8083232e1
* | Fix Snapshot->Live transitionJohn Reck2011-08-231-8/+14
|/ | | | | | Bug: 5121917 Change-Id: I8462038fe4a9bd38e6e82d8d08fbef4605a3ca71
* Merge "Save bookmark group state"John Reck2011-08-222-3/+57
|\
| * Save bookmark group stateJohn Reck2011-08-222-3/+57
| | | | | | | | | | | | Bug: 5135795 Change-Id: Id5069cc3f2afb16bcadac5b83d523200898a7d73
* | Merge "Avoid showing previous tab when closing an app tab"Michael Kolb2011-08-222-2/+12
|\ \ | |/ |/|
| * Avoid showing previous tab when closing an app tabMichael Kolb2011-08-222-2/+12
| | | | | | | | | | | | | | | | Bug: 5188145 skip setActiveTab when closing a tab launched from an app set active tab in onResume Change-Id: If602358a61690f15fe2e81a6b3d62d51ad15e16d
* | Add bulletproofing to state recoveryJohn Reck2011-08-226-24/+39
|/ | | | | | Bug: 5166335 Change-Id: Ife9ef2da7664f8de6b0ff9655611efa78d84df05