OSDN Git Service
Leon Scroggins [Wed, 3 Mar 2010 17:03:01 +0000 (09:03 -0800)]
Merge "Do not allow our resend/dontresend messages to be sent twice."
Cary Clark [Wed, 3 Mar 2010 15:11:44 +0000 (10:11 -0500)]
refactor find state and scrolling
Explicitly call webkit to note when find dialog is visible,
to dismiss the find dialog and clear to matches.
Companion fix in frameworks/base and external/webkit
http://b/
2370069
Bjorn Bringert [Tue, 2 Mar 2010 11:20:29 +0000 (11:20 +0000)]
Use SUGGEST_COLUMN_TEXT_2_URL in browser suggestions
Before, the Browser used an HTML <font> tag to style
URLs in history / bookmark suggestions. The color used
was a hidden framework resource, it assumed that
the caller knew to interpret HTML mark-up, and it only
worked on a light colored background.
Now a separate column is used for displayed URLs, letting
the caller decide how to style URLs.
Part of the fix for http://b/issue?id=
2380681
Change-Id: I1c3981de22bccf9cba2f2b903225ef1b50226758
Leon Scroggins [Tue, 2 Mar 2010 22:57:40 +0000 (17:57 -0500)]
Do not allow our resend/dontresend messages to be sent twice.
Fix for http://b/issue?id=
2340086
Leon Scroggins [Tue, 2 Mar 2010 21:01:49 +0000 (16:01 -0500)]
Do not insert duplicate urls into the browser database.
Move the logic for finding similar URLs to frameworks/base,
and use it in addBookmark. In BrowserActivity, call smartUrlFilter
before calling updateVisitedHistory, so the '/' will be appended
before adding to the database.
Part of fix for http://b/issue?id=
2442391
Depends on a change to frameworks/base
Brian Carlstrom [Tue, 2 Mar 2010 19:09:03 +0000 (11:09 -0800)]
Merge "SslCertificate should provide Date interface"
Brian Carlstrom [Tue, 2 Mar 2010 18:02:34 +0000 (10:02 -0800)]
SslCertificate should provide Date interface
While working on out openssl code, I found a Y2k bug that the dates
from invalidate certificates could be shown as 1909 instead of 2009.
The reason was because SslCertificate/BrowserActivity passed the
values around as Strings even though the started as Dates (from
X509Certificate) and were converted backed to Dates before
presentation by BrowserActivity's reformatCertificateDate.
SslCertificate now maintains date fields internally as Date objects
without converting them to Strings. The constructor and String
accessors, which are now @deprecated, now specify the format as an ISO
8601 date string which uses 4 digit years.
BrowserActivity now reformatCertificateDate is now simply
formatCertificateDate and no longer has to convert from String to Date
and back to String to get proper Locale formatting.
CTS SslCertificateTest also updated.
Grace Kloba [Tue, 2 Mar 2010 03:51:49 +0000 (19:51 -0800)]
Change where "Search for web"'s position.
If there is a matching history/bookmark, it will be
in the second place. Otherwise it will be in the first
place.
Fix http://b/issue?id=
2314166
Leon Scroggins [Mon, 1 Mar 2010 16:49:30 +0000 (08:49 -0800)]
Merge "Remove deleted files from the list of browser downloads."
Leon Scroggins [Fri, 26 Feb 2010 22:58:31 +0000 (17:58 -0500)]
Remove deleted files from the list of browser downloads.
Fix for http://b/issue?id=
2469085
Eric Fischer [Sat, 27 Feb 2010 01:27:31 +0000 (17:27 -0800)]
Import new translations.
Shimeng (Simon) Wang [Fri, 26 Feb 2010 21:00:09 +0000 (13:00 -0800)]
Merge "Remove unused resources."
Leon Scroggins [Fri, 26 Feb 2010 20:14:57 +0000 (12:14 -0800)]
Merge "If a download finishes while the contextmenu is open, update it."
Leon Scroggins [Fri, 26 Feb 2010 19:16:41 +0000 (14:16 -0500)]
If a download finishes while the contextmenu is open, update it.
The contextmenu for a successful download should be different from
the one for a download in progress. When the download completes,
remove the open contextmenu and open a new one, with the appropriate
options.
Fixes http://b/issue?id=
2387032
Shimeng (Simon) Wang [Fri, 26 Feb 2010 19:40:27 +0000 (11:40 -0800)]
Remove unused resources.
This is generated by removeunusedresources tool.
Compiled and tested on passion/opal. Compiled for voles.
Bug:
2456707
Shimeng (Simon) Wang [Fri, 26 Feb 2010 04:42:13 +0000 (20:42 -0800)]
Revert "Remove unused strings."
This reverts commit
b0318df3b3f13fc61b97c1309e7426b9a586e603.
modified: res/values-cs/strings.xml
modified: res/values-da/strings.xml
modified: res/values-de/strings.xml
modified: res/values-el/strings.xml
modified: res/values-es-rUS/strings.xml
modified: res/values-es/strings.xml
modified: res/values-fr/strings.xml
modified: res/values-it/strings.xml
modified: res/values-ja/strings.xml
modified: res/values-ko/strings.xml
modified: res/values-nb/strings.xml
modified: res/values-nl/strings.xml
modified: res/values-pl/strings.xml
modified: res/values-pt-rPT/strings.xml
modified: res/values-pt/strings.xml
modified: res/values-ru/strings.xml
modified: res/values-sv/strings.xml
modified: res/values-tr/strings.xml
modified: res/values-zh-rCN/strings.xml
modified: res/values-zh-rTW/strings.xml
modified: res/values/strings.xml
Shimeng (Simon) Wang [Fri, 26 Feb 2010 01:56:44 +0000 (17:56 -0800)]
Merge "Remove unused strings."
Patrick Scott [Thu, 25 Feb 2010 19:44:40 +0000 (11:44 -0800)]
Merge "Update the shortcut icons with new assets."
Patrick Scott [Thu, 25 Feb 2010 19:40:11 +0000 (14:40 -0500)]
Update the shortcut icons with new assets.
Position the favicon in the (almost) center of the asset.
Bug:
2168561
Dianne Hackborn [Thu, 25 Feb 2010 04:03:04 +0000 (20:03 -0800)]
Update to reflect android-common no longer in framework.
Patrick Scott [Fri, 19 Feb 2010 15:10:10 +0000 (10:10 -0500)]
Remove our dependency on gsf.
Hardcode the account values when looking up the hosted domain. We also hardcode
the settings uri for looking up the client id. This is the better solution for
now because the client id is written only once. If the partner setup were to
write the value to the BrowserProvider, it would get erased if the user decided
to reset the Browser.
Leon Scroggins [Tue, 23 Feb 2010 22:26:37 +0000 (17:26 -0500)]
If a tab was opened solely to download a file, close the tab.
Fix for http://b/issue?id=
2217707
Leon Scroggins [Wed, 24 Feb 2010 18:43:11 +0000 (10:43 -0800)]
Merge "Update the margin for the right icon."
Shimeng (Simon) Wang [Wed, 24 Feb 2010 18:26:26 +0000 (10:26 -0800)]
Remove unused strings.
This is generated by the remove_usused_strings script.
Bug:
2456707
Leon Scroggins [Wed, 24 Feb 2010 17:19:15 +0000 (12:19 -0500)]
Update the margin for the right icon.
The drawables for the right icon have changed, so update the margin,
using the new margins in search_bar.xml as a guide.
Fixes http://b/issue?id=
2463552
Mike Reed [Wed, 24 Feb 2010 16:12:54 +0000 (11:12 -0500)]
disable mr-stretch (at least for now)
John Spong [Wed, 24 Feb 2010 01:15:08 +0000 (17:15 -0800)]
Merge "Implement test to iterate over list of URLs and store load times."
Leon Scroggins [Tue, 23 Feb 2010 19:49:04 +0000 (11:49 -0800)]
Merge "Backup bookmarks when a new bookmark is added."
Leon Scroggins [Tue, 23 Feb 2010 19:28:51 +0000 (14:28 -0500)]
Backup bookmarks when a new bookmark is added.
Fix for http://b/issue?id=
2332942
Paul Westbrook [Fri, 12 Feb 2010 18:33:29 +0000 (10:33 -0800)]
Change the browser to use the standard EXTRA_SUBJECT intent extra
when sharing a page. This allows Email and Gmail to prefill the
subject of the message with the title of the page
Leon Scroggins [Mon, 22 Feb 2010 21:54:14 +0000 (16:54 -0500)]
When long pressing on title bar, do not use WebView in onCreateContextMenu
Fix for http://b/issue?id=
2456405
Override TitleBar::createContextMenu to call BrowserActivity's onCreateContextMenu
directly, so that WebView is ignored, and we only get the options for TitleBar.
Andrei Popescu [Tue, 9 Feb 2010 16:59:58 +0000 (16:59 +0000)]
Implement test to iterate over list of URLs and store load times.
Also patch makefiles to correctly build tests and allow for hidden API calls in test.
Bjorn Bringert [Mon, 22 Feb 2010 22:07:14 +0000 (22:07 +0000)]
Add some unit tests for BrowserProvider
This includes a test for http://b/issue?id=
2152749
fails, since that bug has not yet been fixed.
Change-Id: Ie2a71fe056528975279548f52c69953cef4dca1b
Andrei Popescu [Fri, 19 Feb 2010 15:44:13 +0000 (15:44 +0000)]
Change the way the browser detects connectivity changes.
Fix b:
2454643
Patrick Scott [Fri, 19 Feb 2010 15:30:39 +0000 (07:30 -0800)]
Merge "Remove tabs."
Patrick Scott [Fri, 19 Feb 2010 15:19:01 +0000 (10:19 -0500)]
Remove tabs.
Bjorn Bringert [Thu, 18 Feb 2010 22:25:36 +0000 (14:25 -0800)]
Merge "Use SearchManager.getWebSearchActivity() for web suggestions"
Bjorn Bringert [Thu, 18 Feb 2010 21:59:21 +0000 (21:59 +0000)]
Use SearchManager.getWebSearchActivity() for web suggestions
This makes sure that the web suggestions come from the global
search package. With the old code, web suggestions could break
if some random app had a default intent filter for ACTION_WEB_SEARCH.
Change-Id: I67ecbe90433c01dc7a51921573c584d888a819d6
Ben Murdoch [Thu, 18 Feb 2010 19:21:35 +0000 (11:21 -0800)]
Merge "When a second database is created on an origin, ensure that the quota for that origin is large enough to cover both databases (old and new)."
Ben Murdoch [Tue, 9 Feb 2010 17:03:07 +0000 (17:03 +0000)]
When a second database is created on an origin, ensure that the quota for that origin is large enough to cover both databases (old and new).
Fix for
2417477
Change-Id: I914b29a5f90a11fe3c3dc9a927a8720197b03560
Leon Scroggins [Wed, 17 Feb 2010 21:32:28 +0000 (16:32 -0500)]
When loading a new page from the UI side, update the title bar to the new url.
Fixes http://b/issue?id=
2379215
Leon Scroggins [Wed, 17 Feb 2010 16:29:48 +0000 (11:29 -0500)]
Remove style for WebTextView.
No longer needed now that this has been moved to a framework style.
Leon Scroggins [Tue, 16 Feb 2010 17:33:55 +0000 (12:33 -0500)]
Clear omnibox when pressing search key.
Fix for http://b/issue?id=
2442426
No longer override onSearchRequested, so that pressing the search
key behaves normally. For touching the title bar, use the old
onSearchRequested (renamed to editUrl).
Christopher Tate [Fri, 12 Feb 2010 23:54:30 +0000 (15:54 -0800)]
Remove now-obsolete BACKUP_DATA permission
Change-Id: Ib92b81bb367a053e38cb98a564cb6711f2b9d9ef
Andrei Popescu [Tue, 9 Feb 2010 16:59:58 +0000 (16:59 +0000)]
Implement navigator.isApplicationInstalled() API
This CL contains the comminication with the package manager.
Fix b:
2371005
Jeff Hamilton [Thu, 11 Feb 2010 22:25:47 +0000 (16:25 -0600)]
Add an original-package tag that matches the real package name.
Change-Id: I7a4d4004e0643409312b9155b7c8be281ec5c1c1
Bjorn Bringert [Tue, 9 Feb 2010 12:11:27 +0000 (12:11 +0000)]
Add geolocation permissions to BrowserProvider
The old hidden Google-specific framework setting
Settings.Secure.USE_LOCATION_FOR_SERVICES has been removed
and replaced by a setting in GoogleSettingsProvider.
Since Browser can't read from GoogleSettingsProvider,
I've instead changed SetupWizard and the Google search settings
(in GoogleQuickSearchBox) to write to this new geolocation
content provider in the Browser.
The geolocation permission content provider is write-only, and
requires a signatureOrSystem permission to write to. So
only system apps can add geolocation permissions,
and the only system apps that do so are SetupWizard and
GoogleQuickSearchBox.
Bug: http://b/issue?id=
2428694
Change-Id: I0be5dbf4d99d07ca13b07fb299155c5aa17a51bd
Bjorn Bringert [Wed, 10 Feb 2010 14:22:12 +0000 (14:22 +0000)]
Use Search.SOURCE from android-common
The SOURCE (search source identifier) constant is moving
from hidden in android.app.SearchManager to com.android.common.Search.
Part of http://b/issue?id=
2429556
Change-Id: I4eee5dbac6f0cee2947175915186a17d06dd9fec
Leon Scroggins [Tue, 9 Feb 2010 21:32:38 +0000 (13:32 -0800)]
Merge "send broadcast intents to voice search for logging purposes"
Leon Scroggins [Tue, 9 Feb 2010 20:31:26 +0000 (15:31 -0500)]
send broadcast intents to voice search for logging purposes
Fix for http://b/issue?id=
2390720
Eugene Koh [Tue, 9 Feb 2010 20:23:48 +0000 (12:23 -0800)]
Merge "Update mdpi resources with 2.0 style icons"
Leon Scroggins [Tue, 9 Feb 2010 19:59:20 +0000 (14:59 -0500)]
Use new assets with desaturated green.
Fix for http://b/issue?id=
2390713
Leon Scroggins [Mon, 8 Feb 2010 22:35:59 +0000 (17:35 -0500)]
If the user submits the same search again from voice search, stay in place.
Fix for http://b/issue?id=
2428574
Leon Scroggins [Mon, 8 Feb 2010 19:39:34 +0000 (14:39 -0500)]
Do not ellipsize the title bar in voice search mode.
Fix for http://b/issue?id=
2427828
Apparently TextView, when set to ellipsize="end", will truncate
before going to three lines. Turn off truncation when in voice
search mode.
Leon Scroggins [Mon, 8 Feb 2010 19:08:30 +0000 (14:08 -0500)]
Trim the extra whitespace before passing to SearchDialog.
Fixes http://b/issue?id=
2427810
Leon Scroggins [Mon, 8 Feb 2010 15:36:05 +0000 (07:36 -0800)]
Merge "Update look of title bar when in voice search mode."
Bai Tao [Sat, 6 Feb 2010 08:11:26 +0000 (16:11 +0800)]
Update mdpi resources with 2.0 style icons
The Android Open Source Project [Fri, 5 Feb 2010 22:17:14 +0000 (14:17 -0800)]
am
9df17a63: am
066e5308: reconcile main tree with open-source eclair
Merge commit '
9df17a63e52390bd56b955611cdde28ca8e231ef'
* commit '
9df17a63e52390bd56b955611cdde28ca8e231ef':
android-2.1_r1 snapshot
Leon Scroggins [Fri, 5 Feb 2010 21:41:49 +0000 (16:41 -0500)]
Update look of title bar when in voice search mode.
Fix for http://b/issue?id=
2390713
Add the arcs to the end of the title.
Change to multiline.
Use the standard long press look.
The Android Open Source Project [Fri, 5 Feb 2010 16:46:03 +0000 (08:46 -0800)]
am
066e5308: reconcile main tree with open-source eclair
Merge commit '
066e5308dc23b17b3f50ab3459b06ae6ec4bc12a' into eclair-plus-aosp
* commit '
066e5308dc23b17b3f50ab3459b06ae6ec4bc12a':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Leon Scroggins [Fri, 5 Feb 2010 14:27:16 +0000 (06:27 -0800)]
Merge "Launch intents to open/delete downloads, and handle them in the browser."
Leon Scroggins [Tue, 26 Jan 2010 19:15:01 +0000 (14:15 -0500)]
Launch intents to open/delete downloads, and handle them in the browser.
Initial work for http://b/issue?id=
2384554 : showing all downloads in the
browser. On the BrowserDownloadPage, no longer rely on the filename,
since once the Browser shows downloads from other applications, the
filenames for those downloads will not be available, and this way
all downloads are handled the same.
Other applications which download files will need to handle the same
Intents as OpenDownloadReceiver in order to open/delete them from
the BrowserDownloadPage.
OpenDownloadReceiver is also a necessary step towards moving the
BrowserDownloadPage into its own application, if we ultimately
decide to do that.
Ben Murdoch [Thu, 28 Jan 2010 15:19:59 +0000 (15:19 +0000)]
Use the extended ConsoleMessage class to populate the Error Console, and in colour!
Also tag the messages from the console that we pipe to the system log with Browser rather than Tab to match previous behavior and make filtering the logs easier (See b/
2376873)
Change-Id: I1e2bb03c5b4e57e531a97acaa17d475224598209
Jeff Hamilton [Thu, 4 Feb 2010 05:36:48 +0000 (21:36 -0800)]
Merge "This should fix the build."
Jeff Hamilton [Thu, 4 Feb 2010 05:30:25 +0000 (23:30 -0600)]
This should fix the build.
Change-Id: Ib03e2d8500a53b5f8742b19415a421a602947ec3
Leon Scroggins [Tue, 2 Feb 2010 21:10:57 +0000 (16:10 -0500)]
Handle voice search it provides html content to display.
Fix for http://b/issue?id=
2407710
Kristian Monsen [Tue, 2 Feb 2010 18:17:46 +0000 (10:17 -0800)]
Merge "Logging page load time"
Kristian Monsen [Tue, 2 Feb 2010 13:37:09 +0000 (13:37 +0000)]
Logging page load time
Added a log message when a page is loaded. It will handle redirects as a new page load.
Andrei Popescu [Tue, 2 Feb 2010 00:30:38 +0000 (00:30 +0000)]
Implement support for V8 counters
Leon Scroggins [Mon, 1 Feb 2010 21:14:11 +0000 (16:14 -0500)]
Use the constants defined in RecognizerResultsIntent for voice search.
Kristian Monsen [Mon, 1 Feb 2010 18:41:07 +0000 (18:41 +0000)]
Log when bookmarks are added
Log when the user add a bookmark, sending the url of the bookmark and how the bookmark was added
Leon Scroggins [Thu, 28 Jan 2010 20:12:40 +0000 (15:12 -0500)]
Handle the voice search intent.
Once the voice search intent has been handled, the title bar
background changes to green, and touching it displays other voice
search possibilities.
Fixes http://b/issue?id=
2390686
The Android Open Source Project [Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Mike Reed [Fri, 29 Jan 2010 16:31:39 +0000 (11:31 -0500)]
roll MR3 stretchy changes into master
Grace Kloba [Thu, 28 Jan 2010 19:44:38 +0000 (11:44 -0800)]
Move the "Search web ..." to the first in the
suggestion list.
http://b/issue?id=
2314166
Grace Kloba [Thu, 28 Jan 2010 19:39:15 +0000 (11:39 -0800)]
Should trust my own code
Patrick Scott [Thu, 28 Jan 2010 19:18:01 +0000 (11:18 -0800)]
Merge "Demo widget using the UrlRendererService for server-side rendering of urls."
Patrick Scott [Tue, 8 Dec 2009 13:51:33 +0000 (08:51 -0500)]
Demo widget using the UrlRendererService for server-side rendering of urls.
Mike Reed [Thu, 28 Jan 2010 18:47:03 +0000 (10:47 -0800)]
am
5b739d81: (-s ours) am
3d3c1985: disable mr stretchy, but leave the support code around for now
Merge commit '
5b739d8102982d24924aae0dbbb74b9fbc1c46ae'
* commit '
5b739d8102982d24924aae0dbbb74b9fbc1c46ae':
disable mr stretchy, but leave the support code around for now
Grace Kloba [Thu, 28 Jan 2010 17:24:58 +0000 (09:24 -0800)]
Merge "Use a single EXTRA_HEADERS intent."
Grace Kloba [Wed, 27 Jan 2010 22:53:51 +0000 (14:53 -0800)]
Use a single EXTRA_HEADERS intent.
Patrick Scott [Wed, 27 Jan 2010 21:39:11 +0000 (16:39 -0500)]
Fix a legit crash that the monkey found.
If the device is running low on memory, the Browser may free background tabs.
removeTab could potentially remove a tab that has a lower index than the current
tab. That would cause mCurrentTab to point to the incorrect tab. Update
mCurrentTab if that is the case so it is pointing to the correct index.
Bug:
2371002
Grace Kloba [Wed, 27 Jan 2010 02:11:27 +0000 (18:11 -0800)]
Add request header support for the Browser/WebView.
QSB can use this instead of POST to send the location
data. After QSB makes the switch, we should also
remove the POST_DATA intent which is hidden.
Add loadUrl(String url, HashMap extraHeaders) to
WebView so that the caller can send the extra http
headers.
Remove "inline:" as no one is using it and it is a
hidden feature.
Part 2 of 3-project checkin.
Jean-Baptiste Queru [Wed, 27 Jan 2010 00:01:52 +0000 (16:01 -0800)]
use the very private API
Change-Id: Ife7e8a69878e96b6c659d5eb66aa3f386b84f26c
Eugene Koh [Tue, 26 Jan 2010 23:01:02 +0000 (15:01 -0800)]
Merge "Adding Chinese GBK and Big5 text encoding settings."
Mike Reed [Tue, 26 Jan 2010 20:21:44 +0000 (15:21 -0500)]
conditional code to test the browser in 32bit
Bai Tao [Tue, 26 Jan 2010 18:25:09 +0000 (02:25 +0800)]
Adding Chinese GBK and Big5 text encoding settings.
Mike Reed [Tue, 26 Jan 2010 07:34:43 +0000 (23:34 -0800)]
Mike Reed [Tue, 26 Jan 2010 02:11:52 +0000 (18:11 -0800)]
Leon Scroggins [Mon, 25 Jan 2010 15:40:38 +0000 (10:40 -0500)]
Always show the voice search button in the browser title bar when in voice search mode.
Fix for http://b/issue?id=
2390704
Mike Reed [Fri, 22 Jan 2010 20:55:57 +0000 (12:55 -0800)]
am
3d3c1985: disable mr stretchy, but leave the support code around for now
Merge commit '
3d3c198547122e52708140dc2ed10e1d4d8358da' into eclair-plus-aosp
* commit '
3d3c198547122e52708140dc2ed10e1d4d8358da':
disable mr stretchy, but leave the support code around for now
Mike Reed [Fri, 22 Jan 2010 20:34:37 +0000 (15:34 -0500)]
disable mr stretchy, but leave the support code around for now
Leon Scroggins [Fri, 22 Jan 2010 13:38:59 +0000 (05:38 -0800)]
Merge "Use the common method for updating the title."
Doug Zongker [Thu, 21 Jan 2010 22:35:23 +0000 (14:35 -0800)]
relocate GoogleLoginService
Change-Id: Ie5a1770b8bb3adaeb9dce1db89e0b563519fde0a
Leon Scroggins [Thu, 21 Jan 2010 21:25:26 +0000 (16:25 -0500)]
Use the common method for updating the title.
Depends on a change in frameworks/base
Leon Scroggins [Thu, 21 Jan 2010 21:17:56 +0000 (16:17 -0500)]
Change the error message when attempting to open a file that cannot be opened.
Previously, a file that could not be opened had to be a failed download.
Now that we allow the download of files which cannot be opened, we need
a different error message when attempting to open them.
Leon Scroggins [Thu, 21 Jan 2010 17:53:49 +0000 (09:53 -0800)]
Merge "Do not show the downloads page without the user explicitly requesting it."
Leon Scroggins [Thu, 21 Jan 2010 15:05:59 +0000 (10:05 -0500)]
Remove the option to clear all downloads.
Clearing all downloads would remove completed downloads from the
list, while leaving them on the SD card, and there would not
necessarily be a way to delete them using the phone.
Mike Reed [Thu, 21 Jan 2010 16:07:22 +0000 (08:07 -0800)]