summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move action bar in tab switcherMichael Kolb2011-09-201-2/+2
| | | | | | | Bug: 5334321 And up again. Change-Id: I41d2a81adccc36f8afa36cc1f14afb42328a5548
* am a3b9974b: Merge "Updated Browser Launcher icon Bug: 5286988" into ↵Justin Ho2011-09-163-0/+0
|\ | | | | | | | | | | | | ics-factoryrom * commit 'a3b9974bb3d05d78f18acf85a5bf91bb2b868e61': Updated Browser Launcher icon Bug: 5286988
| * Merge "Updated Browser Launcher icon Bug: 5286988" into ics-factoryromJustin Ho2011-09-163-0/+0
| |\
| | * Updated Browser Launcher iconJustin Ho2011-09-163-0/+0
| | | | | | | | | | | | | | | | | | Bug: 5286988 Change-Id: I5889d239b0cfed2cdcf529ce5d993105fb2866cf
* | | am 936d387d: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-160-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '936d387d3dbae3d0c7be21a725e8e97a961ecfa1': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-09-1638-1694/+1059
| | | | | | | | | | | | Change-Id: I84e35fbd79f79d5ab65105a68eaa367579bf6b8b
* | | Use overlay action modeJohn Reck2011-09-163-22/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5327408 By using actionBar: false with actionModeOverlay: true the action mode callbacks happen before the action mode animation. This allows us to animate down the URL bar at the same time if needed (when the URL is being edited). Overlay mode fixes the issue with webview being translated, which was what caused the selection handles to move. Only the selection handles were affected thanks to b/4982054 Change-Id: I8153de63124eb4e4d02e88637f0cf01658054a14
* | | Merge branch 'master' of ssh://android-git:29418/platform/packages/apps/BrowserDavid 'Digit' Turner2011-09-1512-92/+82
|\ \ \ | |/ / |/| |
| * | Merge "Fix WebStorageSizeManagerUnitTest NPE"Ben Murdoch2011-09-152-6/+4
| |\ \
| | * | Fix WebStorageSizeManagerUnitTest NPEBen Murdoch2011-09-152-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we passed a null Context into the WebStorageSizeManager from the unit test. After the refactoring to get the application context from the passed in Context, this no longer works. So pass in a valid Context. (See Ib0be5f8c for the regression) Bug: 5319628 Change-Id: I691e2edb0a4174076c7599525569d104a83d3442
| * | | Use the right clock in UrlBarAutoShowManagerJohn Reck2011-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5291191 Change-Id: Ie4a11be79d24af9075e40a0f20cddd39e515ae17
| * | | Merge "Cleanup menus"John Reck2011-09-157-82/+69
| |\ \ \
| | * | | Cleanup menusJohn Reck2011-09-147-82/+69
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 5290513 Change-Id: I2ca1de40fe362b74d941056504fc4e3249de03a3
| * | | Merge "Adjust text zoom by system preference"John Reck2011-09-152-3/+8
| |\ \ \
| | * | | Adjust text zoom by system preferenceJohn Reck2011-09-142-3/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5287968 System setting is a multiplier on top of browser's text zoom preference Change-Id: I88ea1340827492412c51efaf28ca789767ba8c56
| * | | Merge "Change default preload setting to 'Wifi only'."Mathew Inwood2011-09-151-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Change default preload setting to 'Wifi only'.Mathew Inwood2011-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5323754 Change-Id: Ice95f25d6a4200b1d0d19f41e163f4cc0a1e0f9a
* | | | Change default preload setting to 'Wifi only'.Mathew Inwood2011-09-151-1/+1
|/ / / | | | | | | | | | | | | | | | Bug: 5323754 Change-Id: Ice95f25d6a4200b1d0d19f41e163f4cc0a1e0f9a
* | | Merge "Revert "Support for measuring page load times.""Mathew Inwood2011-09-154-158/+11
|\ \ \ | |/ / | | / | |/ |/|
| * Revert "Support for measuring page load times."Mathew Inwood2011-09-154-158/+11
| | | | | | | | | | | | | | | | | | | | | | The page load time measurement was a stop gap measure until server side support is ready, and we don't want to ship with it in. Bug: 5266893 This reverts commit b4e831bf1ff62945199b89a77ad039be7bd16545. Change-Id: Iafc08cea88774e5ecf018112a25e4dc2993a4623
* | Make bookmark be full widthJohn Reck2011-09-131-3/+2
| | | | | | | | | | | | | | Bug: 5288329 Pushes scroll bars to the edge and allows scrolling in the empty space Change-Id: Ie35a0dde2887aeb67d02992751629540222f1713
* | Merge "Add sanity checking to bookmark click listener"John Reck2011-09-121-0/+7
|\ \
| * | Add sanity checking to bookmark click listenerJohn Reck2011-09-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5296561 Monkey manages to make the impossible happen - sanity check the state of the world. Change-Id: Ibbe62e6bd564d98af570271fa834dc9472c06126
* | | Merge "Use uptimeMillis instead of currentTimeMillis"John Reck2011-09-121-2/+3
|\ \ \ | |/ / |/| |
| * | Use uptimeMillis instead of currentTimeMillisJohn Reck2011-09-121-2/+3
| | | | | | | | | | | | | | | | | | Bug: 5291191 Change-Id: I70b54d9f7c0ab974bf8a361b77d79a40e8d32f78
* | | Merge "Add missing null check"John Reck2011-09-121-4/+6
|\ \ \
| * | | Add missing null checkJohn Reck2011-09-121-4/+6
| |/ / | | | | | | | | | | | | | | | Bug: 5297101 Change-Id: Iff8b57ef28d8481f244d937bf980a84de595e7f8
* | | Merge "Import revised translations."Eric Fischer2011-09-1246-91/+329
|\ \ \ | |/ / |/| |
| * | Import revised translations.Eric Fischer2011-09-1246-91/+329
| |/ | | | | | | Change-Id: Ic6f5bae5587ef75cca854e4991a57e00dcd262f1
* | Merge "Updated Browser launcher icon Bug: 5286988"Justin Ho2011-09-123-0/+0
|\ \ | |/ |/|
| * Updated Browser launcher iconJustin Ho2011-09-093-0/+0
| | | | | | | | | | | | Bug: 5286988 Change-Id: I1124af16fe8dac50f9183a7695debb64e148d30b
* | Merge "Cleanup history perf + UI"John Reck2011-09-095-28/+75
|\ \
| * | Cleanup history perf + UIJohn Reck2011-09-095-28/+75
| |/ | | | | | | | | | | Bug: 5283880 Change-Id: Id2868335d308b8dabf79fe33e177a2d0babd66d9
* | New saved page animationJohn Reck2011-09-081-0/+64
|/ | | | | | Bug: 4982126 Change-Id: Ice99b4af910d811aa4fd5dd6a6d663d60d8ebe62
* Use onDraw instead of capturePicture for thumbnailsJohn Reck2011-09-081-31/+35
| | | | | | Bug: 5220344 Change-Id: I78ebbb8ae6c574d79b99fcde8220e5d08342876c
* 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-083-2/+3
|\ \
| * | Change default preload setting to 'Always'.Mathew Inwood2011-09-073-2/+3
| |/ | | | | | | | | | | | | Also some tidying up to that the default is only specified in a single place. Change-Id: I6d66739a8b0d307f8af3c29c62d122a3044c4943
* | Merge "Revert "Merge WebKit at r73109: update V8 JNI test cases.""Steve Block2011-09-081-2/+1
|\ \
| * | Revert "Merge WebKit at r73109: update V8 JNI test cases."Steve Block2011-09-051-2/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit faed5798f2ca3320e0b6afdb197feda25052f79a. Bug: 5252155 Change-Id: Ibb3a84cd353fc63a7378d7106b1a6f44a9eb9768
* | | 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-075-10/+85
|\ \ \ \ | |_|/ / |/| | |
| * | | More fine-grained config for 'Search result preloading' setting.Mathew Inwood2011-09-055-10/+85
| |/ / | | | | | | | | | | | | | | | | | | 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