summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-02-091-1/+1
| | | | Change-Id: I48559928acf98e2bb0bdc1f9f8a8598b99f33565
* Merge "Temporarily disable saved pages for Skia update"Derek Sollenberger2012-02-072-2/+3
|\
| * Temporarily disable saved pages for Skia updateJohn Reck2012-01-262-2/+3
| | | | | | | | Change-Id: I931def1d52eb792f8ada99946b0c419936e01771
* | Fix mMenuIsDown trackingJohn Reck2012-02-031-6/+10
| | | | | | | | Change-Id: I4aeb1f420c885181dc6016e317c2e716876db549
* | am afbbe46b: am 66f52a59: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ | | | | | | | | | * commit 'afbbe46b9f6a46200b0e6518f0450b20e1a7dbac':
| * \ am 66f52a59: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ | | | | | | | | | | | | * commit '66f52a594febd5cf37ef38b3150b85b69e990a9f':
| | * \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I2bb89486e3d25b681063532b5a76a501ddcdc392
* | | | | Import translations. DO NOT MERGEEric Fischer2012-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic65cb634ca59a2f2ac029888306d8390ffcde026
* | | | | Import translations. DO NOT MERGEEric Fischer2012-01-2611-127/+185
| | | | | | | | | | | | | | | | | | | | Change-Id: I2bbd5102102b108f51a735360f9f9e7c654f5f0b
* | | | | Update Browser for improved NDEF API's.Nick Pelly2012-01-251-3/+8
| |_|_|/ |/| | | | | | | | | | | Change-Id: I4a9430d118fd18d40a17490a10b5fbb723b36ca2
* | | | Enforce most visited limitJohn Reck2012-01-231-2/+7
| | | | | | | | | | | | | | | | Change-Id: If24a89703d74d359461c4c4c6c46449fd93d2be5
* | | | Fix quickcontrols after combo viewMichael Kolb2012-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5889443 Change-Id: Ifa3656610512e333739564a022c20323e3ace72f
* | | | Merge "Add a folder index view in debug mode"John Reck2012-01-173-2/+194
|\ \ \ \
| * | | | Add a folder index view in debug modeJohn Reck2012-01-173-2/+194
| | | | | | | | | | | | | | | | | | | | Change-Id: I67bb28d95cbe5ab6cf361271b46acc44398f188e
* | | | | fix popup window assetsMichael Kolb2012-01-171-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5541275 Change-Id: Id14e3b8781edfd05afc360a51521175e851b3c6b
* | | | | Merge "fix back key on tabs behavior"Michael Kolb2012-01-172-3/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix back key on tabs behaviorMichael Kolb2012-01-172-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5851422 5841282 don't restore back/forward list when re-creating a webview Change-Id: I4648ced38aafedb8e129f599f0ea28f7520da9b8
* | | | | Faster NTPJohn Reck2012-01-171-4/+23
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize the Most Visited NTP query. According to dumpsys dbinfo this speeds up the query from taking over a second to less than 100ms Change-Id: I00c86a5bcb66e126850434845350359f0e7279d5
* | | | Avoid ISEMichael Kolb2012-01-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5786209 Change-Id: I92321d8dfc2e2991a508e475d2353d5a6597156b
* | | | am 3efc82a6: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '3efc82a604951e062e3dd32893280042d6def78b':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-050-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I0c626aac7eaf78e51a657b4e71c406dda3556c37
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-040-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 0d4f452b: (-s ours) am 0ffa9713: DO NOT MERGE Fix generic filter checkJohn Reck2012-01-040-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0d4f452b9309be4c23b2b2fd8bff6b89ccaa52f7': DO NOT MERGE Fix generic filter check
| * | | am 0ffa9713: DO NOT MERGE Fix generic filter checkJohn Reck2012-01-041-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0ffa9713dc66c4b0db3027a1edab52c99a3af129': DO NOT MERGE Fix generic filter check
| | * | DO NOT MERGE Fix generic filter checkJohn Reck2012-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5768794 Cherry pick from master Change-Id: I7bace7a33fe1601039a5aacc5c3af7167d566a1d
* | | | Import revised translations.Eric Fischer2011-12-2947-103/+55
| | | | | | | | | | | | | | | | Change-Id: Ibc1c6e2603aa3022b94fdac3f28422e79737c3c4
* | | | am c40c9c23: Make static fields of WSF package-privateConley Owens2011-12-210-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c40c9c23bc3098307d8fd7524933724a1b8e29d5': Make static fields of WSF$Site package-private
| * | | Make static fields of WSF$Site package-privateConley Owens2011-12-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes a little more sense since they are accessed outside of the class that they are defined in. In addition, this fixes errors created by proguard when building with OpenJDK. Change-Id: I41d9bbb687628140038eb517ea08517cee37e0c7
* | | | Make static fields of WSF$Site package-privateConley Owens2011-12-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes a little more sense since they are accessed outside of the class that they are defined in. In addition, this fixes errors created by proguard when building with OpenJDK. Change-Id: I41d9bbb687628140038eb517ea08517cee37e0c7
* | | | fix anchor link url bar updatesMichael Kolb2011-12-162-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5621026 Allow onPageFinished to reach Controller for links with anchor tags Note that the bookmark thumbnail update won't overload the async task anymore, since only one update message is active at any given time (see bug: 4517571) Change-Id: Iaeb9950ef15446aa9c824c7196f26a748591c944
* | | | Shock the MonkeyMichael Kolb2011-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5731650 Change-Id: Icf2c3aba7f1146b1f78d191a807121dcbe3012ae
* | | | Another monkey NPEMichael Kolb2011-12-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5737769 Change-Id: Ie1a485222df6b470d95ace9130b5cf2591a231df
* | | | Merge "Make Ctl-Tab and Shift-Ctl-Tab cycle tabs"Michael Kolb2011-12-151-4/+10
|\ \ \ \
| * | | | Make Ctl-Tab and Shift-Ctl-Tab cycle tabsMichael Kolb2011-12-151-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5731975 Change-Id: I1dd44b25f718a2270d5965a8f3f5dab096398856
* | | | | fix tablet quickcontrols to not show titlebar during loadMichael Kolb2011-12-152-31/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | handle progress updates in tablet navbar Change-Id: I2398358537e6a244ae1873895bf4b5bb9e3ce8eb
* | | | Merge "fix monkey NPE"Michael Kolb2011-12-151-1/+3
|\ \ \ \
| * | | | fix monkey NPEMichael Kolb2011-12-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5372741 Change-Id: I9e7461371f1f801e33d890329f820b7440c6d865
* | | | | Merge "Fix generic filter check"John Reck2011-12-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix generic filter checkJohn Reck2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5768794 Change-Id: I72d98d1750232bfdedc88b2cbf3ff76c088e89d2
* | | | | Merge "fix navscreen animation"Michael Kolb2011-12-151-1/+1
|\ \ \ \ \
| * | | | | fix navscreen animationMichael Kolb2011-12-151-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent image from jumping when coming out of navscreen by using the visible title height as the target top. Note: there is still a little jump animating to the nav screen this will be fixed by a different CL Change-Id: Id85995e43253579754a8f214fb8596dcd77e7240
* | | | | Check current index in PieStackViewMichael Kolb2011-12-151-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 5569079 Change-Id: I5af1e37c1a73dcf94ae684ac5f2796db5a4ab3be
* | | | am e167320d: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit 'e167320d94d5a43719ca2fee72c085719a50cbd0':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: Ib4dad2fa74bba05f93b481dfc19efeca63245d78
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-130-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 462eda54: am 1e43249a: Revert "Add new default bookmark"John Reck2011-12-133-7/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '462eda547c86ca3994cb3a5033e89afa4fb32479': Revert "Add new default bookmark"
| * | | am 1e43249a: Revert "Add new default bookmark"John Reck2011-12-133-7/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1e43249af8df208486d890fc86ae45ab39045221': Revert "Add new default bookmark"
| | * | Revert "Add new default bookmark"John Reck2011-12-133-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5756732 This reverts commit 986991e05172aed5c46fd050e3a1a066b635ff9e Change-Id: Ia4f40130949aa35f273b9b983b21e5424183f73c
* | | | am 152c7479: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '152c74792b2ba22611bd4994bd9a7a2de1e97f76':
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-130-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I5fc50124aca3226913fd31a2f4c44f0ef4cd886c