summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | am 6d060463: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun2014-01-151-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files * commit '6d0604635e469298155da478a3ea53aaec0c109c': DO NOT MERGE Do not let intents request viewing private browser files
| | | * | | | | | | | DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun2014-01-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
| | * | | | | | | | | am 0d49e161: Fix exception in Browser SettingsJonathan Dixon2014-01-151-0/+15
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | _ / / / / / / / | | | / / / / / / / | | | | | | | | | | * commit '0d49e161632661fbe4b16fd174acf401dec42e7a': Fix exception in Browser Settings
| | * | | | | | | | Fix exception in Browser SettingsJonathan Dixon2013-10-221-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 11302175 Need to implement isValidFragment when targeting >= KK Change-Id: I19cc285aa237ffd9001558a9ee6adaf152acd1df
* | | | | | | | | | Do not let intents request viewing private browser filesSelim Gurun2014-01-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060
* | | | | | | | | | Update Browser to use TEXT_AUTOSIZINGJonathan Dixon2013-10-242-17/+11
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also enable Web Debugging conditionally based on the platform OS level (to document the best-practice, as much as anything else) Change-Id: Ib89c6e6250370c520ad0c571e6e5a166369f1f40
* | | | | | | | | am 90883e66: Merge "Browser freezes when adding new incognito tab after ↵John Reck2013-09-241-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | removing it" * commit '90883e666eb7675b9bc6d852cb732b65196781cf': Browser freezes when adding new incognito tab after removing it
| * | | | | | | Merge "Browser freezes when adding new incognito tab after removing it"John Reck2013-09-241-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Browser freezes when adding new incognito tab after removing itweiweix.ji2012-12-281-1/+2
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When do layout, the position of new tab may be changed since other tab closed, we need to get the position again at the time. Change-Id: Ia5bcc15a0074678f401d6b3e93026e5ef5d2af7d Author: weiweix.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: 66643
* | | | | | | Make web contents debugging always enabled (as in Chrome)Mikhail Naganov2013-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8691809 Change-Id: Icef9d796a99f3dbca2a4568d2f71e70bc6e91dd7
* | | | | | | De-classicify Android Browser part 2Jonathan Dixon2013-08-2522-1609/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10427705 Allows Browser to compile even when WebViewClassic is no longer in frameworks/base. The deleted functionality was already disabled at runtime when using non-classic webview. Change-Id: I21b58ec52ac059c699b49a2dd80008d9a9e6791a
* | | | | | | Merge "Fix the smart search pattern."Selim Gurun2013-07-091-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix the smart search pattern.Selim Gurun2013-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9592355 Change-Id: I1e3ff3f9f0a2038ea5d460e698dceaaa8be50707
* | | | | | | am 0905de39: Merge "NPE in bookmark grid when using mouse"John Reck2013-07-031-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0905de394983373bdc419c3d30b2969d5412d265': NPE in bookmark grid when using mouse
| * \ \ \ \ \ \ Merge "NPE in bookmark grid when using mouse"John Reck2013-07-031-4/+7
| |\ \ \ \ \ \ \
| | * | | | | | | NPE in bookmark grid when using mousePawel Bochenski2013-07-021-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a mouse and right clicking on an empty element element in the bookmark grid an NPE ocurrs. Patch fixes crash after click right button on the mouse in bookmark screen, by adding null pointer check. Change-Id: I07af747797411176e9fd9473eb2dbfe4404e58f5
* | | | | | | | | am 0505bfe1: Merge "Fixed delete function for bookmark folder"John Reck2013-07-021-1/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | * commit '0505bfe1aaa22f9ccb15907f3505c96194116815': Fixed delete function for bookmark folder
| * | | | | | | Fixed delete function for bookmark folderTakeshi Aimi2013-07-021-1/+53
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only folder is deleted when one deletes bookmark folder. Therefore, items inside in the folder are remained. We have to delete items recursively inside the folder. Change-Id: I17ad9656612448d8555a64ec887313db4f829174
* | | | | | | am 6fae8a98: Merge "Fix the problem that a crash occured when user turn off ↵John Reck2013-04-221-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data connect and download something in browser" * commit '6fae8a98d19492a44a63bcc2ae3863f33cf1a3df': Fix the problem that a crash occured when user turn off data connect and download something in browser
| * | | | | | Merge "Fix the problem that a crash occured when user turn off data connect ↵John Reck2013-04-231-2/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | and download something in browser"
| | * | | | | | Fix the problem that a crash occured when user turn off data connect and ↵annieyu2013-04-161-2/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | download something in browser When user turn off data connect in browser throught statusbar shortcut, the request object is null. It will be crush browser. Change-Id: Icdbd40618d221cc205e497e860a9508f4cd18741
* | | | | | | am 4d0bc158: Merge "Fix a Cursor leak"John Reck2013-04-031-4/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * commit '4d0bc1588f40efe5e2a3fa463c4820e0978a99c0': Fix a Cursor leak
| * | | | | Fix a Cursor leakmuzbit.kim2013-04-021-4/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When cursor is done, the cursor must be closed to avoid cursor leak. Change-Id: I44609478038ed3b5ea605eb9b3189fb28296a8e6
* | | | | De-classicify BrowserJonathan Dixon2012-12-1712-46/+104
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 571866cd: Merge "Make locale safe paths"John Reck2012-10-051-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * commit '571866cd42918d9227db8424667c585b8f9fdf94': Make locale safe paths
| * | | Make locale safe pathsJohan Redestig2012-10-051-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add content description for folder upJohn Reck2012-09-211-0/+2
| | | | | | | | | | | | | | | | | | Bug: 6940202 Change-Id: I6b8c53285606fdcf6495a4ccf3c94a2037c8979b
* | | am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"John Reck2012-09-181-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '81cb2d1800a0a0aced83225f7f923b0809211001': Don't replace file extension when mime-type is incorrect
| * | Don't replace file extension when mime-type is incorrectMagnus Hallqvist2012-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"John Reck2012-09-131-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e': BrowserSettings required a Controller sometimes
| * | BrowserSettings required a Controller sometimesMagnus Hallqvist2012-09-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Deleted code that relies on defunct SearchBox interface.Selim Gurun2012-09-111-70/+2
| | | | | | | | | | | | Change-Id: I831890524acb4e38078053d504c3ada468eca686
* | | am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"John Reck2012-09-061-0/+5
|\ \ \ | |/ / | | | | | | | | | * commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084': Added catch of SQLiteException when updating screenshot
| * | Added catch of SQLiteException when updating screenshotMattias Nilsson2012-09-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 1fce2b5d: Merge "Reset to default did not reset cached settings"John Reck2012-09-051-0/+5
|\ \ \ | |/ / | | | | | | | | | * commit '1fce2b5dc32712cb5c6e301844a736da5d4aa848': Reset to default did not reset cached settings
| * | Reset to default did not reset cached settingsBjörn Isaksson2012-09-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Use a fixed title bar if accessibility is enabled" into jb-mr1-devJohn Reck2012-09-042-0/+9
|\ \ \
| * | | Use a fixed title bar if accessibility is enabledJohn Reck2012-09-042-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6940152 Change-Id: Id6f694d8334a7c50f2e6f6c481bbb3cff847860f
* | | | am 922afab3: Merge "No search pane while tapping search button after backing ↵John Reck2012-09-041-0/+11
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 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.
| * | | Merge "No search pane while tapping search button after backing to "windows" ↵John Reck2012-09-041-0/+11
| |\ \ \ | | | | | | | | | | | | | | | view from "saved page" view."
| | * | | No search pane while tapping search button after backing to "windows" view ↵yijunx.zhu2012-08-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am cf00c263: Merge "Pause WebView timer when Browser is paused"John Reck2012-09-041-5/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'cf00c263557e1bd8ba060938cf8a451f2b92af2c': Pause WebView timer when Browser is paused
| * | | | Merge "Pause WebView timer when Browser is paused"John Reck2012-09-041-5/+4
| |\ \ \ \
| | * | | | Pause WebView timer when Browser is pausedMattias Falk2012-09-031-5/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | resolved conflicts for merge of 0570344a to jb-mr1-devJean-Baptiste Queru2012-09-041-7/+10
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | Change-Id: I5853a3609caacf7b0ff0eecbb1ed697811b7430e
| * | | Pass webview's useragent when downloading via context menuAndreas Sandblad2012-09-031-7/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Pass referer on download requestsSelim Gurun2012-08-295-18/+21
| | | | | | | | | | | | | | | Bug: 6662557 Change-Id: Ib7fdc4b3f1e0f7370631d8a222565faaee550bfb
* | | am d9001a7d: Merge "NPE in WallpaperHandler"Jean-Baptiste Queru2012-08-141-1/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'd9001a7dc5854d5dfc24a5ead19ad8c05acf171e': NPE in WallpaperHandler
| * | Merge "NPE in WallpaperHandler"Jean-Baptiste Queru2012-08-141-1/+6
| |\ \
| | * | NPE in WallpaperHandlerNils Holmström2012-08-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In WallpaperHandler, BitmapFactory.decodeStream() is used to create a Bitmap that is then set by WallpaperManager as a wallpaper. This method has null as return value when something fails as decoding, resulting in a nullpointer exception in WallpaperManager. Adding nullcheck on the Bitmap before setting it as wallpaper to avoid the NPE. Change-Id: Ib1a0f9331898162b21094c3ebe80bc21d66f8bd7