summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'android-4.2_r1' into mr1-stagingRicardo Cerqueira2012-11-1981-1158/+768
|\ | | | | | | Change-Id: Id36dc68dabccb44bd69de5580c8441cf7a6b6049
| * am 6c96757f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-10-170-0/+0
| |\ | | | | | | | | | | | | * commit '6c96757f6f39c8c52a248da638e30d3f9b1f3cd5': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2012-10-162-7/+7
| |/ | | | | | | | | Change-Id: I5e59077f65e24df2e6706dd0ec7874599f15f5d4 Auto-generated-cl: translation import
| * Let's enhanceJason Chen2012-10-154-0/+0
| | | | | | | | | | | | | | | | | | | | Add mipmap-xxhdpi launcher icon asset for Browser. Not adding a bookmark shortcut asset for now, as we can fall back to the mipmap-xhdpi version. Also remove obsolete drawable-*/ic_launcher_shortcut_browser_bookmark files. Bug: 6718166 Change-Id: Iaf2da67b0574a1004b250a716a1e755450540533
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-041-1/+1
| | | | | | | | | | Change-Id: Iec9925a7f238faffbf4913cf9835d8c00b7450d9 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-031-1/+1
| | | | | | | | | | Change-Id: I311ad114b05e3301db648cbf950d828323b04842 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-272-11/+11
| | | | | | | | | | Change-Id: I7e116ad64ebe02f6aa48f085516f89d28ac22087 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-262-8/+8
| | | | | | | | | | Change-Id: I145eaefcc9bc20ce4bf6a0dc1b912aaf8d8ab8ae Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-2521-42/+21
| | | | | | | | | | Change-Id: If820a8203ef8202fe298f58a450f22677393d3ed Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-2427-55/+28
| | | | | | | | | | Change-Id: Ica0f705e5b5d7c85a239edd9a3c3e55786d92b48 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-2249-26/+123
| | | | | | | | | | Change-Id: Icf6f5dca84be0393f6a981dd202b4d4e28ba821a Auto-generated-cl: translation import
| * Merge "Add contentDescription to SnapshotBar" into jb-mr1-devJohn Reck2012-09-212-8/+9
| |\
| | * Add contentDescription to SnapshotBarJohn Reck2012-09-212-8/+9
| | | | | | | | | | | | | | | | | | Bug: 6806099 Change-Id: I80404aca29b0e9897210d8f57c696e5a7e8e1c2f
| * | Merge "Add contentDescription for page info" into jb-mr1-devJohn Reck2012-09-211-0/+1
| |\ \
| | * | Add contentDescription for page infoJohn Reck2012-09-211-0/+1
| | |/ | | | | | | | | | | | | | | | Bug: 6806384 Change-Id: Ib009a345d2dcaf5630864e8087e12194d213e174
| * | Merge "Add missing contentDescription" into jb-mr1-devJohn Reck2012-09-211-0/+1
| |\ \
| | * | Add missing contentDescriptionJohn Reck2012-09-211-0/+1
| | |/ | | | | | | | | | | | | | | | Bug: 6938839 Change-Id: I964ce0ffb47e9fcfb93f61edfc0e53c160d9e818
| * | Add content description for folder upJohn Reck2012-09-212-0/+4
| |/ | | | | | | | | | | 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
| | * Merge "Don't replace file extension when mime-type is incorrect"John Reck2012-09-181-0/+1
| | |\
| | | * 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
| | * Merge "BrowserSettings required a Controller sometimes"John Reck2012-09-131-2/+2
| | |\
| | | * 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
| | * Merge "Added catch of SQLiteException when updating screenshot"John Reck2012-09-061-0/+5
| | |\
| | | * 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
| | * Merge "Reset to default did not reset cached settings"John Reck2012-09-051-0/+5
| | |\
| | | * 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
| | * | | Merge "Pass webview's useragent when downloading via context menu"Jean-Baptiste Queru2012-09-041-7/+10
| | |\ \ \ | | | |/ / | | |/| |
| | | * | 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
| * | | Merge "Pass referer on download requests" into jb-mr1-devSelim Gurun2012-08-295-18/+21
| |\ \ \
| | * | | Pass referer on download requestsSelim Gurun2012-08-295-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6662557 Change-Id: Ib7fdc4b3f1e0f7370631d8a222565faaee550bfb
| * | | | am 3d2e213c: Merge "Fix the issue the SQL request built by QuickSearchBox is ↵Jean-Baptiste Queru2012-08-282-2/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | not handled properly by Sqlite3." * commit '3d2e213ce176cb320ac52c71b00cb591beae8e04': Fix the issue the SQL request built by QuickSearchBox is not handled properly by Sqlite3.
| | * | Merge "Fix the issue the SQL request built by QuickSearchBox is not handled ↵Jean-Baptiste Queru2012-08-282-2/+2
| | |\ \ | | | |/ | | |/| | | | | properly by Sqlite3."
| | | * Fix the issue the SQL request built by QuickSearchBox is not handled ↵Jean-Christophe PINCE2012-08-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly by Sqlite3. SELECT history._id AS _id, history.url AS url, CASE WHEN bookmarks.title IS NOT NULL THEN bookmarks.title ELSE history.title END AS title, CASE WHEN bookmarks.url IS NOT NULL THEN "2130837532" ELSE "2130837548" END, history.date AS date FROM history LEFT OUTER JOIN bookmarks ON history.url = bookmarks.url WHERE (url LIKE ?) AND (deleted=0 AND folder=0) ORDER BY history.date DESC has to be replaced with: SELECT history._id AS _id, history.url AS url, CASE WHEN bookmarks.title IS NOT NULL THEN bookmarks.title ELSE history.title END AS title, CASE WHEN bookmarks.url IS NOT NULL THEN "2130837532" ELSE "2130837548" END, history.date AS date FROM history LEFT OUTER JOIN bookmarks ON history.url = bookmarks.url WHERE (bookmarks.url LIKE ?) AND (deleted=0 AND folder=0) ORDER BY history.date DESC Change-Id: Ib9fc03c2e102cca83c09168f75f2911a191af5ae Author: Jean-Christophe PINCE <jean-christophe.pince@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: 43188
| * | | 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
generated by cgit v1.1 at 2024-09-16 06:06:23 +0000