summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Transfer data from BP1 to BP2"John Reck2011-05-186-8/+88
|\
| * Transfer data from BP1 to BP2John Reck2011-05-186-8/+88
| | | | | | | | | | | | Also move BP1 to provider package Change-Id: I082df8f675d32e2b9072914eab4ee1d50543e169
* | Merge "Fit 3 bookmark columns in phone portrait"John Reck2011-05-185-5/+8
|\ \
| * | Fit 3 bookmark columns in phone portraitJohn Reck2011-05-185-5/+8
| |/ | | | | | | Change-Id: I5fb01bd8ea7e544388e5f6377c0d95a1846fbb1a
* | am 424ff36f: (-s ours) am d790972a: Merge "DO NOT MERGE Adjust padding in ↵John Reck2011-05-180-0/+0
|\ \ | | | | | | | | | | | | | | | | | | bookmark grid view" into honeycomb-mr2 * commit '424ff36ff6c91a4c391fe70c6709b956817856b5': DO NOT MERGE Adjust padding in bookmark grid view
| * \ am d790972a: Merge "DO NOT MERGE Adjust padding in bookmark grid view" into ↵John Reck2011-05-172-2/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'd790972ad28858f262cb946d90da9fdd8459504a': DO NOT MERGE Adjust padding in bookmark grid view
| | * \ Merge "DO NOT MERGE Adjust padding in bookmark grid view" into honeycomb-mr2John Reck2011-05-172-2/+18
| | |\ \
| | | * | DO NOT MERGE Adjust padding in bookmark grid viewJohn Reck2011-05-172-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4425113 Change-Id: I3fea171d7d8e89f9e83884786ce6e098fcb4b9e7
* | | | | am 26493801: am 5358c83a: Merge "adjust tab width for screen size" into ↵Michael Kolb2011-05-184-7/+53
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '2649380163039804809d38612e490f02dd14f169': adjust tab width for screen size
| * | | | am 5358c83a: Merge "adjust tab width for screen size" into honeycomb-mr2Michael Kolb2011-05-174-7/+53
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '5358c83ad55b76062a032d7f0b3a79c863433e78': adjust tab width for screen size
| | * | | Merge "adjust tab width for screen size" into honeycomb-mr2Michael Kolb2011-05-174-7/+53
| | |\ \ \
| | | * | | adjust tab width for screen sizeMichael Kolb2011-05-174-7/+53
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4427112 make tabs smaller for portrait 7 inch screen Change-Id: I0e02e68b1bae1fe7e81f1a3a49911707de40903b
* | | | | am ccdc7bbd: am 9fdd981a: Bookmark action bar fixJohn Reck2011-05-183-1/+39
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * commit 'ccdc7bbd51dd5fe250a9ad27790bbbf974579b5a': Bookmark action bar fix
| * | | am 9fdd981a: Bookmark action bar fixJohn Reck2011-05-173-1/+39
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9fdd981a245b59952338374ba6a264742498fc4c': Bookmark action bar fix
| | * | Bookmark action bar fixJohn Reck2011-05-173-1/+39
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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-1811-9/+39
|\ \ \ | |/ / | | | | | | Change-Id: I04de9e92a91cd66e848d37cbb07f7d36a4edba06
| * | am 275932ff: Merge "Use tablet UI for large" into honeycomb-mr2John Reck2011-05-1712-8/+38
| |\ \ | | |/ | | | | | | | | | * commit '275932ff17bcb44712ef07a1e143c3f3b0d8df8a': Use tablet UI for large
| | * Merge "Use tablet UI for large" into honeycomb-mr2John Reck2011-05-1712-8/+38
| | |\
| | | * Use tablet UI for largeJohn Reck2011-05-1712-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4443420 Change-Id: I51e85a75cc246e940374eca8eae43ddcd3898923
* | | | am 43edbab2: (-s ours) am a94de4fc: DO NOT MERGE - Update and fix RLZ code: ↵Ed Tam2011-05-180-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 '43edbab25ab674a62dd841001d03dedb9ee55818': DO NOT MERGE - Update and fix RLZ code: - 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 a94de4fc: DO NOT MERGE - Update and fix RLZ code: - Cache RLZ parameter ↵Ed Tam2011-05-177-129/+218
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | - 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 'a94de4fc1f36aa329690519fa87d2f5a785ad8e7': DO NOT MERGE - Update and fix RLZ code: - 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 - Update and fix RLZ code:Ed Tam2011-05-167-129/+218
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Import revised translations.Eric Fischer2011-05-1741-4/+162
| | | | | | | | | | | | Change-Id: I2a4081bd42233a83ea066f678679cf23bb0281d0
* | | 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
* | | am e4e3d9c4: (-s ours) am 27f72f5f: DO NOT MERGE: from master -- Don\'t ↵Dianne Hackborn2011-05-160-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | restart when screen size changes. * commit 'e4e3d9c4b74a73fa5962c65ea5ca5c580ed53fd7': DO NOT MERGE: from master -- Don't restart when screen size changes.
| * | am 27f72f5f: DO NOT MERGE: from master -- Don\'t restart when screen size ↵Dianne Hackborn2011-05-161-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | changes. * commit '27f72f5f8f8db7eaa68683b95c1a7aeeb16ce979': DO NOT MERGE: from master -- Don't restart when screen size changes.
| | * DO NOT MERGE: from master -- Don't restart when screen size changes.Dianne Hackborn2011-05-131-2/+2
| | | | | | | | | | | | Change-Id: I8d09d29d5515f802bafa23775391e4f524e4c210
* | | 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
|\ \ \ \
| * | | | Fix bug where wrong folder contents are loadedJohn Reck2011-05-131-4/+13
| |/ / / | | | | | | | | | | | | Change-Id: Ie8d6fcf7161bbcdc51462821bbb54653bd6531b0
* | | | Remove account adding from getBookmarksUriJohn Reck2011-05-132-5/+2
|/ / / | | | | | | | | | | | | | | | Omnibox now searches all accounts Change-Id: I8b4fbed5efd420f787648340e8c1e9d82d60b24c
* | | Merge "Make add/edit bookmark be account-aware"John Reck2011-05-137-336/+367
|\ \ \
| * | | Make add/edit bookmark be account-awareJohn Reck2011-05-137-336/+367
| | | | | | | | | | | | | | | | Change-Id: I5e4e489d891adace7f76b4c4534a2203119dface
* | | | Merge "introduce tab IDs"Michael Kolb2011-05-1211-198/+186
|\ \ \ \
| * | | | introduce tab IDsMichael Kolb2011-05-1211-198/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tabs are identified by IDs now, instead of their position Refactored the save/restore code Change-Id: I7133d55831201d097dc19ec938a85e7085f36749
* | | | | Strip text2_urlJohn Reck2011-05-112-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4387881 Change-Id: I624db23a1181b5f8d8c7fe1a42916f6616655309
* | | | | Merge "Create accounts view"John Reck2011-05-111-5/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Create accounts viewJohn Reck2011-05-111-5/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: I2eb3c3566a74f208c02f1419ffa12d51619b83ef
* | | | | am 9b561605: (-s ours) am ed8c96a0: am b70882c8: (-s ours) Import revised ↵Eric Fischer2011-05-110-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '9b561605dd2020dd61a60a123e9445f5830d6d20': Import revised translations. DO NOT MERGE
| * | | | am ed8c96a0: am b70882c8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-05-100-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'ed8c96a0e90d54c02d1a25350921b9098b6f4eca': Import revised translations. DO NOT MERGE
| | * | | am b70882c8: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-05-100-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b70882c80d3375795a66e82662410b6e980b69cf': Import revised translations. DO NOT MERGE
| | | * | | Import revised translations. DO NOT MERGEEric Fischer2011-04-294-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8f351bb45beb088ada4b80516e27b425a1075bc
* | | | | | am 40219c5d: (-s ours) am 237d9b29: Import revised translations. DO NOT MERGEEric Fischer2011-05-110-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * commit '40219c5da3edc461c05c87086cb0f5e56a7fbe4d': Import revised translations. DO NOT MERGE
| * | | | am 237d9b29: Import revised translations. DO NOT MERGEEric Fischer2011-05-105-10/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '237d9b296bdda176d69b67276da6d542df37e4db': Import revised translations. DO NOT MERGE
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-05-095-10/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I0e6af07aa27cd9877888b2cc84a3e9f87c8e6ca4
* | | | | Merge "Import revised translations."Eric Fischer2011-05-1040-334/+182
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Import revised translations.Eric Fischer2011-05-1040-334/+182
| | | | | | | | | | | | | | | | | | | | Change-Id: I1f6a6c7ac758103e390c69cb209d4f6f4d314f8d
* | | | | Merge "Initial pass at collapsable bookmarks"John Reck2011-05-1017-256/+795
|\ \ \ \ \
generated by cgit v1.1 at 2024-12-24 00:28:26 +0000