OSDN Git Service
Yi Sun [Thu, 10 Dec 2009 07:34:26 +0000 (23:34 -0800)]
Changed default homepage to android-x86.org
John Reck [Tue, 21 Jun 2011 21:15:19 +0000 (14:15 -0700)]
DO NOT MERGE Prevent loading javascript: uris in existing tabs
Bug:
4770356
Change-Id: I436d97f0c41fedec16891c92bf283654354b0a29
John Reck [Tue, 21 Jun 2011 01:30:26 +0000 (18:30 -0700)]
DO NOT MERGE Security fix
Bug:
4742007
Change-Id: I187ce151078795ad9b566e9dfbfe69c38d15b478
The Android Automerger [Thu, 9 Jun 2011 20:45:29 +0000 (13:45 -0700)]
merge in gingerbread-release history after reset to gingerbread
John Reck [Wed, 8 Jun 2011 16:21:48 +0000 (09:21 -0700)]
DO NOT MERGE Fix NPE in Tab.saveState()
Bug:
4560461
Change-Id: I38df19ee264e4dd66b117a73fbe3ce5362bd76e1
The Android Automerger [Mon, 6 Jun 2011 22:00:33 +0000 (15:00 -0700)]
merge in gingerbread-release history after reset to gingerbread
John Reck [Fri, 27 May 2011 20:43:23 +0000 (13:43 -0700)]
Merge "DO NOT MERGE Fix vanishing title/url in window picker" into gingerbread
The Android Automerger [Wed, 25 May 2011 23:14:18 +0000 (16:14 -0700)]
merge in gingerbread-release history after reset to gingerbread
Ed Tam [Thu, 5 May 2011 23:19:48 +0000 (16:19 -0700)]
DO NOT MERGE - Backport RLZ code to GB:
- Cache RLZ parameter
- Set RLZ parameter for address bar searches
- Add broadcast receiver to handle RLZ updates
- Update RLZ parameters in home page and bookmarks
Bug:
4436761
Change-Id: I7ce0e7bead7954ed9ebfe10b66242553f14ed6f2
The Android Automerger [Fri, 13 May 2011 21:27:40 +0000 (14:27 -0700)]
merge in gingerbread-release history after reset to gingerbread
John Reck [Thu, 12 May 2011 17:13:11 +0000 (10:13 -0700)]
DO NOT MERGE Fix vanishing title/url in window picker
Bug:
2289137
This was caused by two bugs. The first is that when creating
picker data from a webview, it created a new instance of picker
data before checking if there was actually data to use.
The second is that when the webview of a tab was restored, it would
clear the old picker data, which it shouldn't have done.
Change-Id: Ib03a22e32d35f0f686dffc663adcbbddba28db9b
Eric Fischer [Wed, 27 Apr 2011 20:51:48 +0000 (13:51 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: If78a72d8fd00f276621bd594e2c214da47d3351d
The Android Automerger [Fri, 1 Apr 2011 20:27:53 +0000 (13:27 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 31 Mar 2011 01:32:57 +0000 (18:32 -0700)]
merge in gingerbread-release history after reset to gingerbread
Eric Fischer [Tue, 29 Mar 2011 17:54:54 +0000 (10:54 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I151250a65a83f6293fa2ee95317aa13a3aac08ca
The Android Automerger [Mon, 28 Mar 2011 23:31:18 +0000 (16:31 -0700)]
merge 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
The Android Automerger [Sat, 26 Mar 2011 05:25:46 +0000 (22:25 -0700)]
merge 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
The Android Automerger [Fri, 25 Mar 2011 13:04:41 +0000 (06:04 -0700)]
merge 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
The Android Automerger [Wed, 23 Mar 2011 12:43:24 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread
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
The Android Automerger [Tue, 22 Mar 2011 20:10:31 +0000 (13:10 -0700)]
merge 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
The Android Automerger [Mon, 21 Mar 2011 12:42:30 +0000 (05:42 -0700)]
merge 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
Eric Fischer [Fri, 18 Mar 2011 22:13:23 +0000 (15:13 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iee65b07157b30e8d702a52360d9bffe21ca82f67
The Android Automerger [Fri, 18 Mar 2011 17:41:46 +0000 (10:41 -0700)]
merge 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
The Android Automerger [Wed, 16 Mar 2011 12:43:37 +0000 (05:43 -0700)]
merge 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
The Android Automerger [Sat, 12 Mar 2011 19:56:18 +0000 (11:56 -0800)]
merge 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
The Android Automerger [Wed, 9 Mar 2011 16:53:56 +0000 (08:53 -0800)]
merge 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
The Android Automerger [Sat, 5 Mar 2011 05:56:43 +0000 (21:56 -0800)]
merge 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
The Android Automerger [Thu, 3 Mar 2011 22:17:43 +0000 (14:17 -0800)]
merge in gingerbread-release history after reset to gingerbread
Eric Fischer [Tue, 15 Feb 2011 01:22:00 +0000 (17:22 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I82ff880eecf561fc7c60cb4fa6ba848420ef1a33
Eric Fischer [Tue, 15 Feb 2011 01:22:00 +0000 (17:22 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I82ff880eecf561fc7c60cb4fa6ba848420ef1a33
Eric Fischer [Mon, 7 Feb 2011 21:18:24 +0000 (13:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ie4157fa59972b091bad51d6c8d5a374f21d72110
Eric Fischer [Mon, 7 Feb 2011 21:18:24 +0000 (13:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ie4157fa59972b091bad51d6c8d5a374f21d72110
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
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
Eric Fischer [Thu, 27 Jan 2011 21:58:36 +0000 (13:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I55c3b4cd02f956957eea81deeba0c36c0a4e5d3e
Eric Fischer [Thu, 6 Jan 2011 18:30:28 +0000 (10:30 -0800)]
Import translations for additional languages.
Change-Id: I1878f644e3428f13cbacaea50499b23558a4be37
Eric Fischer [Fri, 10 Dec 2010 00:56:41 +0000 (16:56 -0800)]
Import revised translations. DO NOT MERGE
Bug
3272618
Change-Id: I83e87497cfc06c0e3287e34dbe6536c63fdf4ca7
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
Gilles Debunne [Mon, 1 Nov 2010 23:55:34 +0000 (16:55 -0700)]
Rescaled mdpi assets added
Bug
3157256
Change-Id: I93a64fe92d94200cddf530f66fd69453e6aa305f
Eric Fischer [Tue, 9 Nov 2010 20:17:10 +0000 (12:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I980815e031a617f5299a4271d9d8abeb3cc17a2b
Eric Fischer [Wed, 27 Oct 2010 00:01:47 +0000 (17:01 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iefa9b8d196eb02cbb725ff983deed018e1f17077
Eric Fischer [Mon, 25 Oct 2010 23:50:31 +0000 (16:50 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ibed59337390d09f515fef6b8d32bc3f6193ab2d4
Eric Fischer [Fri, 22 Oct 2010 22:26:41 +0000 (15:26 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Id746564f3e50ec8f0534bbcf09a150cddfec3902
Eric Fischer [Wed, 20 Oct 2010 01:12:24 +0000 (18:12 -0700)]
Replace shared storage with USB storage.
Change-Id: Ic22670fbc915ba3cbb9dafc1d4f054218eff570f
Kenny Root [Fri, 15 Oct 2010 22:19:06 +0000 (15:19 -0700)]
Import revised translations DO NOT MERGE
Change-Id: Id3f4eafcbf520659171fd9408ac7db5d3284c379
Kenny Root [Thu, 14 Oct 2010 16:42:46 +0000 (09:42 -0700)]
Import revised translations
Change-Id: I95abc9d485ba9ae89f46c3165ce4da3a52c02273
Justin Ho [Thu, 14 Oct 2010 00:44:07 +0000 (17:44 -0700)]
Updated browser launcher icons (hdpi and mdpi)
Change-Id: Ib08420f76cb8eea3da323bfd92af9fccc94729ae
Justin Ho [Wed, 13 Oct 2010 03:28:45 +0000 (20:28 -0700)]
Updated Browser launcher icon
Change-Id: Id65c92a24aa7e9397a8334e72832bab85c3b7956
Leon Scroggins [Thu, 7 Oct 2010 17:51:57 +0000 (13:51 -0400)]
Remove QuickSearch shortcuts.
Bug:
3070691
Change-Id: If3a4214fea0bca8ee0b29c37d2bb67d8b3d00570
Gilles Debunne [Wed, 6 Oct 2010 16:57:35 +0000 (09:57 -0700)]
New downscaled menu assets
Change-Id: I9c7b19b814a658af6f24171a1d25f6fbfe4ab3e9
Eric Fischer [Wed, 29 Sep 2010 21:30:35 +0000 (14:30 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ie6dd559f0a21d88b791988962f7232090d721b6e
Eric Fischer [Wed, 29 Sep 2010 19:02:27 +0000 (12:02 -0700)]
Merge "Split strings with SD card references into variations." into gingerbread
Eric Fischer [Tue, 28 Sep 2010 23:34:19 +0000 (16:34 -0700)]
Split strings with SD card references into variations.
Change-Id: I0a49dba7c8340de7dc94880c3038fa2381e7a29f
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
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
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
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
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
Eric Fischer [Mon, 27 Sep 2010 19:29:07 +0000 (12:29 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 19:17:17 +0000 (12:17 -0700)]
Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: Ifb2edbc3ee166877a9f3afd6d3003b97fc569ef0
Leon Scroggins III [Mon, 27 Sep 2010 16:45:34 +0000 (12:45 -0400)]
Prevent a null pointer exception.
Bug:
3035805
Change-Id: Id6c7d2105087e3ad4b250da6d4944409d01e55a9
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:30:17 +0000 (17:30 -0700)]
reconcile froyo-release into gingerbread
Change-Id: Iec10fc8bafafab638025533501aee04d4acb9f15
Eric Fischer [Fri, 24 Sep 2010 17:23:19 +0000 (10:23 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I641b4472e0d865c5d8ac8f2bf6409d92c9e09b87
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
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
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
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
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
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
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
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
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
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
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
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.
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
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
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
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
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
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
Leon Scroggins III [Thu, 16 Sep 2010 19:30:15 +0000 (15:30 -0400)]
Prevent a null pointer exception.
Bug:
3004709
Change-Id: I0594f8725601cf0e99dd2809d3571af6bfe1a056
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
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
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
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
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.
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.
Leon Scroggins III [Tue, 14 Sep 2010 19:51:04 +0000 (12:51 -0700)]
Merge "Remove an incorrect javadoc comment." into froyo
OSDN Git Service
