OSDN Git Service
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
Leon Scroggins [Thu, 15 Apr 2010 15:10:25 +0000 (08:10 -0700)]
Merge "Use the green box's padding, and not the TitleBar's padding." into froyo
Patrick Scott [Thu, 15 Apr 2010 14:57:49 +0000 (07:57 -0700)]
Merge "Update screenshots in a background thread." into froyo
Leon Scroggins [Thu, 15 Apr 2010 14:55:02 +0000 (10:55 -0400)]
Use the green box's padding, and not the TitleBar's padding.
Bug
2566133
Change-Id: Ia780bcc74ad7317dfeea3adfc9a8c5eb4609d1f2
Patrick Scott [Wed, 14 Apr 2010 18:38:55 +0000 (14:38 -0400)]
Update screenshots in a background thread.
Bug:
2591404
Change-Id: I380c77c1144a40b955b4fff321eb75c1c0765606
Kenny Root [Thu, 15 Apr 2010 03:31:55 +0000 (20:31 -0700)]
Import revised translations
Change-Id: If6d037bcc8a78e790389dd9f573086f82966b1bc
The Android Automerger [Mon, 12 Apr 2010 22:45:30 +0000 (15:45 -0700)]
Merge branch 'froyo' into froyo-release
Shimeng (Simon) Wang [Mon, 12 Apr 2010 22:25:57 +0000 (15:25 -0700)]
Merge "Remove dangling comments from browser strings.xml." into froyo
Shimeng (Simon) Wang [Mon, 12 Apr 2010 18:47:30 +0000 (11:47 -0700)]
Remove dangling comments from browser strings.xml.
bug:
2581328
Change-Id: I650b3434ec65640e78f2fc4b99f2c56a65e0831a
The Android Automerger [Mon, 12 Apr 2010 16:45:28 +0000 (09:45 -0700)]
Merge branch 'froyo' into froyo-release
Grace Kloba [Mon, 12 Apr 2010 05:53:42 +0000 (22:53 -0700)]
More aggressively free up the background tabs when
memory is low. Instead of free one tab per onLowMemory,
free half of opened tabs as onLowMemory is not called
as often as before.
Fix http://b/issue?id=
2583335
Patrick Scott [Fri, 9 Apr 2010 16:43:26 +0000 (12:43 -0400)]
Create the bookmark adapter in a background thread.
Handling it asynchronously prevented an ANR but it still took forever with large
databases.
Bug:
2581894
Change-Id: I273375e439d7e3ac048728aabb39c6920fa87e5a
Leon Scroggins III [Thu, 8 Apr 2010 14:34:14 +0000 (10:34 -0400)]
Use new assets for green box in voice title bar.
The new assets have a better margin to match the other
search field textfields. Also update title_voice.xml to use a
pressed state that matches the new assets. In TitleBar.java,
do not clear out the vertical padding in voice search mode.
Bug
2566133
Change-Id: Icb15d0660d2f06363e66adbdd92537e34b90b64e
Kenny Root [Wed, 7 Apr 2010 23:05:59 +0000 (16:05 -0700)]
Remove "Do not translate" and restore translations
Some "Do not translate" comments were inadvertently left when removing
unused strings which made the translation tools skip the next string
entry. This removes those comments and restores the translations for the
missing strings.
Bug:
2579112
Change-Id: I731217d4cf6581885c122fefd180133c243fa1f7
The Android Automerger [Thu, 8 Apr 2010 15:27:19 +0000 (08:27 -0700)]
Merge branch 'froyo' into froyo-release
Leon Scroggins [Wed, 7 Apr 2010 21:59:48 +0000 (17:59 -0400)]
Treat voice searches from within the browser differently
from those initiated from outside the browser.
Fix for http://b/issue?id=
2546173
For a voice search initiated from outside the browser, an appId
will be attached. In that case, try to reuse the application tab.
In TabControl.recreateWebView, treat this as if the url does not
match the old url, so a new WebView will be created with a fresh
history list, and the back key will exit the browser. However, if
no appId is provided, simply reuse the current tab. In this case,
the history list will be preserved, and pressing the back key will
return to earlier voice searches.
Change-Id: I9ec1efd56454ba94eb2bc348c4476fb6bd025dad
Cary Clark [Thu, 8 Apr 2010 13:11:28 +0000 (09:11 -0400)]
use 565 bitmap instead of 4444 to improve quality
http://b/
2577416
Change-Id: I74f00f700bbe7bc1be9b790e075fec111765341c
The Android Automerger [Wed, 7 Apr 2010 15:12:01 +0000 (08:12 -0700)]
Merge branch 'froyo' into froyo-release
Patrick Scott [Tue, 6 Apr 2010 20:36:12 +0000 (16:36 -0400)]
Update bookmark favicons in the background.
Bug:
2573890
Change-Id: I7c9ebfd1b561c40d806988e65f7e89d5cd283f89
The Android Automerger [Mon, 5 Apr 2010 15:02:49 +0000 (08:02 -0700)]
Merge branch 'froyo' into froyo-release
Grace Kloba [Sat, 3 Apr 2010 06:37:26 +0000 (23:37 -0700)]
Show the faked title bar even content height is 0.
Otherwise for the new window, we may have a long
delay for showing progress which is only shown in
the faked title bar now.
I verified that we still get the benefit from the
previous change by moving the faked title bar from
sub panel to its own window.
Fix http://b/issue?id=
2568875
Guang Zhu [Fri, 2 Apr 2010 20:05:08 +0000 (13:05 -0700)]
Merge "add launch performance test for browser" into froyo
Mike LeBeau [Thu, 1 Apr 2010 21:57:10 +0000 (14:57 -0700)]
Add "android.speech.extras.SEND_APPLICATION_ID_EXTRA"=false to the
voice search intent, as discussed in http://b/
2546173
Change-Id: I60650d096a874cfe089a4ba691c9ae44802f2419
Guang Zhu [Thu, 1 Apr 2010 18:21:43 +0000 (11:21 -0700)]
add launch performance test for browser
this is part of a larger effort to collect app launch performance for the platform.
Change-Id: Id7159c67b0d746c9a109988e05f53be6a10921af
The Android Automerger [Thu, 1 Apr 2010 15:07:37 +0000 (08:07 -0700)]
Merge branch 'froyo' into froyo-release
Ben Murdoch [Thu, 1 Apr 2010 14:07:41 +0000 (15:07 +0100)]
Update the JNI bindings unit test in light of b/
2540502
Change-Id: I166331ce198fba188df5365695a20588870374c4
Leon Scroggins [Wed, 31 Mar 2010 19:11:47 +0000 (12:11 -0700)]
Merge "Lessen the difference in appearance of title bar during load." into froyo
Leon Scroggins [Wed, 31 Mar 2010 18:50:47 +0000 (14:50 -0400)]
Lessen the difference in appearance of title bar during load.
Change to using textfield_search_empty assets, which have margin
values that better match the assets used outside of a load. As
a result, there is no longer a need to edit the LayoutParams in
TitleBar.java. However, do set the padding in TitleBar.java, since
it needs to be set for each of the different backgrounds used.
Fixes http://b/issue?id=
2558919
Change-Id: Idf0d8bea59bcc76c32e1e03bf736a4b64bf31887
The Android Automerger [Wed, 31 Mar 2010 15:07:17 +0000 (08:07 -0700)]
Merge branch 'froyo' into froyo-release
Ben Murdoch [Wed, 31 Mar 2010 11:26:42 +0000 (04:26 -0700)]
Merge "Add a test for verifying the JS -> Java bindings." into froyo
Grace Kloba [Tue, 30 Mar 2010 23:00:26 +0000 (16:00 -0700)]
Reduce reported "Displayed activity com.android.browser/.BrowserActivity"
time from random 3~5s to consistent ~2.5s assuming
no apps need to be killed in the start up.
Move the faked title bar to its own Window instead
of the sub panel of the main window. This way Browser
can start when its main window is ready, instead of
waiting for both windows are ready. Also we don't
depend on mBrowserFrameLayout for the y position.
We also don't need to check decorView's window token.
Delay the fake tile bar starting time until the main
window is ready. This way we ensure the main window
will be drawn when it is ready. Otherwise the window
manager will wait until all the current windows are
ready before showing them.
Fix http://b/issue?id=
2548712
Patrick Scott [Tue, 30 Mar 2010 17:57:29 +0000 (13:57 -0400)]
Draw the touch icon better.
Use the application icon size to get the correct dimensions. Copy the bitmap to
the correct size and change the config to allow alpha.
This doesn't fix the part of the bug that prefers precomposed over regular touch
icons. That requires a change to frameworks/base.
Bug:
2546984
Change-Id: Ifee474cd3540456383f84bf563bc92df63e0b010
Leon Scroggins III [Tue, 30 Mar 2010 18:06:10 +0000 (11:06 -0700)]
Merge "Prevent an IllegalStateException." into froyo