summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2014-01-17am dd873d25: am b3a20816: am 5f86f1d1: am e5188530: am 9f99f739: am ↵jb-mr2-devSelim Gurun
d2391b49: Further tighten the files that the browser can show * commit 'dd873d252fdf73f5c8c652b2a5e93c6d86cb462d': Further tighten the files that the browser can show
2014-01-17am b3a20816: am 5f86f1d1: am e5188530: am 9f99f739: am d2391b49: Further ↵Selim Gurun
tighten the files that the browser can show * commit 'b3a20816882efd44663dfef078b8d05fa7028dc3': Further tighten the files that the browser can show
2014-01-17am 9f99f739: am d2391b49: Further tighten the files that the browser can showjb-mr1-devSelim Gurun
* commit '9f99f739ccfb72f3e6a3c2e0ebb75b8922ed0b31': Further tighten the files that the browser can show
2014-01-17am d2391b49: Further tighten the files that the browser can showSelim Gurun
* commit 'd2391b492dec778452238bc6d9d549d56d41c107': Further tighten the files that the browser can show
2014-01-17Further tighten the files that the browser can showandroid-cts-4.1_r4jb-devSelim Gurun
Bug: 11516871 Change-Id: I46088ed5f668a484df33bb8458ebf687f1aa70d9
2014-01-16am 88408f25: am f7571625: am a36781e0: Merge "DO NOT MERGE Convert the ↵Selim Gurun
scheme to lowercase" into jb-mr1-dev * commit '88408f25fe49171b37781f879308fbdb970faa87': DO NOT MERGE Convert the scheme to lowercase
2014-01-16am 0bc1ffaa: Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-devSelim Gurun
* commit '0bc1ffaa383afaf88e9049a3610b2da90b9f0070': DO NOT MERGE Convert the scheme to lowercase
2014-01-16Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-mr2-devSelim Gurun
2014-01-16Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-mr1-devSelim Gurun
2014-01-16Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-devSelim Gurun
2014-01-16am e3e09d43: am dea3d2ad: am 81cb07dc: am f8c18437: am 699496ca: am ↵Selim Gurun
6243e7cb: Restrict loading private browser files * commit 'e3e09d431c7ccfd6cda66bdd7df4845e13787c35': Restrict loading private browser files
2014-01-15am dea3d2ad: am 81cb07dc: am f8c18437: am 699496ca: am 6243e7cb: Restrict ↵Selim Gurun
loading private browser files * commit 'dea3d2ad90052a3828b2eb581354210430d103f4': Restrict loading private browser files
2014-01-15am 699496ca: am 6243e7cb: Restrict loading private browser filesSelim Gurun
* commit '699496ca7b8bc7ef2727a6681eb95aa8ac78e59b': Restrict loading private browser files
2014-01-15am 6243e7cb: Restrict loading private browser filesSelim Gurun
* commit '6243e7cb0eb836af28b23a2e00d89627b90496e4': Restrict loading private browser files
2014-01-16DO NOT MERGE Convert the scheme to lowercaseSelim Gurun
Bug: 9793586 This is to fix a bug in I8f6f03b05556ee4d6846c15752de9be54c003060. Change-Id: I643fb1b0730e1e6b391c9c5af69cf7b86cbcdfe5
2014-01-16DO NOT MERGE Convert the scheme to lowercaseSelim Gurun
Bug: 9793586 This is to fix a bug in I8f6f03b05556ee4d6846c15752de9be54c003060. Change-Id: I643fb1b0730e1e6b391c9c5af69cf7b86cbcdfe5
2014-01-15DO NOT MERGE Convert the scheme to lowercaseSelim Gurun
Bug: 9793586 This is to fix a bug in I8f6f03b05556ee4d6846c15752de9be54c003060. Change-Id: I643fb1b0730e1e6b391c9c5af69cf7b86cbcdfe5
2014-01-15Restrict loading private browser filesSelim Gurun
Bug:11516871 Change-Id: I6a717a157f3d29edfffc36dc2da45c6df30d6ccd
2014-01-15am 40c2b93e: am d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents ↵Selim Gurun
request viewing private browser files * commit '40c2b93ef0128756bd1a3bb1d471ab515a181404': DO NOT MERGE Do not let intents request viewing private browser files
2014-01-15am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun
files * commit '7719d6ca3fd4079add8a9648838d99244a237eaf': DO NOT MERGE Do not let intents request viewing private browser files
2014-01-11DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun
Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
2014-01-11DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun
Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
2014-01-11DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun
Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
2012-12-17De-classicify BrowserJonathan Dixon
Removes the hard run-time dependency on WebViewClassic. (Still needs visisbility of it to build though) This is needed to enable chromium webview testing. Change-Id: I290b6b23b2eac525537ebc3ef8007d681a67a169
2012-10-05am 571866cd: Merge "Make locale safe paths"John Reck
* commit '571866cd42918d9227db8424667c585b8f9fdf94': Make locale safe paths
2012-10-05Make locale safe pathsJohan Redestig
getTarget was using SimpleDateFormat with the default locale to create paths. In some locales this resulted in characters that are not safe to use on all file systems. Explicitly use Locale.US to be locale safe. Change-Id: Id0d994231fa82d5695e7b0fdbae32333b9e77a6e
2012-09-21Add content description for folder upJohn Reck
Bug: 6940202 Change-Id: I6b8c53285606fdcf6495a4ccf3c94a2037c8979b
2012-09-18am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"John Reck
* commit '81cb2d1800a0a0aced83225f7f923b0809211001': Don't replace file extension when mime-type is incorrect
2012-09-14Don't replace file extension when mime-type is incorrectMagnus Hallqvist
When downloading content from a server that claims content to be text/plain or application/octet-stream a guess is made of the proper mime-type from a possible "file-extension" in the URL. When creating the filename of the downloaded content any file extension that does not match the mime-type is replaced with one derived from the mime-type (.txt for text/plain, none for application/octet-stream). However the guessed mime-type is not used in the filename creation, so content with a proper file extension but a text/plain mime-type will have its file extension replaced with .txt derived from the incorrect mime-type. This fix will use the guessed mime-type when creating the filename to avoid replacing a correct file extension. Change-Id: I5df642e94948914708af99a4d902b253ac8a48dd
2012-09-13am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"John Reck
* commit 'b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e': BrowserSettings required a Controller sometimes
2012-09-13BrowserSettings required a Controller sometimesMagnus Hallqvist
BrowserSettings can be used without a browser Controller, e.g. when accessed from system settings. But some null checks for this case were missing, these have now been added. Change-Id: I57762898d34ef3018569e0de1499be2922dabded
2012-09-11Deleted code that relies on defunct SearchBox interface.Selim Gurun
Change-Id: I831890524acb4e38078053d504c3ada468eca686
2012-09-06am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"John Reck
* commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084': Added catch of SQLiteException when updating screenshot
2012-09-06Added catch of SQLiteException when updating screenshotMattias Nilsson
Error found when running Monkey test. User probably tries to add a bookmark and directly after deleting it. The method updateScreenshot is running an AsyncTask and gets an Exception from the database when the bookmark does not exist. The deletion of the bookmark runs in another thread. Change-Id: I63bb954419f60fb5106c1a6597692b6bac925714
2012-09-05am 1fce2b5d: Merge "Reset to default did not reset cached settings"John Reck
* commit '1fce2b5dc32712cb5c6e301844a736da5d4aa848': Reset to default did not reset cached settings
2012-09-05Reset to default did not reset cached settingsBjörn Isaksson
Some settings such as the current search engine to use was cached in the BrowserSetting object and not always read from shared preferences. When settings were reset to default these cached values were not reset causing the old (possibly non-default) value to still be used. Change-Id: I805a339a6238c96dc73cbda47981053bd4f6eace
2012-09-04Merge "Use a fixed title bar if accessibility is enabled" into jb-mr1-devJohn Reck
2012-09-04Use a fixed title bar if accessibility is enabledJohn Reck
Bug: 6940152 Change-Id: Id6f694d8334a7c50f2e6f6c481bbb3cff847860f
2012-09-04am 922afab3: Merge "No search pane while tapping search button after backing ↵John Reck
to "windows" view from "saved page" view." * commit '922afab3f6044ff38c78d1d991c74ca003f90302': No search pane while tapping search button after backing to "windows" view from "saved page" view.
2012-09-04am cf00c263: Merge "Pause WebView timer when Browser is paused"John Reck
* commit 'cf00c263557e1bd8ba060938cf8a451f2b92af2c': Pause WebView timer when Browser is paused
2012-09-04Merge "No search pane while tapping search button after backing to "windows" ↵John Reck
view from "saved page" view."
2012-09-04Merge "Pause WebView timer when Browser is paused"John Reck
2012-09-04resolved conflicts for merge of 0570344a to jb-mr1-devJean-Baptiste Queru
Change-Id: I5853a3609caacf7b0ff0eecbb1ed697811b7430e
2012-09-03Pass webview's useragent when downloading via context menuAndreas Sandblad
Currently null is passed as useragent to the Download Manager when downloading via Browser context menu (causes the Download Provider to use an empty useragent HTTP header). This commit simply passes the webview's useragent instead. This applies to the usecase when choosing save image/link via the context menu (long press). Change-Id: Ie9cc5e81630d0dcefe4708980146cc5ed867e4ad
2012-09-03Pause WebView timer when Browser is pausedMattias Falk
If the Browser is paused while loading a page it shall finish loading the page before the WebView timer is paused. The WebView timer shall be paused in onProgressChanged when the progress has reached 100 not from onPageFinished since onPageFinished is called when the main frame is loaded and at that time subframe and other resources might haven't been finished loaded i.e. the page is still in load, which the result in WebView timers are not paused. With this patch the Browser won't consume system resources if it's minimized while doing a page load. Change-Id: Id971dbcedfbedb5b0e56cba4076cd724d590ac85
2012-08-29Pass referer on download requestsSelim Gurun
Bug: 6662557 Change-Id: Ib7fdc4b3f1e0f7370631d8a222565faaee550bfb
2012-08-21No search pane while tapping search button after backing to "windows" view ↵yijunx.zhu
from "saved page" view. When NavScreen is showing, the active tab should be detached normally, but tab is reattached after backing to NavScreen from other activity. Do the detach again. Change-Id: I1b30791285a0ff08c69924d74a0f1660212995f2 Author: Weiwei Ji <weiweix.ji@intel.com> Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 28528
2012-08-14am d9001a7d: Merge "NPE in WallpaperHandler"Jean-Baptiste Queru
* commit 'd9001a7dc5854d5dfc24a5ead19ad8c05acf171e': NPE in WallpaperHandler
2012-08-14Merge "NPE in WallpaperHandler"Jean-Baptiste Queru
2012-08-14am edc9e064: Merge "Browser: Use ICS alert icon"Jean-Baptiste Queru
* commit 'edc9e064969b97fd62f492ef8e15812b63af2bb3': Browser: Use ICS alert icon
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 20:15:51 +0000