summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Tracking KeyChain API refinements"Brian Carlstrom2011-06-092-5/+5
|\ \ | |/ |/|
| * Tracking KeyChain API refinementsBrian Carlstrom2011-06-092-5/+5
| | | | | | | | Change-Id: Ia1a07c443b3c2e0373eeb4a7f5cffa65bbed17a0
* | fix hide navscreen bugMichael Kolb2011-06-091-0/+1
|/ | | | | | | Bug: 4569020 check if we're already hidden Change-Id: Ief4d2e94c66cf85fa71f5c19ffacfde3e204c42b
* Merge "Provide Browser implementation of ↵Brian Carlstrom2011-06-092-0/+81
|\ | | | | | | WebViewClient.onReceivedClientCertRequest"
| * Provide Browser implementation of WebViewClient.onReceivedClientCertRequestBrian Carlstrom2011-06-092-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the example of onReceivedSslError, implement onReceivedClientCertRequest ERROR CASE CLIENT CERT CASE <... From frameworks/base ...> <... From frameworks/base ...> Tab.SubWindowClient.onReceivedSslError Tab.SubWindowClient.onReceivedClientCertRequest Tab.mWebViewClient.onReceivedSslError Tab.mWebViewClient.onReceivedClientCertRequest <... ssl_warnings dialog ...> <... KeyChain.choosePrivateKeyAlias/KeyChainLookup ...> SslErrorHandler.proceed (with SslCertLookupTable) ClientCertRequestHandler.proceed (with SslClientCertLookupTable) <... To frameworks/base ...> <... To frameworks/base ...> Change-Id: I3ed3789c4efc97c87ab4773cdaed3e654a1fd1e3
* | Merge "fix close last page bug"Michael Kolb2011-06-091-7/+3
|\ \ | |/ |/|
| * fix close last page bugMichael Kolb2011-06-091-7/+3
| | | | | | | | | | | | | | | | | | | | Bug: 4586081 changed behavior of closing last page to exit the browser (consistent with tablet UI) this eliminates the state where browser doesn't have a current page which caused the original bug Change-Id: If933c6f14b6ae0c5c95fc8e656bbd909f6cb09b7
* | Merge "Freeze tab improvements"John Reck2011-06-084-23/+134
|\ \
| * | Freeze tab improvementsJohn Reck2011-06-074-23/+134
| |/ | | | | | | Change-Id: I5d5e5a7a18cafdbe845fa1ef949276bdfd1996d3
* | New useragent switcher designJohn Reck2011-06-076-65/+61
|/ | | | | | Uses a popup menu off of the globe on tablets or favicon on phones Change-Id: Ia3634b5a218456127abb8b266a6cfc664836b037
* Add freeze tab menu optionJohn Reck2011-06-041-0/+23
| | | | | | Adds a freeze tab menu option hidden behind about:debug for now. Change-Id: I1b321de6a5dbcb13e87f6e658439f727970b0e4f
* 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
* | use webview proxy in nav screenMichael Kolb2011-06-014-62/+95
| | | | | | | | Change-Id: If5c914dfad48cd4b13cd5fe81374e8adc35060f9
* | calculate scroller paddingMichael Kolb2011-05-312-29/+52
|/ | | | 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-276-167/+2025
|\
| * long axis scrolling for nav screenMichael Kolb2011-05-276-167/+2025
| | | | | | | | | | | | | | | | | | also: fix combo view navscreen overlap fix menu key handling adjust screenshot capture size Change-Id: Ia0c920ed40e7d97d5902d98b85830817b9de6506
* | Merge "Bookmark drop CAB"John Reck2011-05-273-40/+169
|\ \
| * | Bookmark drop CABJohn Reck2011-05-273-40/+169
| | | | | | | | | | | | | | | | | | 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-264-686/+19
| | | | | | | | Change-Id: I7719c82a3a63d8ac8022e70e3a7f7b4a814e304f
* | Remove no longer needed sync settings/codeJohn Reck2011-05-265-109/+0
| | | | | | | | | | | | | | Now that we support multiple accounts, remove a bunch of single-account management stuff Change-Id: I2ae60f0a510ace48e14c97763145d4e5dd523dd1
* | Configure bookmark widgetJohn Reck2011-05-266-55/+132
|/ | | | | | | 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-2510-342/+1860
| | | | | | use live webviews Change-Id: Ie787c76470e445548d358374f83f33a1b0b0b5cf
* Merge "Help dialog for useragent switcher lab"John Reck2011-05-241-5/+26
|\
| * Help dialog for useragent switcher labJohn Reck2011-05-241-5/+26
| | | | | | | | 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
* Initial implementation of the useragent switcherJohn Reck2011-05-233-4/+78
| | | | Change-Id: Iaa8262a678902645dbfaa8a53fe7212af7d9d53c
* Replace hack with new framework supportJohn Reck2011-05-191-9/+4
| | | | Change-Id: I62abc855fd4db18e17415c86e9b791b1710abd2f
* Workaround to get smooth scroll on group expandJohn Reck2011-05-191-4/+9
| | | | | | | Get smooth scrolling on group expand in bookmark grid working. Change-Id: I5ce9dd7a2c9b16725df8fd723b0fa39408ebec61
* Initial bookmark drag & dropJohn Reck2011-05-183-6/+170
| | | | | | | Currently can only re-parent (drop into folders, between accounts) Has no visual feedback yet either Change-Id: If02c32a98a836c4567f274f1cb1654a25f469b0f
* Merge "Transfer data from BP1 to BP2"John Reck2011-05-185-8/+87
|\
| * Transfer data from BP1 to BP2John Reck2011-05-185-8/+87
| | | | | | | | | | | | Also move BP1 to provider package Change-Id: I082df8f675d32e2b9072914eab4ee1d50543e169
* | am 26493801: am 5358c83a: Merge "adjust tab width for screen size" into ↵Michael Kolb2011-05-182-5/+32
|\ \ | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '2649380163039804809d38612e490f02dd14f169': adjust tab width for screen size
| * \ Merge "adjust tab width for screen size" into honeycomb-mr2Michael Kolb2011-05-172-5/+32
| |\ \
| | * | adjust tab width for screen sizeMichael Kolb2011-05-172-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4427112 make tabs smaller for portrait 7 inch screen Change-Id: I0e02e68b1bae1fe7e81f1a3a49911707de40903b
* | | | am ccdc7bbd: am 9fdd981a: Bookmark action bar fixJohn Reck2011-05-181-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'ccdc7bbd51dd5fe250a9ad27790bbbf974579b5a': Bookmark action bar fix
| * | Bookmark action bar fixJohn Reck2011-05-171-0/+1
| |/ | | | | | | | | | | | | | | | | Bug: 4425113 When the screen is less than 720dp wide (so 7" portrait) show only a star to add a bookmark instead of the star with text. Change-Id: Ie5c48e71f41458c466047ca23bf5d2f64a50f93d
* | resolved conflicts for merge of e619f1e5 to masterJohn Reck2011-05-183-9/+7
|\ \ | |/ | | | | Change-Id: I04de9e92a91cd66e848d37cbb07f7d36a4edba06
| * Merge "Use tablet UI for large" into honeycomb-mr2John Reck2011-05-173-8/+6
| |\
| | * Use tablet UI for largeJohn Reck2011-05-173-8/+6
| | | | | | | | | | | | | | | | | | Bug: 4443420 Change-Id: I51e85a75cc246e940374eca8eae43ddcd3898923
| * | DO NOT MERGE - Update and fix RLZ code:Ed Tam2011-05-166-129/+213
| |/ | | | | | | | | | | | | | | | | | | - 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: I505932656c68dca458283598c2f647e035f120d3
| * DO NOT MERGE - fix scroll bugMichael Kolb2011-05-054-46/+22
| | | | | | | | | | | | Bug 4262017 Change-Id: I0846a0336d23f6023ff23cae2ef598d40c52ecec
| * DO NOT MERGE fix focus bugMichael Kolb2011-04-071-1/+6
| | | | | | | | | | | | | | Bug: 4262017 adjust layout parameters to avoid scrolling while typing Change-Id: I54c21f8097a1fe43083902f72c35e43aa66166c9
* | Add provider support for moving between accountsJohn Reck2011-05-172-24/+91
| | | | | | | | | | | | | | Fix the provider to correctly handle the case where a bookmark is re-parented to a new account Change-Id: I3c4412cfe2fc73bbb7209cbd85b0b8e5249982c6
* | More preventing recursive foldersJohn Reck2011-05-131-1/+6
| | | | | | | | Change-Id: I0a7cb210b5e15962c06eaf0ebc83b1120c91e2a6
* | Merge "Prevent adding a folder to itself recursively"John Reck2011-05-131-1/+1
|\ \
| * | Prevent adding a folder to itself recursivelyJohn Reck2011-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Prevent the last used folder from being listed if the user is editing that folder. Otherwise it would try to set a folder's parent to itself, not cool Change-Id: Ia0578436f0c5270663d7908000139816bcfaf163
* | | Merge "Fix bug where wrong folder contents are loaded"John Reck2011-05-131-4/+13
|\ \ \
generated by cgit v1.1 at 2024-12-27 07:14:12 +0000