summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Titlebar on phone UI update"Michael Kolb2011-07-065-93/+155
|\ \ \ | |/ / |/| |
| * | Titlebar on phone UI updateMichael Kolb2011-07-065-93/+155
| | | | | | | | | | | | | | | | | | | | | introduce new states for titlebar: normal, highlighted, editing, loading Change-Id: I8a6f88afc3457a07063aba40ef4d3e5f6c806b8f
* | | Merge "Use correct placeholder ID for certificate view"Brian Carlstrom2011-07-061-2/+2
|\ \ \ | |/ / |/| |
| * | Use correct placeholder ID for certificate viewBrian Carlstrom2011-07-061-2/+2
| | | | | | | | | | | | Change-Id: Iaab6edc54f6596b8cd225109d2105fbdef887c28
* | | Merge "Fix sourceid string for psychic."Narayan Kamath2011-07-061-1/+1
|\ \ \
| * | | Fix sourceid string for psychic.Narayan Kamath2011-07-021-1/+1
| |/ / | | | | | | | | | | | | bug:4268590 Change-Id: I355dab315e925d03fd6915e7cd2cf2b3b40dbe14
* | | Merge "Shortcut the TYPED url case"John Reck2011-07-064-9/+34
|\ \ \
| * | | Shortcut the TYPED url caseJohn Reck2011-07-014-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4985289 Don't go through the handleIntent route if the user typed something into the omnibox if we don't need to. Change-Id: I4de8e18c1ca734a0c6bfbca43c9448417cec2057
* | | | Merge "Temporarily show title bar on setActiveTab"John Reck2011-07-061-0/+11
|\ \ \ \
| * | | | Temporarily show title bar on setActiveTabJohn Reck2011-07-011-0/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 4988753 Change-Id: I59ea95c860bac6cbf33f5f4e3907a039e199430c
* | | | Merge "0-click NFC: check for private tab on UI thread."Martijn Coenen2011-07-061-11/+37
|\ \ \ \
| * | | | 0-click NFC: check for private tab on UI thread.Martijn Coenen2011-07-041-11/+37
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | A recent change to Webview broke our code - we're no longer allowed to call isPrivateBrowsingEnabled() from a non-UI-thread. Moved the code in an AsyncTask to address this. Change-Id: I69a5ea539dc1578bfbacbc67c996e28870743870
* | | | Add tab to tab bar when rendering a preloaded one.Mathew Inwood2011-07-041-0/+1
|/ / / | | | | | | | | | | | | | | | Previously, no tab was present in the tab bar on tablet. Change-Id: Id9ac1e77c50acf3a695a4da028b397394b51d9ec
* | | remove url bar indicator from tabsMichael Kolb2011-07-016-169/+3
|/ / | | | | | | | | | | Bug: 4987410 Change-Id: If7105b4fc8e6d34712a59c4e775925d959a5ee6e
* | Saved Pages tabJohn Reck2011-07-0117-157/+509
| | | | | | | | | | | | | | | | | | | | Bug: 4982126 Add saved pages tab Remove "save page" menu option Add "save for offline reading" menu option Smooth animation to combo view Change-Id: Ia67552a6f6a5474a6dfcff6790a341d4d36d5a77
* | Merge "Preloading support in browser"Michael Kolb2011-07-0121-98/+727
|\ \
| * | Preloading support in browserMichael Kolb2011-06-3021-98/+727
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps like the QSB can request the browser to preload a web page. - preloaded pages are not added to the browser history if they'r not seen by the user - when a request is received, a new tab is created for the preloaded page, but not added to the tab list - upon receiving the view intent for the preloaded page the tab is added to the tab list, and shown - if several pages are preloaded consecutively in the same tab, the back stack is cleared before it is displayed - preloaded pages use the main browser cookie jar, so pages that have never been viewed by the user can drop cookies Change-Id: I9ed21f2c9560fda0ed042b460b73bb33988a2e8a
* | | Merge "Fix AsyncTask"John Reck2011-06-301-0/+3
|\ \ \
| * | | Fix AsyncTaskJohn Reck2011-06-301-0/+3
| |/ / | | | | | | | | | Change-Id: I5af7e028c2e8fffb2c21453864c90e030df25312
* | | Merge "Update geolocation prompt"John Reck2011-06-307-93/+75
|\ \ \
| * | | Update geolocation promptJohn Reck2011-06-307-93/+75
| |/ / | | | | | | | | | | | | | | | | | | Bug: 4975201 Cleanup and Holo'd Change-Id: Ia4c31f411fa6fd2f3fd05ce92f4f4b8592cc3520
* | | Merge "Fix 0-click from the browser."Jeff Hamilton2011-06-301-2/+1
|\ \ \ | |/ / |/| |
| * | Fix 0-click from the browser.Jeff Hamilton2011-06-301-2/+1
| | | | | | | | | | | | Change-Id: I48bdaa9b908e7890dc9cb0b4ad67724fd95d6d77
* | | Merge "Always trigger URL bar on scroll down gesture"John Reck2011-06-303-31/+39
|\ \ \ | |/ / |/| |
| * | Always trigger URL bar on scroll down gestureJohn Reck2011-06-293-31/+39
| | | | | | | | | | | | | | | | | | | | | Bug: 4976168 Prevent websites from preventing the URL bar gesture Change-Id: Id9d01c93267ff4376c89503b39945ae003e7d5bf
* | | Remove unused layoutJohn Reck2011-06-291-39/+0
|/ / | | | | | | Change-Id: Iae41528fd6b8f2e51e586a34176d702edefab7c2
* | Add a tab switcher button to phonesJohn Reck2011-06-292-0/+11
| | | | | | | | | | | | Bug: 4976834 Change-Id: I65477157ef3caed2b064e60fa1e8f701f6537535
* | Always automatically restoreJohn Reck2011-06-291-4/+11
|/ | | | | | Bug: 4904409 Change-Id: I07406481e3870c09546b0264ed10e5a7bd6cae68
* Merge "Fix IntentHandler behavior"John Reck2011-06-296-56/+221
|\
| * Fix IntentHandler behaviorJohn Reck2011-06-296-56/+221
| | | | | | | | | | | | | | Bug: 4473779 Plus, TESTS! Huzzah! Change-Id: I043e100d99d4653b7fb7885217d7fb305930a137
* | Merge "Fix wrong thread issue"John Reck2011-06-291-3/+6
|\ \
| * | Fix wrong thread issueJohn Reck2011-06-291-3/+6
| |/ | | | | | | | | | | Bug: 4971133 Change-Id: I40ecdf4ff6c27d3eb9f4f55360552030b215913f
* | Fix (workaround?) for NPE when showing a preloaded tab.Mathew Inwood2011-06-291-2/+2
| | | | | | | | Change-Id: I4a12d40da7ad12d4f9f3c27e75fc4e07d0c1af62
* | 2nd try: Shows the right URL that has a cert error.Huahui Wu2011-06-282-10/+18
| | | | | | | | | | | | | | Identical to https://android-git.corp.google.com/g/#change,117835 which was reverted since its collaborative CL broke the build. Change-Id: Ic0344bd30895700692fbf7cec84666567133e103
* | Merge "Revert "Shows the right URL that has a cert error.""Huahui Wu2011-06-282-18/+10
|\ \
| * | Revert "Shows the right URL that has a cert error."Huahui Wu2011-06-282-18/+10
| | | | | | | | | | | | This reverts commit db6ff8999159f386ea8a99d980ce533b717fca78.
* | | Merge "Shows the right URL that has a cert error."Huahui Wu2011-06-282-10/+18
|\ \ \ | |/ / | | / | |/ |/|
| * Shows the right URL that has a cert error.Huahui Wu2011-06-272-10/+18
| | | | | | | | | | | | | | | | | | | | b/2689122 SSL error shows the wrong page when triggered by an image/javascript in the page This CL receives the URL which has a invalid cert from framework and shows it in related dialogues. Related CLs are: webkit: https://android-git.corp.google.com/g/#change,117817 framework: https://android-git.corp.google.com/g/#change,117828 Change-Id: I9b243b73b9cce19d94cc71608207219bfa687db2
* | Merge "Prevent duplicates in omnibox"John Reck2011-06-272-2/+8
|\ \
| * | Prevent duplicates in omniboxJohn Reck2011-06-272-2/+8
| | | | | | | | | | | | Change-Id: Idf91591a981543fb84a73d08e3c5bbc2c7d23d6f
* | | Merge "Fix tests"John Reck2011-06-271-0/+1
|\ \ \
| * | | Fix testsJohn Reck2011-06-271-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Bug: 4771193 Fix bug where data URL was stripped instead of just text2 Change-Id: I93ebcdd3a7ef4106dbdeda0ea16773ac919b3cb2
* | | Merge "Move most visited to set homepage"John Reck2011-06-279-177/+171
|\ \ \
| * | | Move most visited to set homepageJohn Reck2011-06-279-177/+171
| |/ / | | | | | | | | | | | | | | | Bug: 4770245 Change-Id: If47b2f308ab3cd4b58dbcbf3a28cdb341481a885
* | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-270-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I8e511e60b49a5046ca8262ed6a1fc1550dc92841
| * | | DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-241-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4770356 Change-Id: I436d97f0c41fedec16891c92bf283654354b0a29
* | | | Merge "Moving ssl_certificate layout, resources, and helper code to ↵Brian Carlstrom2011-06-2746-996/+10
|\ \ \ \ | |_|/ / |/| | | | | | | SslCertificate"
| * | | Moving ssl_certificate layout, resources, and helper code to SslCertificateBrian Carlstrom2011-06-2746-996/+10
| | | | | | | | | | | | | | | | Change-Id: I5b81cde261fb0234616bc08566af9ad4ef94325b
* | | | Merge "Attempt to automatically restore after crash"John Reck2011-06-271-4/+43
|\ \ \ \
| * | | | Attempt to automatically restore after crashJohn Reck2011-06-241-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a timestamp based approach to determine if we should automatically restore or prompt the user Change-Id: I4b8d1d76e0dfc02879f3708241cb78ff1673a57c
generated by cgit v1.1 at 2025-01-12 13:51:55 +0000