summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translations. DO NOT MERGEEric Fischer2011-03-071-6/+6
| | | | Change-Id: I4da85e1d95a2187b61ad6259066453316dcd9b16
* Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1Eric Fischer2011-03-042-13/+13
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-03-042-13/+13
| | | | | | | | Change-Id: I3ef38068d210bc07c5bd49e021e1ebc7b1046ca8
* | Merge "Add invalid id check to isValidParent" into honeycomb-mr1John Reck2011-03-041-0/+3
|\ \
| * | Add invalid id check to isValidParentJohn Reck2011-03-041-0/+3
| |/ | | | | | | | | | | Bug: 3512786 Change-Id: I8f16038e230a24bcc50e4cc75d24f413d0166844
* | Guard against mSearchBox being null.Narayan Kamath2011-03-041-1/+5
|/ | | | | | | | Unlikely to be seen in practice, but discovered by monkey. Bug: 3510741 Change-Id: I64d9b5aca66e7c7023632dfd31a22764ecac8dd0
* fix NPE in instant suggestionsMichael Kolb2011-03-031-1/+3
| | | | | | | | Bug: 3510741 check for null searchbox which might be returned by change I256375b2 Change-Id: Ic40209f2c1ea9a87098ce11586b4fd92f9065559
* Merge "fix tab switching animation bug" into honeycomb-mr1Michael Kolb2011-03-032-1/+7
|\
| * fix tab switching animation bugMichael Kolb2011-03-032-1/+7
| | | | | | | | | | | | | | | | | | Bug: 3510200 block tab swicthing while animation is running this shouldn't affect users much, but prevent some monkey business Change-Id: I198d3572ec5c0b3170ee15355ab9edcfb20743d1
* | Merge "Fix isValidParent check" into honeycomb-mr1John Reck2011-03-035-9/+89
|\ \
| * | Fix isValidParent checkJohn Reck2011-03-035-9/+89
| |/ | | | | | | | | | | | | | | Bug: 3506038 Lookup the parent itself, not the children of the parent in isValidParent check. Also, adds testing to watch for regressions Change-Id: I59f00094f862f2e9cd4b4f9fd92d370b87e612e5
* | Merge "Make enter in home page dialog do the right thing" into honeycomb-mr1John Reck2011-03-031-1/+20
|\ \
| * | Make enter in home page dialog do the right thingJohn Reck2011-03-031-1/+20
| |/ | | | | | | | | | | Bug: 1204628 Change-Id: I4e12cd922f806b23c63292b159cd919ea4a259c1
* | Import revised translations. DO NOT MERGEEric Fischer2011-03-0341-146/+392
|/ | | | Change-Id: I2058f3fafe4fa4bdc25888dabfb64513814c32e6
* Merge "Use OriginalUrl instead of Url for history" into honeycomb-mr1John Reck2011-03-032-2/+9
|\
| * Use OriginalUrl instead of Url for historyJohn Reck2011-03-032-2/+9
| | | | | | | | | | | | Bug: 3500263 Change-Id: I8a0b795dcac28e016e8511aa856aa3e9a45d6a13
* | Switch facebook and amazon to generic bookmarkJohn Reck2011-03-031-2/+2
|/ | | | | | Bug: 3405719 Change-Id: I1cae0d6f43734c2e9012b9daf6a740a83d911cb6
* Merge "Implement the psychic search engine."Bjorn Bringert2011-03-0319-109/+708
|\
| * Implement the psychic search engine.Narayan Kamath2011-03-0219-109/+708
| | | | | | | | | | | | | | | | | | | | (a) Add a new subclass of SearchEngine that receives suggestions provided by psychic and displays them in the suggestions dropdown. (b) Add a Labs setting that can turn this feature on or off. Change-Id: Icae05b6b55f489278028e5af560d9b36014a0f59
* | Merge "Add autocomplete to the browser UrlInputView."Bjorn Bringert2011-03-038-23/+1936
|\ \ | |/
| * Add autocomplete to the browser UrlInputView.Narayan Kamath2011-03-028-23/+1936
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code and tests based on the google search app. A lot less code would be duplicated if we could somehow override AutoCompleteTextView but that is made impossible by it calling a bunch of stuff in its constructor. To do so would require changes to the existing API. I've verified that the unit test passes, but other browser tests appear to fail - even on a clean branch with none of my changes. Also fixes a minor bug in SearchEngines.getSearchableInfo( ). Change-Id: Ic61bc6b8fa27cd210a45dc181ebf15accf503244
* | am ca758ab0: (-s ours) am b9f57353: Import revised translations. DO NOT MERGEEric Fischer2011-03-020-0/+0
|\ \ | | | | | | | | | | | | * commit 'ca758ab0d131ca11ffc91d39255a9155ee657570': Import revised translations. DO NOT MERGE
| * \ am b9f57353: Import revised translations. DO NOT MERGEEric Fischer2011-03-021-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'b9f57353ac55dc107d6dc929319b91f35a7fba21': Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-03-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: Id8ee4145a9ff9f1da484c4e1a17eb4779a0028f8
* | | | add haptic feedback, fix QCMichael Kolb2011-03-028-31/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduced number of QC entries fixed qc behavior with new titlebar add haptic feedback to qc selection change qc rendering from flat paint to bitmap shader Change-Id: I4b89fea1aec7ce680147f663f2c22d0d369f4194
* | | | Merge "Only import bookmarks not associated with an account"John Reck2011-03-021-1/+2
|\ \ \ \
| * | | | Only import bookmarks not associated with an accountJohn Reck2011-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3501936 Change-Id: I3cd98d5e18d6085db1440655e4d90d65646c29b3
* | | | | Merge "fix another url bar icon bug"Michael Kolb2011-03-022-25/+12
|\ \ \ \ \
| * | | | | fix another url bar icon bugMichael Kolb2011-03-022-25/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3419951 Change-Id: I1d84dfb37d01f76829a5006861f649572d104c4f
* | | | | | Merge "add tab switch animations"Michael Kolb2011-03-024-28/+123
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add tab switch animationsMichael Kolb2011-03-024-28/+123
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3446585 Bug: 3281140 Cross fade between the current and the new tab Change-Id: I403e40b02e3f77806dc5ed3ebecd01afc508f68f
* | | | | am 92258825: (-s ours) am 26972c09: Import revised translations. DO NOT MERGEEric Fischer2011-03-020-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '9225882550cfb5862021c6ac4c612aeb162145dd': Import revised translations. DO NOT MERGE
| * | | am 26972c09: Import revised translations. DO NOT MERGEEric Fischer2011-03-012-10/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '26972c09dd044f299cfc4b0ffaafef8081fc576d': Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-03-012-10/+10
| | | | | | | | | | | | | | | | Change-Id: I1f277aca7bde97433304a060c774ca038ed6d533
* | | | Downloads from incognito tabs need to use the correct cookieKristian Monsen2011-03-022-12/+20
| | | | | | | | | | | | | | | | Change-Id: Iee012fe4a32dd51b8a59763b9ceab1e7dbde5246
* | | | Merge "Change "Save Web Archive" to "Save Page""John Reck2011-03-014-14/+17
|\ \ \ \
| * | | | Change "Save Web Archive" to "Save Page"John Reck2011-02-284-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3492152 If WebView fails to save the page as a web archive (which will happen if the page is not an (X)HTML document), instead of showing a failure toast we fall back to downloading the URL through download manager. Also changes the string "Save Web Archive" to "Save Page" and moves the menu option to be after "Share page". Change-Id: Ia4219075ae2585df865b58fa75ad24357150824f
* | | | | Merge "Make enter advance navigation or sign in"John Reck2011-03-013-78/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make enter advance navigation or sign inJohn Reck2011-02-283-78/+25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3487066 Also cleaned up the layout Change-Id: Iaa471ff8fcd793381cb98416493dcf707cbecc29
* | | | Merge "Adding AppWidget xml flag to make widget resizable"Adam Cohen2011-02-281-1/+2
|\ \ \ \
| * | | | Adding AppWidget xml flag to make widget resizableAdam Cohen2011-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4202402bdfab12a1217c55429f68fca33205bbf1
* | | | | Fix a timer issue when backing out of an app tab.Patrick Scott2011-02-281-13/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | The code was old and assumed that onPause would have an invalid tab and never pause timers. That is no longer the case. Bug: 3452002 Change-Id: I98cf6e368b4cf7db05975716d5c21960945d8950
* | | | Restart browser after "reset to default"John Reck2011-02-251-1/+7
|/ / / | | | | | | | | | | | | | | | Bug: 3483736 Change-Id: I9e83cb0ba9307163d75b8e48505f50e575800cc4
* | | Merge "disable zoom buttons on m-touch screen only"Michael Kolb2011-02-251-1/+4
|\ \ \
| * | | disable zoom buttons on m-touch screen onlyMichael Kolb2011-02-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3405875 check for multi-touch device support before disabling the on screen zoom buttons Change-Id: I3a057d2d06db1e77138eef1d8237802667796567
* | | | Fix back long press behaviorJohn Reck2011-02-242-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 3486271 Change-Id: I49eb218670b4082b1fcf6daaab025ec7e0be6b8c
* | | | Merge "Import revised translations."Eric Fischer2011-02-2441-3/+85
|\ \ \ \
| * | | | Import revised translations.Eric Fischer2011-02-2441-3/+85
| | | | | | | | | | | | | | | | | | | | Change-Id: If71618eb67ab7e3017c56e96ae497e39cdebbb86
* | | | | Merge "Make sure timers are running during pre-login."Patrick Scott2011-02-241-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make sure timers are running during pre-login.Patrick Scott2011-02-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pause/resume timers is really broken. If the user exits the Browser, the process is still around with paused timers. If pre-login needs to run, timers will be stalled during the process. This is because there is no current tab during onResume. Make sure to call resumeTimers and start the cookie sync manager before handling pre-login. Bug: 3474608 Change-Id: I12be617947f3ae54a206e31760a2973f81252f50