summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import revised translations."Eric Fischer2011-06-0377-233/+1125
|\
| * Import revised translations.Eric Fischer2011-06-0277-233/+1125
| | | | | | | | Change-Id: I1d2e99c10d7e7edc9f3574df36f5df37abcbbca0
* | Merge "Add API to allow plugins to lock their orientation in full-screen"Derek Sollenberger2011-06-036-8/+22
|\ \
| * | Add API to allow plugins to lock their orientation in full-screenDerek Sollenberger2011-06-026-8/+22
| | | | | | | | | | | | | | | | | | | | | This CL has companion changes in the framework and webkit. bug: 3398386 Change-Id: Iea198ae6b74c68506e605ca8c401f199e2455416
* | | am 846f3108: (-s ours) am b0f45fb8: Merge "DO NOT MERGE Fix bookmark view ↵John Reck2011-06-020-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | padding on 10in" into honeycomb-mr2 * commit '846f3108d74818e05fa31dea39c2477a76dd7d5e': DO NOT MERGE Fix bookmark view padding on 10in
| * \ \ am b0f45fb8: Merge "DO NOT MERGE Fix bookmark view padding on 10in" into ↵John Reck2011-05-261-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'b0f45fb8f817520987941bdac0109cc31ff7b3b9': DO NOT MERGE Fix bookmark view padding on 10in
| | * \ \ Merge "DO NOT MERGE Fix bookmark view padding on 10in" into honeycomb-mr2John Reck2011-05-261-0/+0
| | |\ \ \
| | | * | | DO NOT MERGE Fix bookmark view padding on 10inJohn Reck2011-05-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4499044 Change-Id: I3a37e826b260f719cdb0d5e8594683a4b9510a1f
* | | | | | am eb19c49b: (-s ours) am 442358f1: DO NOT MERGE Fix history crash on 7inJohn Reck2011-06-020-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * commit 'eb19c49ba00fb25d982532a54e50cf128ea93e88': DO NOT MERGE Fix history crash on 7in
| * | | | am 442358f1: DO NOT MERGE Fix history crash on 7inJohn Reck2011-05-264-3/+108
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '442358f16ff7a6043db15c5a8a6a39cc9a9abfe4': DO NOT MERGE Fix history crash on 7in
| | * | | DO NOT MERGE Fix history crash on 7inJohn Reck2011-05-264-3/+108
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4490754 This is a cherry pick from master of CL Ia1f397e0 Change-Id: I6c4aa3128648ed4a3ef44b6c9197863721ed0dc6
* | | | use webview proxy in nav screenMichael Kolb2011-06-014-62/+95
| | | | | | | | | | | | | | | | Change-Id: If5c914dfad48cd4b13cd5fe81374e8adc35060f9
* | | | calculate scroller paddingMichael Kolb2011-05-315-32/+55
| |_|/ |/| | | | | | | | Change-Id: I727c425e096220ae1230e3fbe0f1edb4b3fea8ed
* | | Prevent crashing in CrashRecoveryHandlerJohn Reck2011-05-275-12/+19
| | | | | | | | | | | | | | | | | | | | | Catch Throwable instead of Exception Don't save screenshots for crash recovery Change-Id: I22c36dc644ae597c609880d2ced79436918d83a6
* | | Merge "long axis scrolling for nav screen"Michael Kolb2011-05-2711-194/+2038
|\ \ \
| * | | long axis scrolling for nav screenMichael Kolb2011-05-2711-194/+2038
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also: fix combo view navscreen overlap fix menu key handling adjust screenshot capture size Change-Id: Ia0c920ed40e7d97d5902d98b85830817b9de6506
* | | | Merge "Bookmark drop CAB"John Reck2011-05-276-40/+217
|\ \ \ \
| * | | | Bookmark drop CABJohn Reck2011-05-276-40/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dragging a bookmark, show the CAB with drop targets Change-Id: I2a05800c8ab393f8fba64c46945266566eeacc7f
* | | | | Fix set parent race conditionJohn Reck2011-05-273-23/+24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alter the openTab method to make sure that the parent is always set before trying to load a url. This is done because some web settings (useragent) are now inherited from the parent, and we need to make sure those are applied before the UA is sent to the server. Change-Id: Ib33b75ac4648e8ba1ede9bb92406ea175aabb19d
* | | | Remove sync settingJohn Reck2011-05-265-693/+19
| | | | | | | | | | | | | | | | Change-Id: I7719c82a3a63d8ac8022e70e3a7f7b4a814e304f
* | | | Merge "Remove no longer needed sync settings/code"John Reck2011-05-266-114/+0
|\ \ \ \
| * | | | Remove no longer needed sync settings/codeJohn Reck2011-05-266-114/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we support multiple accounts, remove a bunch of single-account management stuff Change-Id: I2ae60f0a510ace48e14c97763145d4e5dd523dd1
* | | | | Import revised translations.Eric Fischer2011-05-2649-148/+2883
|/ / / / | | | | | | | | | | | | Change-Id: Icb6e05e40c49676e9fd141ded83211ac4dd1efbe
* | | | Configure bookmark widgetJohn Reck2011-05-269-56/+197
|/ / / | | | | | | | | | | | | | | | | | | Add a configuration step when adding the bookmark widget to pick what account to use Change-Id: I2be723c411ec5b9f32d6819a5e2e65995921a252
* | | new iteration of the navigation UIMichael Kolb2011-05-2519-468/+1982
| | | | | | | | | | | | | | | | | | use live webviews Change-Id: Ie787c76470e445548d358374f83f33a1b0b0b5cf
* | | Merge "Help dialog for useragent switcher lab"John Reck2011-05-245-6/+66
|\ \ \
| * | | Help dialog for useragent switcher labJohn Reck2011-05-245-6/+66
| | | | | | | | | | | | | | | | Change-Id: I1126f2dae652a36a133aa85a3a8aa823ab875b7b
* | | | Useragent switcher tweaksJohn Reck2011-05-242-0/+16
|/ / / | | | | | | | | | | | | | | | | | | Children inherit parent tab's setting Setting is now save/restored across kills Change-Id: I664d2d887281df7b99e8239e3ba41ba540f4bbec
* | | am e3bc6799: (-s ours) am 3963b6c9: (-s ours) am 8ba13bcb: DO NOT MERGE - ↵Ed Tam2011-05-240-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4 * commit 'e3bc67990043c5beefa2b3f782d96a6c34911c20': DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761
| * | am 3963b6c9: (-s ours) am 8ba13bcb: DO NOT MERGE - Backport RLZ code to GB: ↵Ed Tam2011-05-230-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761 * commit '3963b6c93a182ffbfe591bb4ca5ccf38a6188900': DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761
| | * \ am 8ba13bcb: DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter ↵Ed Tam2011-05-236-0/+260
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761 * commit '8ba13bcb1ad5ab8b439fcc53d158bdafa327a2e8': DO NOT MERGE - Backport RLZ code to GB: - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761
| | | * | DO NOT MERGE - Backport RLZ code to GB:Ed Tam2011-05-176-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cache RLZ parameter - Set RLZ parameter for address bar searches - Add broadcast receiver to handle RLZ updates - Update RLZ parameters in home page and bookmarks Bug: 4436761 Change-Id: I7ce0e7bead7954ed9ebfe10b66242553f14ed6f2
* | | | | am adc265c0: (-s ours) am 7d019020: DO NOT MERGE use -sw instead of -wJohn Reck2011-05-230-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'adc265c093ddda9aeee3abc88861718713ea383a': DO NOT MERGE use -sw instead of -w
| * | | | am 7d019020: DO NOT MERGE use -sw instead of -wJohn Reck2011-05-208-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '7d019020fdab380866cd1e1ad429a959baeb3c39': DO NOT MERGE use -sw instead of -w
| | * | | DO NOT MERGE use -sw instead of -wJohn Reck2011-05-208-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I704b7a026298901da01d98e33df287d63cd3a265
* | | | | Initial implementation of the useragent switcherJohn Reck2011-05-237-4/+89
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaa8262a678902645dbfaa8a53fe7212af7d9d53c
* | | | | Merge "Change -w600dp to -sw600dp"John Reck2011-05-207-0/+0
|\ \ \ \ \
| * | | | | Change -w600dp to -sw600dpJohn Reck2011-05-207-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5303efd4eb81e5dd152aebbe200a0610e165fcf3
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with gingerbread-release honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | Change-Id: Ic955d22bdfe282546ada37299aa4ce413428c2a6
| | * | | | | Fix ISE in History page (DO NOT MERGE)Dave Burke2011-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corresponding change in master was https://android-git.corp.google.com/g/#change,95446 Bug: 3427773 Change-Id: Iaa7a5620285797cd6d3e15e9f5e058ca553a5951
| | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | |\ \ \ \ \ | | |/ / / / / /
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | | |\ \ \ \ \ | | | |/ / / / / /
| | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | | | | |\ \ \ \ \ | | | | |/ / / / / /
| | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | | |\ \ \ \ \ | | | | |/ / / / / /
| | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | | | |\ \ \ \ \ | | | | | |/ / / / / /
| | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-020-0/+0
| | | | | | |\ \ \ \ \
generated by cgit v1.1 at 2025-01-27 19:21:17 +0000