summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Allow enabling WebSockets from Labs PreferencesChirayu Desai2013-03-242-0/+7
| | | | Change-Id: Ia0dc06cbd4f2e8e340a8f8ee910a6310a5079d79
* Runtime enablement of WebGLPierre-Antoine LaFayette2013-01-203-0/+26
| | | | | | | | | | Add Labs setting for enabling and disabling WebGL. Need to make sure WebGL has been compiled in before showing runtime enablement settings in Labs menu. Requesting information from the native side through JNI. (cherry-picked commit from a2f7564cd95da42fad70e3c54497df7e7e8b1ea9) Change-Id: Ie11bfa69941c2d75cfec04132908e07391c602fd
* Revert "Multimedia feature port from ICS"Ricardo Cerqueira2012-11-196-77/+6
| | | | This reverts commit 9aa4a1b524d567c70967565bce2636f01c298d84.
* Revert "Runtime enablement of WebGL"Ricardo Cerqueira2012-11-193-26/+0
| | | | | | This reverts commit 0059fc7aaf5a8c141f7753b2574240e7dee53885. Change-Id: I799965f86443f75a1e1576c54ffec31532c58ebe
* Merge commit 'android-4.2_r1' into mr1-stagingRicardo Cerqueira2012-11-1919-116/+120
|\ | | | | | | Change-Id: Id36dc68dabccb44bd69de5580c8441cf7a6b6049
| * 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
| * | | am edc9e064: Merge "Browser: Use ICS alert icon"Jean-Baptiste Queru2012-08-146-11/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'edc9e064969b97fd62f492ef8e15812b63af2bb3': Browser: Use ICS alert icon
| | * | Browser: Use ICS alert iconBjörn Lundén2012-08-136-11/+11
| | |/ | | | | | | | | | | | | | | | Still using upscaled GB drawable in a few places. Change-Id: I52471b10809117b5a68e8236dc320fde0da2c533
| * | am 39e7dfee: Merge "Stop loading subview in stopAllLoading"John Reck2012-07-271-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '39e7dfee746d73670eea435024a80ae9dbedf176': Stop loading subview in stopAllLoading
| | * Stop loading subview in stopAllLoadingMattias Nilsson2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | The main webview is stopped twice instead of stopping the subview loading. Correcting this cut and paste error. Change-Id: Ic12c7219d222d42f59e27f1cda0cd65a003b41ca
| * | am 06f337b3: am bc681880: Remove ORDER BY clause on Search Suggestion queries.Ben Murdoch2012-07-041-4/+1
| |\ \ | | |/ | | | | | | | | | * commit '06f337b3976ad2093388932bac0003b371bccc5e': Remove ORDER BY clause on Search Suggestion queries.
| | * am bc681880: Remove ORDER BY clause on Search Suggestion queries.Ben Murdoch2012-07-041-4/+1
| | |\ | | | | | | | | | | | | | | | | * commit 'bc681880294a2e31a1325101917b6e36fd411bde': Remove ORDER BY clause on Search Suggestion queries.
| * | | Show voice button only on voice enabled devicesMichael Kolb2012-06-262-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6686590 Change-Id: If3a79ec8b848d0c5d001e0c38de5973bb6a166a1
| * | | Merge "Disable URL overriding on redirects"John Reck2012-06-145-1/+20
| |\ \ \
| | * | | Disable URL overriding on redirectsJohn Reck2012-06-145-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5334118 When sending an intent for a URL with specialized handlers, tag it with an extra that will surpress subsequent redirections Change-Id: I997aa79192baea86c58958ab213200d57ec4c4f9
| * | | | am 17e3ba9b: am a770f8d4: Encode characters that java.net.URI rejectsSelim Gurun2012-06-142-5/+15
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '17e3ba9b808c0ca3b4a06c3964437204e76f9d30': Encode characters that java.net.URI rejects
| | * | | am a770f8d4: Encode characters that java.net.URI rejectsSelim Gurun2012-06-132-5/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a770f8d4bd583e9a719af6ce314838db12003b33': Encode characters that java.net.URI rejects
| * | | | | Don't use the new task flag for download.Teng-Hui Zhu2012-06-131-1/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag can incorrectly turn the Gallery app into a new task when trying to play some video. bug:6652951 Change-Id: Iec18ac0c9514101780e7cc6361dbce6c1e9320cb
| * | | | Merge "Fixup browser after hidden API refactor"Jonathan Dixon2012-06-081-4/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixup browser after hidden API refactorJonathan Dixon2012-06-081-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interdepends on https://android-git.corp.google.com/g/#/c/198193 Change-Id: I9f44c0f4f84674965b7afc652420986314e2fc8e
| * | | | am 1df6df7e: Don\'t show stale thumbnailsJohn Reck2012-06-052-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1df6df7e33601f1dcd6358a1eea9c34bc6373927': Don't show stale thumbnails
| * \ \ \ \ am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-047-14/+92
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '3c573ac4dbc0e9a117a9540c410911bab52dffa7': Enable voice search in omnibox
| * | | | | am ed19512a: Merge "Add null check" into jb-devJohn Reck2012-05-301-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed19512a329e66afaf48c8346b823e5fcc73bd02': Add null check
| * \ \ \ \ \ am 244cdfa6: Merge "Prevent the monkies with a sledgehammer" into jb-devJohn Reck2012-05-304-52/+302
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '244cdfa6eb0745a4b681cb704f5564050d88f7ed': Prevent the monkies with a sledgehammer
| * \ \ \ \ \ \ am f788adcf: Merge "Make sure focusSearch doesn\'t return a detached ↵John Reck2012-05-301-2/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webview" into jb-dev * commit 'f788adcf8b3be878d174f5b7c2396c0d19540d7f': Make sure focusSearch doesn't return a detached webview
| * \ \ \ \ \ \ \ am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-303-13/+40
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '06b7e0fafdee08f7045f419b19eb1aacb00d7d60': tighten nav bar layout & fix animation bug
| * \ \ \ \ \ \ \ \ am 41597569: Merge "Only change text in url input when it changed" into jb-devMichael Kolb2012-05-301-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4159756953c0ada88f774828d6a1f329564d222b': Only change text in url input when it changed
generated by cgit v1.1 at 2025-01-08 03:02:32 +0000