summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am 966beb17: am cf00c263: Merge "Pause WebView timer when Browser is paused"John Reck2012-09-041-5/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '966beb17e375f3fc5466ec5a1015eda9a4fa5639': Pause WebView timer when Browser is paused
| * | | | | 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
* | | | | | | am 2584c31d: resolved conflicts for merge of 0570344a to jb-mr1-devJean-Baptiste Queru2012-09-041-7/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2584c31de479fa27971455b1e70b8e58b754c0e9': Pass webview's useragent when downloading via context menu
| * | | | | | 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
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7511bc305b374fd01207a6fd720fde0dc543365f Auto-generated-cl: translation import
* | | | | am d9719732: Merge "Pass referer on download requests" into jb-mr1-devSelim Gurun2012-08-295-18/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd9719732b9e02d1236138d2f76eddf9ca2dbd2b7': Pass referer on download requests
| * | | | 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 7cc48ea5: am 3d2e213c: Merge "Fix the issue the SQL request built by ↵Jean-Baptiste Queru2012-08-282-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QuickSearchBox is not handled properly by Sqlite3." * commit '7cc48ea51918f8c7c2d75ac524ee98643685c01c': Fix the issue the SQL request built by QuickSearchBox is not handled properly by Sqlite3.
| * | | | | 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
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf36d6e51ece5e718a4adb05cb76cfdfeb20ca88 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic446eee53ba82d0ca17269de05339ac2e1ac2508 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I313781c188be3d092f41ef070a22ba882d69a5fc Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23e5dbf70c2f71e49a72538380973112f23c4fb1 Auto-generated-cl: translation import
* | | | | am adb2b655: am d9001a7d: Merge "NPE in WallpaperHandler"Jean-Baptiste Queru2012-08-141-1/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'adb2b6554ff7670390a0acd5507dffe430a4cd0d': NPE in WallpaperHandler
| * | | | 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 d2a59930: am edc9e064: Merge "Browser: Use ICS alert icon"Jean-Baptiste Queru2012-08-146-11/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd2a59930d8958f58a96409fc8efe68a53b976ed8': Browser: Use ICS alert icon
| * | | | am edc9e064: Merge "Browser: Use ICS alert icon"Jean-Baptiste Queru2012-08-146-11/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'edc9e064969b97fd62f492ef8e15812b63af2bb3': Browser: Use ICS alert icon
| | * | | Merge "Browser: Use ICS alert icon"Jean-Baptiste Queru2012-08-146-11/+11
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Browser: Use ICS alert iconBjörn Lundén2012-08-136-11/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | Still using upscaled GB drawable in a few places. Change-Id: I52471b10809117b5a68e8236dc320fde0da2c533
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I30dee6e23c127a5af8a9fad92cbb045b644cc8e3 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-061-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I1e4b5a4202608da284798f8ed651825bd2288408 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEYing Wang2012-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8db42af7c50fc23b66f637b72c3c8d65abe9fdd6 Auto-generated-cl: translation import
* | | | am 3c2ab032: Explicitly export content providersNick Kralevich2012-08-011-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3c2ab0322d40a0eac3b482052532e27d20399f65': Explicitly export content providers
| * | | Explicitly export content providersNick Kralevich2012-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a future version of Android, the default value for <provider android:exported> will change from true to false. Explicitly set android:exported="true" Bug: 3306452 Change-Id: Ic8adfe95ce0e8b5a33a8de4f5ac4f4ff184a67e8
* | | | Import translations. DO NOT MERGEYing Wang2012-07-301-2/+1
|/ / / | | | | | | | | | | | | Change-Id: If0dc8940b5d312dec7ab4803ce80ac65697495b5 Auto-generated-cl: translation import
* | | am 39e7dfee: Merge "Stop loading subview in stopAllLoading"John Reck2012-07-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '39e7dfee746d73670eea435024a80ae9dbedf176': Stop loading subview in stopAllLoading
| * | Merge "Stop loading subview in stopAllLoading"John Reck2012-07-271-1/+1
| |\ \
| | * | 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
* | | Import translations. DO NOT MERGEYing Wang2012-07-251-1/+1
| | | | | | | | | | | | | | | Change-Id: If3bdd2026e323bb96bdede893c858d5bb79c3060 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-201-8/+8
| | | | | | | | | | | | | | | Change-Id: I953e470dccd90bdef407800bc8bcf795bfa4a848 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-191-2/+2
| | | | | | | | | | | | | | | Change-Id: I72bb2712652d3c37baa3eda17bf73833b81016a4 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-181-4/+4
| | | | | | | | | | | | | | | Change-Id: Ia7870b127edfb4c67181e04ad662ddc64f6878c0 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-161-29/+29
| | | | | | | | | | | | | | | Change-Id: Iac3c2627e2ecbe6b44c63776791124b14745c561 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-131-31/+31
| | | | | | | | | | | | | | | Change-Id: Ia13d11c2ddfabe406033768f7f55fe3e25de0ffb Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEYing Wang2012-07-121-14/+14
| | | | | | | | | | | | | | | Change-Id: Ibfd6c800f552edbfe50a2a98792884bee897a12e Auto-generated-cl: translation import
* | | am 3f5abd72: Reconcile with jb-releaseThe Android Open Source Project2012-07-040-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3f5abd721a1603f859ca7c8b8d77e103bd904395': Remove ORDER BY clause on Search Suggestion queries.
| * | Reconcile with jb-releaseThe Android Open Source Project2012-07-040-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I98846bdcbacded08caf473127115970d08770a6d
| | * | Remove ORDER BY clause on Search Suggestion queries.Ben Murdoch2012-07-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not apply any ordering to results returned by the Browser Provider when responding to search suggestions. Change-Id: Ia487bc708d04ee629681692b5416ae65c6017012
* | | | 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.
| | * | Remove ORDER BY clause on Search Suggestion queries.Ben Murdoch2012-07-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not apply any ordering to results returned by the Browser Provider when responding to search suggestions. Change-Id: Ia487bc708d04ee629681692b5416ae65c6017012