summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add Monkey protectionMichael Kolb2011-11-071-1/+3
| | | | | | Bug: 5577443 Change-Id: I61f59ec5e65de0b59890804f2fb0eb7ab182326d
* Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-040-0/+0
|\ | | | | | | Change-Id: I8ec1540b94c648ec188ca4eab41ff3d631e0876b
| * merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-030-0/+0
| |\
* | \ am b8ce8635: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-030-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'b8ce86358b5fe6d1af6feaeab51da63c5ad0669b': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-022-3/+3
| | | | | | | | | | | | Change-Id: Idec39f99d7c0f816e4b6b024d2c1795d70e459b0
* | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-0123-43/+802
|\ \ \
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-0123-43/+802
| | | | | | | | | | | | | | | | Change-Id: I40e90d5320fa59c7bdc84a5910826344241f1bb0
* | | | Merge "Switch Tab to DataController" into ics-mr1John Reck2011-11-012-81/+95
|\ \ \ \
| * | | | Switch Tab to DataControllerJohn Reck2011-10-312-81/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5544674 Change-Id: I24486c65c1cc1fbcf7abe95b74731b10918db82c
* | | | | Merge "Monkey proofing" into ics-mr1John Reck2011-10-311-13/+25
|\ \ \ \ \
| * | | | | Monkey proofingJohn Reck2011-10-311-13/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5531453 Change-Id: I0a8158212d8b2de638bae3c66bb2b9aa3bf85c1d
* | | | | Merge "Fix corner case with url pulldown" into ics-mr1John Reck2011-10-311-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix corner case with url pulldownJohn Reck2011-10-311-1/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5534329 The issue is that with 1px visible of the title bar the url pulldown code wouldn't trigger to prevent a janky animation. Detect whether or not the page is scrolling, and if it isn't then show the url bar even if it is partially visible Change-Id: I2e7771f0e08a7dc9a6d3968e2d5e1402b1a454fa
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Change-Id: Icfb81d16af9ed24eb0ede20cca7132a3793033c4
| * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-300-0/+0
| |\ \ | | |/ | |/|
* | | am 93e37c66: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-290-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '93e37c66afaefda56eb442b34c33002345a204ac': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-281-1/+1
| | | | | | | | | | | | Change-Id: I4df5011a7e18b4c76a16da045bb0c1c8ba0844f1
* | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2847-0/+94
|\ \ \
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2847-0/+94
| | | | | | | | | | | | | | | | Change-Id: I1eed72ddbdced686f5dce606c8f776a303089f23
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-280-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Icbaedae6eb7d861d2b240a636a8f1f173e891cd4
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-280-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-260-0/+0
| | |\ \
| | | * \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | | |\ \
| | | | * \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | | | |\ \
* | | | | \ \ Merge "Don't set the upload type unless in debug" into ics-mr1John Reck2011-10-281-6/+10
|\ \ \ \ \ \ \
| * | | | | | | Don't set the upload type unless in debugJohn Reck2011-10-271-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5529012 Reduce unnecessary JNI Change-Id: Ie1fc504bf8a159bf0ee5b26e89cb29b445ad7723
* | | | | | | | Merge "Updated help thumbnail asset" into ics-mr1John Reck2011-10-271-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated help thumbnail assetJohn Reck2011-10-271-0/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5479018 Change-Id: Ia77952747d95d8a3dd706896be16da73c2e2c049
* | | | | | | | Fix urlbar background on tabletMichael Kolb2011-10-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5506288 Bringing back the classic grey look from honeycomb to tablet Change-Id: Icaec6a0e4d648eabeea02968fbf55f859ec8e428
* | | | | | | | am 22e77ee7: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | * commit '22e77ee7620eb1f965b6b0b2cf3e30e16430b6c0': Import revised translations. DO NOT MERGE
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-274-12/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: Id5463f9860e3191189df4e5f0ac495931ffdcb90
* | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-274-12/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-264-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bc047d8fe7b9566844e0d34e5bed874926db272
* | | | | | Merge "Add new default bookmark" into ics-mr1John Reck2011-10-273-0/+7
|\ \ \ \ \ \
| * | | | | | Add new default bookmarkJohn Reck2011-10-263-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5479018 Change-Id: Iedb8cffcf35d5f1ba98ac34e0b724c4235cb7d38
* | | | | | | am 5cb45e38: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | * commit '5cb45e3871a4d10c9230d3de8d43a96ebed1d2d4': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-265-45/+45
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I6b1bd3148ce89dfb88a93c815c67b14a8a9245f6
* | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2614-98/+98
| |/ / / |/| | | | | | | | | | | Change-Id: Ifb74ac66d088f21e215406c99975c5139f619ab1
* | | | merge ics-mr0Ed Heyl2011-10-255-20/+42
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ifc31b8464766d17b2f46183cbe0e7309445b07dc
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-245-23/+23
| |/ / | | | | | | | | | Change-Id: Id0a01ecff491a0147ccb9cbab5ac8b45903b7481
| * | Merge "Use UTF-8 for font size preview" into ics-mr0John Reck2011-10-242-3/+25
| |\ \
| | * | Use UTF-8 for font size previewJohn Reck2011-10-212-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5489018 Apparantly ASCII isn't good enough Change-Id: I9402c7c3e1ceedc26822469b652166885a40d6e3
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-240-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I4539d65f411a9a9acf6eb998e9aa6d5b4e0a1368
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-210-0/+0
| | |\ \
| | | * \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-200-0/+0
| | | |\ \ | | | | |/ | | | |/|
* | | | | am 1eb7d122: Merge "Fix fullscreen mode" into ics-mr0Michael Kolb2011-10-211-5/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1eb7d1224fafa2c7f327c808cf6eec6269297493': Fix fullscreen mode
| * | | | Merge "Fix fullscreen mode" into ics-mr0Michael Kolb2011-10-211-5/+19
| |\ \ \ \
| | * | | | Fix fullscreen modeMichael Kolb2011-10-211-5/+19
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5494143 Set fullscreen flags on window hide system UI Change-Id: I38714fd3973d2ee0baca51eb89f0ca640cbab225
* | | | | am ad52bc77: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-210-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ad52bc77f967bcdad22b3e0de1b7518766bf1d3c': Import revised translations. DO NOT MERGE