summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| | * 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
* | | 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
| | * | Encode characters that java.net.URI rejectsSelim Gurun2012-06-132-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5952386 Our java.net.URI implementation conforms to an old obsolete RFC and it is very restrictive. Since in our download path, we use download manager and so java.net.URI, this causes an odd bug (i.e. URIs that are fetched fine by chromium http stack fails when download manager is used). Also there is a second bug that when URI parsing fails and an exception is thrown, we fail to catch it and crash. This CL fixes both. Change-Id: I62ac289566efae97dd2161b8041b06a0a87211cb
* | | | 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
| * | Don't show stale thumbnailsJohn Reck2012-06-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6610952 We don't null item.thumbnail because we want to recycle the bitmap if the item changes, so add a boolean saying whether or not we have an actual thumbnail to show to avoid showing stale data Change-Id: Ibfd485cb7f3ea8991222b8e99704170bf331472b
* | | am 3c573ac4: Merge "Enable voice search in omnibox" into jb-devMichael Kolb2012-06-047-14/+92
|\ \ \ | |/ / | | / | |/ |/| * commit '3c573ac4dbc0e9a117a9540c410911bab52dffa7': Enable voice search in omnibox
| * Enable voice search in omniboxMichael Kolb2012-06-047-14/+92
| | | | | | | | | | | | | | | | Bug: 6601348 Bring back voice search. Also fixes focus bug for fixed titlebar. Change-Id: I83c8ad96957b62c23ad0bbb35685712687d11213
* | am ed19512a: Merge "Add null check" into jb-devJohn Reck2012-05-301-1/+1
|\ \ | |/ | | | | | | * commit 'ed19512a329e66afaf48c8346b823e5fcc73bd02': Add null check
| * Add null checkJohn Reck2012-05-301-1/+1
| | | | | | | | | | | | Bug: 6584413 Change-Id: I63e94129fb0830e87d47ffca1d402a8aa838ac20
* | 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
| * Merge "Prevent the monkies with a sledgehammer" into jb-devJohn Reck2012-05-304-52/+302
| |\
| | * Prevent the monkies with a sledgehammerJohn Reck2012-05-304-52/+302
| | | | | | | | | | | | | | | | | | | | | Bug: 6515134 If we never have a null mController, we can never have a NPE! Change-Id: Idf90b94e6557e0afd6dd92602b8e4dfd189218d1
* | | 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
| * | Merge "Make sure focusSearch doesn't return a detached webview" into jb-devJohn Reck2012-05-301-2/+4
| |\ \
| | * | Make sure focusSearch doesn't return a detached webviewJohn Reck2012-05-301-2/+4
| | |/ | | | | | | | | | | | | | | | Bug: 6535227 Change-Id: I18bf24117d8ffcbbd440b2a47b2db422e41894f4
* | | 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
| * | Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-303-13/+40
| |\ \
| | * | tighten nav bar layout & fix animation bugMichael Kolb2012-05-293-13/+40
| | |/ | | | | | | | | | | | | | | | Bug: 6563289 Change-Id: I00fdecf645128bb1fec8e23be94aa2b85fb586f7
* | | 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
| * | Only change text in url input when it changedMichael Kolb2012-05-291-1/+3
| |/ | | | | | | | | | | Bug: 6556693 Change-Id: Iad0f285f89710de1bbdf7ab5f727bdc81d4ef387
* | am f695f6b4: Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
|\ \ | |/ | | | | | | * commit 'f695f6b4399f3a60a5d9d0aa39b8c341e8b8592a': Tell Browser to monitor the WebCore thread for responsiveness.
| * Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
| | | | | | | | | | | | | | | | We no longer enable the WebCore thread watchdog for all WebViews, but we still want the functionality in Browser. Bug: 6447214 Change-Id: I1665bef875d53239203bc6313ac39af4bda6a60b
* | am c90effde: Merge "Disable fixed title bar in quick controls" into jb-devJohn Reck2012-05-231-3/+8
|\ \ | |/ | | | | | | * commit 'c90effdedc1c38eabc2c731d5a55c17f881862b1': Disable fixed title bar in quick controls