OSDN Git Service

android-x86/packages-apps-Browser.git
13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 23:31:18 +0000 (16:31 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 12:43:58 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 26 Mar 2011 05:25:46 +0000 (22:25 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 21:32:16 +0000 (14:32 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 13:04:41 +0000 (06:04 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 24 Mar 2011 15:49:08 +0000 (08:49 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 23 Mar 2011 12:43:24 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agoDO NOT MERGE
Huahui Wu [Tue, 22 Mar 2011 22:00:11 +0000 (15:00 -0700)]
DO NOT MERGE

b/4088884 Backport "Remove content:// protocol handler in web browser"
to Gingerbread

It's a manual cherrypick of
    https://android-git.corp.google.com/g/#change,88728
since a lot has been changed in bettween.

Change-Id: I6a0e4579a98ebda6b89daad0b520bdd80d819a17

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 22 Mar 2011 20:10:31 +0000 (13:10 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 22 Mar 2011 12:43:26 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 21 Mar 2011 12:42:30 +0000 (05:42 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 19 Mar 2011 00:35:32 +0000 (17:35 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 22:13:23 +0000 (15:13 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Iee65b07157b30e8d702a52360d9bffe21ca82f67

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 18 Mar 2011 17:41:46 +0000 (10:41 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 17 Mar 2011 12:43:58 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 16 Mar 2011 12:43:37 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 15 Mar 2011 05:33:50 +0000 (22:33 -0700)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 12 Mar 2011 19:56:18 +0000 (11:56 -0800)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 11 Mar 2011 18:35:29 +0000 (10:35 -0800)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 9 Mar 2011 16:53:56 +0000 (08:53 -0800)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 8 Mar 2011 00:40:08 +0000 (16:40 -0800)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 5 Mar 2011 05:56:43 +0000 (21:56 -0800)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 5 Mar 2011 01:41:53 +0000 (17:41 -0800)]
merge in gingerbread-release history after reset to gingerbread

13 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Mar 2011 22:17:43 +0000 (14:17 -0800)]
merge in gingerbread-release history after reset to gingerbread

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Feb 2011 01:22:00 +0000 (17:22 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I82ff880eecf561fc7c60cb4fa6ba848420ef1a33

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Feb 2011 01:22:00 +0000 (17:22 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I82ff880eecf561fc7c60cb4fa6ba848420ef1a33

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Feb 2011 21:18:24 +0000 (13:18 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Ie4157fa59972b091bad51d6c8d5a374f21d72110

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Feb 2011 21:18:24 +0000 (13:18 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Ie4157fa59972b091bad51d6c8d5a374f21d72110

13 years agoMerge "DO NOT MERGE:backport test imrpovements from newer platform" into gingerbread
Guang Zhu [Fri, 28 Jan 2011 01:03:54 +0000 (17:03 -0800)]
Merge "DO NOT MERGE:backport test imrpovements from newer platform" into gingerbread

13 years agoDO NOT MERGE:backport test imrpovements from newer platform
Guang Zhu [Thu, 27 Jan 2011 23:45:05 +0000 (15:45 -0800)]
DO NOT MERGE:backport test imrpovements from newer platform

This change contains the following changes:
I41758a87 some improvements for browser test harness
I7785f66c prevent browser test from launching non-http urls
Id2f49549 throw RuntimeException if failed to stop a timedout site

Change-Id: Ic44f747c5da4328be8fa15b882ce72f56204b142

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 21:58:36 +0000 (13:58 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I55c3b4cd02f956957eea81deeba0c36c0a4e5d3e

13 years agoImport translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:30:28 +0000 (10:30 -0800)]
Import translations for additional languages.

Change-Id: I1878f644e3428f13cbacaea50499b23558a4be37

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Dec 2010 00:56:41 +0000 (16:56 -0800)]
Import revised translations.  DO NOT MERGE

Bug 3272618

Change-Id: I83e87497cfc06c0e3287e34dbe6536c63fdf4ca7

13 years agoHide the custom view when we get onPause() DO NOT MERGE
Ben Murdoch [Tue, 30 Nov 2010 20:48:15 +0000 (20:48 +0000)]
Hide the custom view when we get onPause() DO NOT MERGE

When we run onPause, be sure to hide any custom views (such as
the HTML5 video view) so that when the activity restores we don't
have anything overlaying the page.

Bug: 3240426
Change-Id: Ic93286eab40cda814682bc023f3648b502545256

13 years agoRescaled mdpi assets added
Gilles Debunne [Mon, 1 Nov 2010 23:55:34 +0000 (16:55 -0700)]
Rescaled mdpi assets added

Bug 3157256

Change-Id: I93a64fe92d94200cddf530f66fd69453e6aa305f

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 9 Nov 2010 20:17:10 +0000 (12:17 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I980815e031a617f5299a4271d9d8abeb3cc17a2b

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Oct 2010 00:01:47 +0000 (17:01 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Iefa9b8d196eb02cbb725ff983deed018e1f17077

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 23:50:31 +0000 (16:50 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ibed59337390d09f515fef6b8d32bc3f6193ab2d4

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 22 Oct 2010 22:26:41 +0000 (15:26 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Id746564f3e50ec8f0534bbcf09a150cddfec3902

13 years agoReplace shared storage with USB storage.
Eric Fischer [Wed, 20 Oct 2010 01:12:24 +0000 (18:12 -0700)]
Replace shared storage with USB storage.

Change-Id: Ic22670fbc915ba3cbb9dafc1d4f054218eff570f

13 years agoImport revised translations DO NOT MERGE
Kenny Root [Fri, 15 Oct 2010 22:19:06 +0000 (15:19 -0700)]
Import revised translations DO NOT MERGE

Change-Id: Id3f4eafcbf520659171fd9408ac7db5d3284c379

13 years agoImport revised translations
Kenny Root [Thu, 14 Oct 2010 16:42:46 +0000 (09:42 -0700)]
Import revised translations

Change-Id: I95abc9d485ba9ae89f46c3165ce4da3a52c02273

13 years agoUpdated browser launcher icons (hdpi and mdpi)
Justin Ho [Thu, 14 Oct 2010 00:44:07 +0000 (17:44 -0700)]
Updated browser launcher icons (hdpi and mdpi)

Change-Id: Ib08420f76cb8eea3da323bfd92af9fccc94729ae

13 years agoUpdated Browser launcher icon
Justin Ho [Wed, 13 Oct 2010 03:28:45 +0000 (20:28 -0700)]
Updated Browser launcher icon

Change-Id: Id65c92a24aa7e9397a8334e72832bab85c3b7956

13 years agoRemove QuickSearch shortcuts.
Leon Scroggins [Thu, 7 Oct 2010 17:51:57 +0000 (13:51 -0400)]
Remove QuickSearch shortcuts.

Bug:3070691
Change-Id: If3a4214fea0bca8ee0b29c37d2bb67d8b3d00570

13 years agoNew downscaled menu assets
Gilles Debunne [Wed, 6 Oct 2010 16:57:35 +0000 (09:57 -0700)]
New downscaled menu assets

Change-Id: I9c7b19b814a658af6f24171a1d25f6fbfe4ab3e9

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 29 Sep 2010 21:30:35 +0000 (14:30 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Ie6dd559f0a21d88b791988962f7232090d721b6e

13 years agoMerge "Split strings with SD card references into variations." into gingerbread
Eric Fischer [Wed, 29 Sep 2010 19:02:27 +0000 (12:02 -0700)]
Merge "Split strings with SD card references into variations." into gingerbread

13 years agoSplit strings with SD card references into variations.
Eric Fischer [Tue, 28 Sep 2010 23:34:19 +0000 (16:34 -0700)]
Split strings with SD card references into variations.

Change-Id: I0a49dba7c8340de7dc94880c3038fa2381e7a29f

13 years agoUpdate refs to DownloadManager, which moved to android.app
Steve Howard [Tue, 28 Sep 2010 19:52:06 +0000 (12:52 -0700)]
Update refs to DownloadManager, which moved to android.app

Change-Id: I65fdbabecfc7a91b4edd40ffccb29995b24f075f

13 years agoMerge "Rename search_engines.xml to keep translation imports from overwriting it...
Eric Fischer [Tue, 28 Sep 2010 17:19:40 +0000 (10:19 -0700)]
Merge "Rename search_engines.xml to keep translation imports from overwriting it." into gingerbread

13 years agoMerge "Use the system downloads UI, instead of browser specific 1." into gingerbread
Leon Scroggins III [Tue, 28 Sep 2010 14:20:28 +0000 (07:20 -0700)]
Merge "Use the system downloads UI, instead of browser specific 1." into gingerbread

13 years agoRename search_engines.xml to keep translation imports from overwriting it.
Eric Fischer [Mon, 27 Sep 2010 22:33:39 +0000 (15:33 -0700)]
Rename search_engines.xml to keep translation imports from overwriting it.

Adding "donottranslate" to the name keeps it safe from the importer.

Change-Id: Ib962f187d01a9546a05ba5215af93db7c2864766

13 years agoUse the system downloads UI, instead of browser specific 1.
Leon Scroggins III [Mon, 27 Sep 2010 16:32:40 +0000 (12:32 -0400)]
Use the system downloads UI, instead of browser specific 1.

Bug:3034564

Change-Id: Id850854da7db9c1a36500c9eee9debad64bdf97e

13 years agoMerge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 19:29:07 +0000 (12:29 -0700)]
Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

13 years agoTrim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 19:17:17 +0000 (12:17 -0700)]
Trim unwanted whitespace from translations.  DO NOT MERGE

Change-Id: Ifb2edbc3ee166877a9f3afd6d3003b97fc569ef0

13 years agoPrevent a null pointer exception.
Leon Scroggins III [Mon, 27 Sep 2010 16:45:34 +0000 (12:45 -0400)]
Prevent a null pointer exception.

Bug: 3035805
Change-Id: Id6c7d2105087e3ad4b250da6d4944409d01e55a9

13 years agoreconcile froyo-release into gingerbread
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:30:17 +0000 (17:30 -0700)]
reconcile froyo-release into gingerbread

Change-Id: Iec10fc8bafafab638025533501aee04d4acb9f15

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 24 Sep 2010 17:23:19 +0000 (10:23 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I641b4472e0d865c5d8ac8f2bf6409d92c9e09b87

13 years agoImport translations for search engine setting. DO NOT MERGE
Eric Fischer [Tue, 21 Sep 2010 19:29:47 +0000 (12:29 -0700)]
Import translations for search engine setting.  DO NOT MERGE

Change-Id: Ib28adb628b31d2832ab1b12d9564931770ff9d6f

13 years agoUse translation from donut for "Set search engine." DO NOT MERGE
Eric Fischer [Sat, 18 Sep 2010 01:19:51 +0000 (18:19 -0700)]
Use translation from donut for "Set search engine."  DO NOT MERGE

Change-Id: I4c3ea599954d128208d349209469b2cedfb331e2

13 years agoDefault to Google if global search provider not present.
Leon Scroggins III [Fri, 17 Sep 2010 15:10:29 +0000 (11:10 -0400)]
Default to Google if global search provider not present.

Bug: 3009486
Change-Id: I9d727b5f6d478483814e420aca7ad30dcf5252f5

13 years agoRemove "Show web suggestions" from browser settings
Leon Scroggins III [Fri, 17 Sep 2010 17:01:13 +0000 (13:01 -0400)]
Remove "Show web suggestions" from browser settings

Bug:3011374
Change-Id: I44d57431d127e48d25a957915a2fb93dc96b1053

13 years agoam eb8fc4a0: (-s ours) Import translations for search engine setting. DO NOT MERGE
Eric Fischer [Tue, 21 Sep 2010 19:54:17 +0000 (12:54 -0700)]
am eb8fc4a0: (-s ours) Import translations for search engine setting.  DO NOT MERGE

Merge commit 'eb8fc4a0afa7d7bee3a03d63f62ab24c0a75b99f' into gingerbread

* commit 'eb8fc4a0afa7d7bee3a03d63f62ab24c0a75b99f':
  Import translations for search engine setting.  DO NOT MERGE

13 years agoImport translations for search engine setting. DO NOT MERGE
Eric Fischer [Tue, 21 Sep 2010 19:29:47 +0000 (12:29 -0700)]
Import translations for search engine setting.  DO NOT MERGE

Change-Id: Ib28adb628b31d2832ab1b12d9564931770ff9d6f

13 years agoDo not merge: Don't show cab when invoking select text from menu
Cary Clark [Tue, 21 Sep 2010 18:28:49 +0000 (14:28 -0400)]
Do not merge: Don't show cab when invoking select text from menu

Leave the experiment intact for posterity.
Also, remove spurious comment.

Change-Id: I44519d4cf6843acf9aa056a6452e0e34216f2968
http://b/2626451

13 years agoam 196bc63b: (-s ours) Use translation from donut for "Set search engine." DO NOT...
Eric Fischer [Mon, 20 Sep 2010 20:46:19 +0000 (13:46 -0700)]
am 196bc63b: (-s ours) Use translation from donut for "Set search engine."  DO NOT MERGE

Merge commit '196bc63b92bec578e351445348fcb66071673b8a' into gingerbread

* commit '196bc63b92bec578e351445348fcb66071673b8a':
  Use translation from donut for "Set search engine."  DO NOT MERGE

13 years agoUse translation from donut for "Set search engine." DO NOT MERGE
Eric Fischer [Sat, 18 Sep 2010 01:19:51 +0000 (18:19 -0700)]
Use translation from donut for "Set search engine."  DO NOT MERGE

Change-Id: I4c3ea599954d128208d349209469b2cedfb331e2

13 years agoam 8774c667: Remove "Show web suggestions" from browser settings
Leon Scroggins III [Fri, 17 Sep 2010 18:07:39 +0000 (11:07 -0700)]
am 8774c667: Remove "Show web suggestions" from browser settings

Merge commit '8774c667dd446346dca5f5d3c89092fbc86448d0' into gingerbread

* commit '8774c667dd446346dca5f5d3c89092fbc86448d0':
  Remove "Show web suggestions" from browser settings

13 years agoRemove "Show web suggestions" from browser settings
Leon Scroggins III [Fri, 17 Sep 2010 17:01:13 +0000 (13:01 -0400)]
Remove "Show web suggestions" from browser settings

Bug:3011374
Change-Id: I44d57431d127e48d25a957915a2fb93dc96b1053

13 years agoam 3130660e: Default to Google if global search provider not present.
Leon Scroggins III [Fri, 17 Sep 2010 17:11:54 +0000 (10:11 -0700)]
am 3130660e: Default to Google if global search provider not present.

Merge commit '3130660e0045923199c74efa7c1df9ea85501dce' into gingerbread

* commit '3130660e0045923199c74efa7c1df9ea85501dce':
  Default to Google if global search provider not present.

13 years agoDefault to Google if global search provider not present.
Leon Scroggins III [Fri, 17 Sep 2010 15:10:29 +0000 (11:10 -0400)]
Default to Google if global search provider not present.

Bug: 3009486
Change-Id: I9d727b5f6d478483814e420aca7ad30dcf5252f5

13 years agoSend WEB_SEARCH intent straight to default search provider if selected
Bjorn Bringert [Thu, 16 Sep 2010 11:11:04 +0000 (12:11 +0100)]
Send WEB_SEARCH intent straight to default search provider if selected

Bug: 3002103
Change-Id: I51d7bd932e4ee5359da8d1361379b4413963eeb6

13 years agoFix Google suggest and search URLs when Google Search is not installed
Bjorn Bringert [Wed, 15 Sep 2010 19:46:42 +0000 (20:46 +0100)]
Fix Google suggest and search URLs when Google Search is not installed

Bug: 3002110
Change-Id: Id49365bf53623c45bfa6f5d96d1938b801948396

13 years agoClear voice search mode when changing search engines.
Leon Scroggins III [Tue, 14 Sep 2010 18:02:36 +0000 (14:02 -0400)]
Clear voice search mode when changing search engines.

Not all search engines support voice search.  Also, different
search engines may support them differently.  So if we are
already in voice search mode when the search engine changes,
exit the mode.

Change-Id: I8d3f200f4829ad1383d554214c9d56d5c0b96aed

13 years agoFixes for changing the search engine.
Leon Scroggins III [Tue, 14 Sep 2010 14:57:37 +0000 (10:57 -0400)]
Fixes for changing the search engine.

Provide a default value for the Select search engine preference.
Move the Select search engine preference into advanced settings.
When opening the SearchDialog with a SearchEngine other than
Google, add a flag to hide the voice search icon.

Depends on a change to frameworks/base.

Change-Id: I6da2e582789253b3c5ffac9fe1ad3732f99f28ea

13 years agoAdd user-selected search providers to browser
Bjorn Bringert [Mon, 13 Sep 2010 13:06:41 +0000 (14:06 +0100)]
Add user-selected search providers to browser

The lists of search providers are taken from Chrome.

Change-Id: I7af6dc1258950d1fc5cf86013f8be9f3c5db0f1a

13 years agoPrevent a null pointer exception.
Leon Scroggins III [Thu, 16 Sep 2010 19:30:15 +0000 (15:30 -0400)]
Prevent a null pointer exception.

Bug: 3004709
Change-Id: I0594f8725601cf0e99dd2809d3571af6bfe1a056

13 years agoam 785ad9a5: Send WEB_SEARCH intent straight to default search provider if selected
Bjorn Bringert [Thu, 16 Sep 2010 16:01:55 +0000 (09:01 -0700)]
am 785ad9a5: Send WEB_SEARCH intent straight to default search provider if selected

Merge commit '785ad9a5258db19e8c98eb7969aff453af944565' into gingerbread

* commit '785ad9a5258db19e8c98eb7969aff453af944565':
  Send WEB_SEARCH intent straight to default search provider if selected

13 years agoSend WEB_SEARCH intent straight to default search provider if selected
Bjorn Bringert [Thu, 16 Sep 2010 11:11:04 +0000 (12:11 +0100)]
Send WEB_SEARCH intent straight to default search provider if selected

Bug: 3002103
Change-Id: I51d7bd932e4ee5359da8d1361379b4413963eeb6

13 years agoam 4346564c: Fix Google suggest and search URLs when Google Search is not installed
Bjorn Bringert [Wed, 15 Sep 2010 20:41:32 +0000 (13:41 -0700)]
am 4346564c: Fix Google suggest and search URLs when Google Search is not installed

Merge commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019' into gingerbread

* commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019':
  Fix Google suggest and search URLs when Google Search is not installed

13 years agoFix Google suggest and search URLs when Google Search is not installed
Bjorn Bringert [Wed, 15 Sep 2010 19:46:42 +0000 (20:46 +0100)]
Fix Google suggest and search URLs when Google Search is not installed

Bug: 3002110
Change-Id: Id49365bf53623c45bfa6f5d96d1938b801948396

13 years agoam 6248bff9: Merge "Remove an incorrect javadoc comment." into froyo
Leon Scroggins III [Tue, 14 Sep 2010 19:56:08 +0000 (12:56 -0700)]
am 6248bff9: Merge "Remove an incorrect javadoc comment." into froyo

Merge commit '6248bff91a445c29df38f54d05b494a0e4f19897' into gingerbread

* commit '6248bff91a445c29df38f54d05b494a0e4f19897':
  Remove an incorrect javadoc comment.

13 years agoam 95d9bfd1: Clear voice search mode when changing search engines.
Leon Scroggins III [Tue, 14 Sep 2010 19:54:05 +0000 (12:54 -0700)]
am 95d9bfd1: Clear voice search mode when changing search engines.

Merge commit '95d9bfd1d67902a8aa5d2e529db7f7064db081b7' into gingerbread

* commit '95d9bfd1d67902a8aa5d2e529db7f7064db081b7':
  Clear voice search mode when changing search engines.

13 years agoMerge "Remove an incorrect javadoc comment." into froyo
Leon Scroggins III [Tue, 14 Sep 2010 19:51:04 +0000 (12:51 -0700)]
Merge "Remove an incorrect javadoc comment." into froyo

13 years agoRemove an incorrect javadoc comment.
Leon Scroggins III [Tue, 14 Sep 2010 18:19:23 +0000 (14:19 -0400)]
Remove an incorrect javadoc comment.

The comment references a parameter that is not part of the
method.

Change-Id: Ia2b5c81e4d09bb7e1614a84f2532520730244cae

13 years agoam 430057da: Fixes for changing the search engine.
Leon Scroggins III [Tue, 14 Sep 2010 18:05:21 +0000 (11:05 -0700)]
am 430057da: Fixes for changing the search engine.

Merge commit '430057dad085f3c3dbc386f127b1f5a10a9851da' into gingerbread

* commit '430057dad085f3c3dbc386f127b1f5a10a9851da':
  Fixes for changing the search engine.

13 years agoClear voice search mode when changing search engines.
Leon Scroggins III [Tue, 14 Sep 2010 18:02:36 +0000 (14:02 -0400)]
Clear voice search mode when changing search engines.

Not all search engines support voice search.  Also, different
search engines may support them differently.  So if we are
already in voice search mode when the search engine changes,
exit the mode.

Change-Id: I8d3f200f4829ad1383d554214c9d56d5c0b96aed

13 years agoFixes for changing the search engine.
Leon Scroggins III [Tue, 14 Sep 2010 14:57:37 +0000 (10:57 -0400)]
Fixes for changing the search engine.

Provide a default value for the Select search engine preference.
Move the Select search engine preference into advanced settings.
When opening the SearchDialog with a SearchEngine other than
Google, add a flag to hide the voice search icon.

Depends on a change to frameworks/base.

Change-Id: I6da2e582789253b3c5ffac9fe1ad3732f99f28ea

13 years agoam d2670653: Add user-selected search providers to browser
Bjorn Bringert [Tue, 14 Sep 2010 00:41:40 +0000 (17:41 -0700)]
am d2670653: Add user-selected search providers to browser

Merge commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb' into gingerbread

* commit 'd26706538834e0ed58bf28f08d9a2885c0e7efcb':
  Add user-selected search providers to browser

13 years agoAdd user-selected search providers to browser
Bjorn Bringert [Mon, 13 Sep 2010 13:06:41 +0000 (14:06 +0100)]
Add user-selected search providers to browser

The lists of search providers are taken from Chrome.

Change-Id: I7af6dc1258950d1fc5cf86013f8be9f3c5db0f1a

13 years agoDO NOT MERGE
Cary Clark [Thu, 1 Jul 2010 16:36:56 +0000 (12:36 -0400)]
DO NOT MERGE
remove save/restore picture from browser app

These pictures may be arbitrarily large, and with the
newer caching mechanism, are rarely used.

Also, remove any old pictures when the Browser starts.

Change-Id: I0277a08735dc40e0495bf78c68fee5d95b913e27
http://b/2650945

13 years agoUse new apply() instead of commit().
Brad Fitzpatrick [Wed, 1 Sep 2010 23:29:03 +0000 (16:29 -0700)]
Use new apply() instead of commit().

apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: Id1199cd43d62882cfe7343d46e283b32404dea5d

13 years agoDO NOT MERGE remove the pretend cab from the browser
Cary Clark [Thu, 26 Aug 2010 21:27:44 +0000 (17:27 -0400)]
DO NOT MERGE remove the pretend cab from the browser

Change-Id: Iab781c8e5a640d897e172a7b1ca50a1d8d81cd88
http://b/2626451

13 years agoDO NOT MERGE Refactor find and select dialogs
Cary Clark [Thu, 19 Aug 2010 22:40:57 +0000 (18:40 -0400)]
DO NOT MERGE Refactor find and select dialogs

(Cherry picked from master, https://android-git.corp.google.com/g/#change,53491 )

(This is a work in progress -- assets in particular are not final)

Use common code when showing the select and find dialogs. Both
now use similarly constructed contextual action bars and share
resources where possible. Both share a common base class so
supporting code can communicate with either.

Companion changes in frameworks/base and external/webkit

Change-Id: I476fc72b3386348bc25bcf0a3d30482dea543efe
http://b/262451

13 years agoimprovement test app's handling of irregular status file
Guang Zhu [Wed, 18 Aug 2010 00:05:47 +0000 (17:05 -0700)]
improvement test app's handling of irregular status file

if it reads an empty line, or have reached end of file, it
will default to the start from beginning scenario.

Change-Id: Ife2e49bf8adf70d6caba7a1d65094401990325a2

13 years agofix crash recovery bug in PopularUrlsTest
Guang Zhu [Tue, 27 Jul 2010 00:42:19 +0000 (17:42 -0700)]
fix crash recovery bug in PopularUrlsTest

Currently the test does not increment page count after relaunched
after a crash. This means the crashed page will be loaded again,
causing a dead loop.

Change-Id: If4591fbd05521f0454151affafec09788e9208d9

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 4 Aug 2010 17:41:16 +0000 (10:41 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Icbcc05f50ed8489eb31c6670fceba27a22b562e4

13 years agovarious fixes for browser test harness
Guang Zhu [Tue, 20 Jul 2010 00:00:22 +0000 (17:00 -0700)]
various fixes for browser test harness

* the definitive way to determine page load finish seems to be
  onPageLoadFinished AND onProgressChanged==100, changing test
  harness logic to reflect that

* webview does not seem to be happen if ClearCache is called too
  often (or for certain pages?). It may complain that failed to
  delete blahblah, then the test harness goes crazy. So changing
  cache clear to after an entire iteration of web pages have been
  loaded

* browser will load default home page, which may be disruptive
  to the page load process. So for the test, the browser is now
  started with initial intent to visit about:blank, which does
  not trigger any page load at all

Change-Id: I1cfbd8d0196a05caea6a1c5137f45f1f59cc4c5f

13 years agoAdd more choices to about:debug UAString setting
Bart Sears [Fri, 9 Jul 2010 02:58:22 +0000 (19:58 -0700)]
Add more choices to about:debug UAString setting

Bug: 2828591

Add two more choices to the about:debug UAString setting:
- iPad
- Froyo-N1

This will make it easier to test sites that have Tablet UIs specific
to the iPad UA and also sites that have HTML5 content specific to
Android 2.2 UA.

Also update the Desktop UA to the latest Safari 5.0 UA and the iPhone UA
to ios4 (Apple uses the same UA on both the iPhone 3gs (running OS4) and
the iPhone 4 (running OS4)).

Change-Id: I60b402c586966340ac84846189922679dba35464