OSDN Git Service
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
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
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.
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 [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
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
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
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
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
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
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
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
Eric Fischer [Wed, 4 Aug 2010 17:41:16 +0000 (10:41 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Icbcc05f50ed8489eb31c6670fceba27a22b562e4
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
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
Leon Scroggins III [Tue, 29 Jun 2010 21:11:29 +0000 (17:11 -0400)]
Log if a user clicked on a link from voice search results.
Bug:
2803980
Change-Id: Ide6c4411e0468c7156d05fad28e4b24cf1e746ce
The Android Open Source Project [Tue, 29 Jun 2010 21:34:50 +0000 (14:34 -0700)]
set up fast-forward from froyo-release to gingerbread
Change-Id: I3db260aa3aa968bdcacab2add7756d666d4a8a25
Leon Scroggins [Fri, 25 Jun 2010 18:49:24 +0000 (14:49 -0400)]
Actually remove the subwindow.
Bug
2748202
Change-Id: I133e12167cb8b68d0fc7e0f0d3c9bfe727334e81
Guang Zhu [Wed, 23 Jun 2010 22:18:32 +0000 (15:18 -0700)]
emma code coverage filter for Browser
add emma code coverage filter to exclude com.android.common.* from
code coverage report because it's not actually in Browser source.
Change-Id: Ibd47eeeb5fec6a980ad27c24022dc939b06d6d1f
Kenny Root [Mon, 21 Jun 2010 15:58:46 +0000 (08:58 -0700)]
am
88ec7e48: Import revised translations
Merge commit '
88ec7e4870391af9a193957222fd6ded16b9c546' into gingerbread
* commit '
88ec7e4870391af9a193957222fd6ded16b9c546':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 01:57:12 +0000 (18:57 -0700)]
Import revised translations
Change-Id: I8ef66d4fb3a5de2d82dcc13832d4d9ccdf19ef91
Guang Zhu [Wed, 16 Jun 2010 21:49:00 +0000 (14:49 -0700)]
add check for FileNotFoundException
make the test fail gracefully instead of throwing exception. because
otherwise it interrupts test run.
Change-Id: Ia2b92355db83cd13c55263f0699b29c10e00ea96
Guang Zhu [Tue, 4 May 2010 22:46:17 +0000 (15:46 -0700)]
improvement and fixes for bindings test (DO NOT MERGE)
* the name "testComplete" will cause test runner to actually execute it as a
test case, which is not the intention here, changed to "notifyComplete"
* the test depends on "/sdcard/bindings_test.html". since the same file is
already being carried in the apk as asset, added a setup/teardown step to
extract the file. this removes manual setup step for the tests.
Change-Id: I74dc42a7ca0442a84910441e535d950c049efc98
The Android Automerger [Thu, 10 Jun 2010 23:19:15 +0000 (16:19 -0700)]
Merge branch 'froyo' into froyo-release
Kenny Root [Thu, 10 Jun 2010 05:33:20 +0000 (22:33 -0700)]
am
d72e5655: Import revised translations
Merge commit '
d72e5655ac29a4a11d4a97601bebc67a1374290e' into kraken
* commit '
d72e5655ac29a4a11d4a97601bebc67a1374290e':
Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:27:42 +0000 (22:27 -0700)]
Import revised translations
Change-Id: Ic53da3c82a9c2107063fcb1a477c91efc74da613
The Android Automerger [Mon, 17 May 2010 22:19:01 +0000 (15:19 -0700)]
Merge branch 'froyo' into froyo-release
Kenny Root [Mon, 17 May 2010 18:59:40 +0000 (11:59 -0700)]
am
f7bd7ee8: Import revised translations
Merge commit '
f7bd7ee84d6588b43758909706969f432994825f' into froyo-plus-aosp
* commit '
f7bd7ee84d6588b43758909706969f432994825f':
Import revised translations
Kenny Root [Mon, 17 May 2010 18:25:15 +0000 (11:25 -0700)]
Import revised translations
Change-Id: Ie400c25c714f97c9ff7b9d1cc1b26d368743af1a
The Android Open Source Project [Wed, 12 May 2010 18:06:32 +0000 (11:06 -0700)]
merge from open-source master
Change-Id: I53af51f3c14806f2302daeea62a125621851d2cc
Jean-Baptiste Queru [Tue, 11 May 2010 16:05:28 +0000 (09:05 -0700)]
Merge "Prevent browser becoming unresponsive when surfing to a URL with many %-escaped characters."
Mats Mattsson [Fri, 12 Feb 2010 14:28:23 +0000 (15:28 +0100)]
Prevent browser becoming unresponsive when surfing to a URL with many %-escaped characters.
Surfing to a webpage with many %-characters in the URL will hang the browser for several minutes.
To reproduce:
String url =
"http://zh.wikipedia.org/wiki/%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5
%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8?%E4%B8%AD%E5%8D%8E
%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94
%BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5
%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E
%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94
%BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5
%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E
%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94
%BF%E5%8C%BA%E5%88%97%E8%A1%A8%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD%E5
%8E%BF%E7%BA%A7%E4%BB%A5%E4%B8%8A%E8%A1%8C%E6%94%BF%E5%8C%BA%E5%88%97%E8%A1%A8";
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
intent.addCategory(Intent.CATEGORY_BROWSABLE);
startActivity(intent);
The raw URL is used to match previously visited URLs in the history database with the SQL LIKE operator.
The LIKE operator does however treat %-signs as wildcards and an exhaustive and unnecessary search is made.
The fix uses the ESCAPE functionality of LIKE to treat the %-signs in the URL as non-wildcards.
As underscore is treated as also treated as a wildcard, it is escaped as well.
Change-Id: I20d182bc76b339c49ad23acc1c4d735414310b04
The Android Open Source Project [Mon, 10 May 2010 19:20:49 +0000 (12:20 -0700)]
merge from open-source master
Change-Id: Iaaf00603ec92506775c28cc6a4cc587d3a02939a
Jean-Baptiste Queru [Mon, 10 May 2010 16:38:30 +0000 (09:38 -0700)]
Merge "Fixing a monkey crash in the BrowserSettings"
The Android Open Source Project [Wed, 5 May 2010 23:10:46 +0000 (16:10 -0700)]
merge from open-source master
Change-Id: Idaf3d86b8b54f80ed31e2ef7e7a7ea9d566c43e7
Jean-Baptiste Queru [Tue, 4 May 2010 18:36:26 +0000 (11:36 -0700)]
Merge "Removed findbugs warnings from BrowserActivity."
The Android Open Source Project [Tue, 4 May 2010 00:23:01 +0000 (17:23 -0700)]
merge from open-source master
Change-Id: I5dbf9446b7d4409ec843ee800c82ec06bda7c8db
The Android Automerger [Mon, 3 May 2010 15:10:08 +0000 (08:10 -0700)]
Merge branch 'froyo' into froyo-release
Jean-Baptiste Queru [Thu, 29 Apr 2010 23:14:52 +0000 (16:14 -0700)]
Merge "Fixed FindBugs warnings in BrowserBackupAgent.java"
Kenny Root [Thu, 29 Apr 2010 22:25:53 +0000 (15:25 -0700)]
Import revised translations
Change-Id: Ia3b502bb0fc75f6904d76b374e6404e068f51d31
Jean-Baptiste Queru [Thu, 29 Apr 2010 14:26:47 +0000 (07:26 -0700)]
Merge "Optimized Maps usage by adding explicit types and improved performance"
The Android Automerger [Wed, 28 Apr 2010 19:21:08 +0000 (12:21 -0700)]
Merge branch 'froyo' into froyo-release
Kenny Root [Wed, 28 Apr 2010 16:27:41 +0000 (09:27 -0700)]
Fix mismatched tag in strings
Bug:
2633674
Change-Id: Ifb596ec9604cc1860e6d686610dd4876192f4a88
Kenny Root [Tue, 27 Apr 2010 19:31:52 +0000 (12:31 -0700)]
Import revised translations
Change-Id: I34a5ad5422d17c6547da85be40006009c238d40e
Kenny Root [Tue, 27 Apr 2010 21:22:32 +0000 (14:22 -0700)]
Do not translate Latin-1 setting
The string used for comparison against actual encoding values was being
translated into different languages which made it not match any
available possible values.
This change corrects that and also adds in the case to use "SHIFT_JIS"
that the Japanese translators had put in when it was translatable.
Change-Id: I276bf4c8b2a150e9c2926633ed972bf3f3423831
Henrik Baard [Tue, 27 Apr 2010 06:26:06 +0000 (08:26 +0200)]
Optimized Maps usage by adding explicit types and improved performance
Optimized the use of Maps for improved runtime performance, the
site object can be accessed directly.
Change-Id: Icfcd020541e806427c4ac7ba0817d30b2c7eb9a5
Henrik Baard [Tue, 27 Apr 2010 06:20:57 +0000 (08:20 +0200)]
Fixed FindBugs warnings in ErrorConsoleView.java
Save some memory by marking ErrorConsoleMessageList static.
Change-Id: I6034eb295fde9639073f2c15c872743afd5aefe1
The Android Automerger [Mon, 26 Apr 2010 18:44:47 +0000 (11:44 -0700)]
Merge branch 'froyo' into froyo-release
Leon Scroggins [Mon, 26 Apr 2010 17:36:01 +0000 (13:36 -0400)]
Do not try to open a file that could not be downloaded.
Bug
2629391
Change-Id: If4edf356d98f90baf9fa0168d995dc0793ff90ae
Leon Scroggins [Fri, 23 Apr 2010 18:58:16 +0000 (14:58 -0400)]
Move queryBookmarksForUrl to background thread.
Bug
2611964
Change-Id: I8f69ec42fbf880d031cfc2372cffd9719db4e280
The Android Automerger [Wed, 21 Apr 2010 17:46:41 +0000 (10:46 -0700)]
Merge branch 'froyo' into froyo-release
Henrik Baard [Wed, 21 Apr 2010 10:36:33 +0000 (12:36 +0200)]
Fixed FindBugs warnings in BrowserBackupAgent.java
This makes sure that streams are closed in corner cases.
Change-Id: I185c0dbddc09338de3a63eab22c57afb8d1a9c1a
Henrik Baard [Wed, 21 Apr 2010 10:31:47 +0000 (12:31 +0200)]
Removed findbugs warnings from BrowserActivity.
Change-Id: I4b5bc7b66ffb44483d0783f05b02558f709382ee
Henrik Baard [Fri, 19 Feb 2010 15:28:06 +0000 (16:28 +0100)]
Fixing a monkey crash in the BrowserSettings
Monkey crash, sometimes the function getCurrentTopWebView()
can return null causing a crash in clearFormData().
Change-Id: I27d38fafd448a3922a09bbdf2b31ab6f78fecf88
Grace Kloba [Tue, 20 Apr 2010 20:46:42 +0000 (13:46 -0700)]
Now mBookmarksAdapter is created asynchronously,
we need to check null before using it.
Fix http://b/issue?id=
2610515
Grace Kloba [Tue, 20 Apr 2010 18:54:45 +0000 (11:54 -0700)]
Merge "Using ViewStub to defer the inflation of GeolocationPermissionsPrompt until we first show it. This should shave 5% of Browser start up time." into froyo
Grace Kloba [Tue, 20 Apr 2010 18:07:50 +0000 (11:07 -0700)]
Using ViewStub to defer the inflation of GeolocationPermissionsPrompt until we first show it.
This should shave 5% of Browser start up time.
Fix http://b/issue?id=
2604295
Leon Scroggins [Mon, 19 Apr 2010 20:53:49 +0000 (16:53 -0400)]
Click on notification for unfinished download, open downloads page.
BrowserActivity:
Use OpenDownloadReceiver as class name, so that it will handle the
notification from download manager.
OpenDownloadReceiver:
If the download is not complete, show the downloads page.
Bug
2606772
Change-Id: Ifeeac0943650552c6da232cf98088bbf958fd403
The Android Automerger [Mon, 19 Apr 2010 19:50:22 +0000 (12:50 -0700)]
Merge branch 'froyo' into froyo-release
Leon Scroggins [Thu, 15 Apr 2010 15:01:53 +0000 (11:01 -0400)]
When loading a new Intent, remove appTab association.
Bug
2598904
Change-Id: Ib4ef625606ccdae4b24efd0761f416e4851ca800
The Android Automerger [Thu, 15 Apr 2010 15:12:22 +0000 (08:12 -0700)]
Merge branch 'froyo' into froyo-release