OSDN Git Service
Grace Kloba [Sat, 1 Aug 2009 06:48:32 +0000 (23:48 -0700)]
When free the background tabs due to low memory, keep the parent tab of the
current tab around so that hit Back won't cause reload the page.
This should address the complain of reloading while using Google Reader.
Remove our own checkMemory() as the system now provides onLowMemory().
Grace Kloba [Mon, 3 Aug 2009 17:22:44 +0000 (10:22 -0700)]
resolved conflicts for merge of
a34f6861 to master
Grace Kloba [Fri, 31 Jul 2009 23:28:17 +0000 (16:28 -0700)]
Move IntentFilter/BroadcastReceiver creation before the spot where we may
early bail out in onCreate(). This should avoid the NPE we saw in onResume.
Leon Scroggins [Fri, 31 Jul 2009 17:10:55 +0000 (13:10 -0400)]
Fix a monkey crash.
Since getTopWindow() can be null, check first before accessing it.
Fix for http://b/issue?id=
2027301
Android (Google) Code Review [Thu, 30 Jul 2009 20:56:57 +0000 (13:56 -0700)]
Merge change 9214
* changes:
Remove the session cookies if Browser starts without any saved state.
Leon Scroggins [Thu, 30 Jul 2009 19:43:35 +0000 (15:43 -0400)]
Change the hint for the omnibox.
New hint tells the user that they can search in addition
to entering urls.
Grace Kloba [Thu, 30 Jul 2009 19:29:51 +0000 (12:29 -0700)]
Remove the session cookies if Browser starts without any saved state.
Android (Google) Code Review [Thu, 30 Jul 2009 17:21:08 +0000 (10:21 -0700)]
Merge change 8873
* changes:
More precise determination of when to back up the bookmarks
Andrei Popescu [Thu, 30 Jul 2009 13:48:55 +0000 (14:48 +0100)]
Implement out of space notification
Steve Block [Thu, 30 Jul 2009 09:50:45 +0000 (10:50 +0100)]
Adds browser settings menu entries for Geolocation permissions.
Android (Google) Code Review [Thu, 30 Jul 2009 09:14:03 +0000 (02:14 -0700)]
Merge change 8986
* changes:
Generalizes WebsiteSettingsActivity to handle more than just database permissions.
Christopher Tate [Tue, 28 Jul 2009 22:24:05 +0000 (15:24 -0700)]
More precise determination of when to back up the bookmarks
Instead of blindly assuming that any change to the bookmark table requires a
backup pass, we now attempt to discern whether the change is a user-visible
alteration of the bookmark set. We do this in the provider's hooks for
insert/delete/update operations.
Insert is easy; we simply check for bookmarks=1 in the field values of the row
being added, and request backup if it's there.
Delete and update operations are more problematic; we need to check whether the
record being acted on is part of the bookmark set. To do this unambiguously
requires querying the record's bookmark field, so we do that if it looks like
the operation might be one relevant to the bookmark backup [either deleting a
bookmark row, or changing the title/url of an existing bookmark, or changing
whether a given row represents a bookmark].
Android Git Automerger [Thu, 30 Jul 2009 00:03:43 +0000 (17:03 -0700)]
resolved conflicts for merge of
cc634036 to master
Steve Block [Wed, 29 Jul 2009 16:16:01 +0000 (17:16 +0100)]
Generalizes WebsiteSettingsActivity to handle more than just database permissions.
This is in preparation for the addition of Geolocation permissions.
Andrei Popescu [Wed, 29 Jul 2009 13:44:24 +0000 (14:44 +0100)]
Add unit tests for the WebStorageSizemanager. Also reduce the default quota and quota increase step
Android (Google) Code Review [Wed, 29 Jul 2009 14:59:12 +0000 (07:59 -0700)]
Merge change 8853
* changes:
Make the favicons look better on the bookmark page.
Andrei Popescu [Mon, 27 Jul 2009 11:01:59 +0000 (12:01 +0100)]
Refactor the WebStorage size management:
- Abandon the Quota UI: it does not make sense to ask the users to decide individual database quota increases. It is unlikely anyone will be able to make a meaningul decision.
- Introduce a global limit for all WebStorage content. This is shared between Database and AppCache.
- Make the quota increase decision automatic
- Treat out-of-space situations by creaying a system notification (TODO).
Grace Kloba [Tue, 28 Jul 2009 22:58:19 +0000 (15:58 -0700)]
Fix #
1964292. If the WEB_SEARCH starts from the Browser, load it in the
current window instead of a new window.
Leon Scroggins [Tue, 28 Jul 2009 20:33:53 +0000 (16:33 -0400)]
Make the favicons look better on the bookmark page.
In the visual bookmarks, set the padding for the favicon, as well
as using the favicon background used in other places, and set
the scaletype to fitCenter. This makes large favicons like
amazon.com's fit, without stretching others.
Leon Scroggins [Tue, 28 Jul 2009 18:14:48 +0000 (14:14 -0400)]
In History context menu, do not show "Add bookmark" for bookmarks.
Fix for http://b/issue?id=
1688867. Instead of providing an option
to add a bookmark to bookmarks, provide an option to remove the
item from bookmarks. Also display the item as the context menu
header.
Steve Block [Tue, 28 Jul 2009 12:49:15 +0000 (13:49 +0100)]
Fixes bug
2018090 in browser Website Settings.
Browser Website settings menu now correctly distinguishes origins at the same host.
Steve Block [Tue, 28 Jul 2009 10:07:10 +0000 (11:07 +0100)]
Improves appearance of website URLs in browser 'Website settings' menu.
- If an explicit title is set, we show it and use the origin as a subtitle.
- If no explicit title is set, we show use the origin as a title.
- We hide the origin's scheme if it's 'http'.
Android (Google) Code Review [Tue, 28 Jul 2009 02:50:51 +0000 (19:50 -0700)]
Merge change 8566
* changes:
First real cut of bookmarks backup agent
Christopher Tate [Sat, 11 Jul 2009 00:51:48 +0000 (17:51 -0700)]
First real cut of bookmarks backup agent
The agent now does backup/restore of the bookmarks table. Whether to back up is
determined by flattening the bookmark table, CRCing the flattened
representation, and comparing the CRC with the previous backup pass's version.
If they differ (or if the file size differs), the table is deemed to have
changed and we send the flattened file off to the server as a single key.
On restore, the bookmark records are read individually from the flattened
representation, the existing bookmarks table is queried for a matching URL, and
if none exists the bookmark is inserted into the table.
Bookmarks.addBookmark() now takes a boolean argument "retainIcon." When false,
the implementation will not call into the web icon database. This is necessary
during restore because the web icon database is only available from the Browser
app's main thread, but restore happens without the app proper being involved.
The other call points for addBookmark() have been updated to pass 'true,' i.e.
preserving the current behavior.
Leon Scroggins [Mon, 27 Jul 2009 17:50:48 +0000 (10:50 -0700)]
am
04b2e8e1: Use the old string for bookmarks permissions.
Merge commit '
04b2e8e1688a869904ecedafa58349b14a73ba48'
* commit '
04b2e8e1688a869904ecedafa58349b14a73ba48':
Use the old string for bookmarks permissions.
Leon Scroggins [Mon, 27 Jul 2009 15:07:09 +0000 (11:07 -0400)]
Use the old string for bookmarks permissions.
When we made the bookmark permissions public, we also changed their
names, which might break existing apps. Change them back. Depends
on a change in frameworks/base.
Steve Block [Wed, 22 Jul 2009 13:28:14 +0000 (14:28 +0100)]
Fixes the wording of some strings used for the settings menu entries for HTML5 database.
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Fred Quintana [Thu, 23 Jul 2009 03:00:49 +0000 (20:00 -0700)]
update the permissions for the AccountManagerService
Android (Google) Code Review [Thu, 23 Jul 2009 16:44:31 +0000 (09:44 -0700)]
Merge change 8188
* changes:
Enforce app cache maximum size
Andrei Popescu [Wed, 22 Jul 2009 15:46:55 +0000 (16:46 +0100)]
Enforce app cache maximum size
Dianne Hackborn [Wed, 22 Jul 2009 19:01:14 +0000 (12:01 -0700)]
am
57b461b6: Stop using old density APIs.
Merge commit '
57b461b6f13bb4c90264e7ca08c130b41c74a1d3'
* commit '
57b461b6f13bb4c90264e7ca08c130b41c74a1d3':
Stop using old density APIs.
Android (Google) Code Review [Wed, 22 Jul 2009 07:45:18 +0000 (00:45 -0700)]
Merge change 8027
* changes:
wire appcache to HTML5 UI
Dianne Hackborn [Wed, 22 Jul 2009 03:04:08 +0000 (20:04 -0700)]
Stop using old density APIs.
Patrick Scott [Tue, 21 Jul 2009 21:38:45 +0000 (14:38 -0700)]
am
a0b0e2a2: (-s ours) Do not merge When opening a new tab from the context menu, treat the new tab as a child of the current tab. This change was cherry-picked from
Merge commit '
a0b0e2a2cd78ae78ec50eab2e532d0102facc52d'
* commit '
a0b0e2a2cd78ae78ec50eab2e532d0102facc52d':
Do not merge
Leon Scroggins [Tue, 21 Jul 2009 21:38:18 +0000 (14:38 -0700)]
am
55581a65: (-s ours) DO NOT MERGE: Remove deprecated call: Cursor.commitUpdates().
Merge commit '
55581a656c7b198dbbac63184cd78c61f7535915'
* commit '
55581a656c7b198dbbac63184cd78c61f7535915':
DO NOT MERGE: Remove deprecated call: Cursor.commitUpdates().
Android (Google) Code Review [Tue, 21 Jul 2009 19:46:39 +0000 (12:46 -0700)]
Merge change 8035
* changes:
Prevent stale data exception.
Patrick Scott [Tue, 21 Jul 2009 19:09:50 +0000 (15:09 -0400)]
Do not merge
When opening a new tab from the context menu, treat the new tab as a child of
the current tab. This change was cherry-picked from master.
Leon Scroggins [Tue, 21 Jul 2009 18:00:00 +0000 (14:00 -0400)]
Prevent stale data exception.
Before requerying, check mCursor to see if it has closed. If it
has, do not requery.
Leon Scroggins [Tue, 21 Jul 2009 15:15:28 +0000 (11:15 -0400)]
DO NOT MERGE: Remove deprecated call: Cursor.commitUpdates().
This change was previously made in master, but I believe it is
responsible for a crash. We should not be using this deprecated
method, so I am now instead using ContentResolver.update().
Andrei Popescu [Tue, 21 Jul 2009 17:24:06 +0000 (18:24 +0100)]
wire appcache to HTML5 UI
Android (Google) Code Review [Mon, 20 Jul 2009 19:09:05 +0000 (12:09 -0700)]
Merge change 7914
* changes:
Fix
1990635. update() was accidentally removed. Bring it back so that the WebSettings will be applied to the current open windows.
Grace Kloba [Mon, 20 Jul 2009 18:53:33 +0000 (11:53 -0700)]
Fix
1990635. update() was accidentally removed. Bring it back so that the WebSettings will be applied to the current open windows.
Grace Kloba [Mon, 20 Jul 2009 18:01:14 +0000 (11:01 -0700)]
am
83f47346: Fix
1984809. Select the url when SEARCH key is pressed in the Browser.
Merge commit '
83f473462fcd7869031a423c02b957c6e938a2f6'
* commit '
83f473462fcd7869031a423c02b957c6e938a2f6':
Fix
1984809. Select the url when SEARCH key is pressed in the Browser.
Grace Kloba [Mon, 20 Jul 2009 17:44:31 +0000 (10:44 -0700)]
Fix
1984809. Select the url when SEARCH key is pressed in the Browser.
Leon Scroggins [Mon, 20 Jul 2009 17:38:47 +0000 (13:38 -0400)]
Set a title for pages with no title.
In the title bar, we were showing "Loading..." as the
title for a page that finished loading but still has no
title. Now, display the url where the title is displayed
and display nothing for the url.
Ben Murdoch [Wed, 1 Jul 2009 19:19:05 +0000 (20:19 +0100)]
Implement an error console. The console is displayed when the user has enabled debug in the browser (been to about:debug) and there are errors on the page. It can be toggled on/off in debug mode in the settings menu.
Patrick Scott [Thu, 16 Jul 2009 13:42:58 +0000 (09:42 -0400)]
Try to reuse tabs with matching urls to avoid loading a new page.
If there is no matching application tab, try to find a regular tab (created in
the browser) with a matching url. This avoids opening a new tab and loading a
new page for a page that has already been loaded.
TODO: There is a ton of duplicate code around animations to/from the tab
overview. It is a massive amount of cruft and I really want to rewrite it all in
a separate change.
Android (Google) Code Review [Thu, 16 Jul 2009 16:38:19 +0000 (09:38 -0700)]
Merge change 7429
* changes:
Work on the Bookmark Grid, including the favicon.
Leon Scroggins [Wed, 15 Jul 2009 20:54:37 +0000 (16:54 -0400)]
Work on the Bookmark Grid, including the favicon.
Remove the file BookmarkGridPage, since a GridView will do just fine.
Now we specify a height and width for the bitmaps rather than adjusting
them for the screen size. Also add the favicon and match the design
more closely for the Add option. In BrowserActivity, match the size
of the saved screenshots to the desired size for the Bookmarks
Activity. Also move the logic into its own method so it can be
called from multiple places (still called in only one at the moment).
Patrick Scott [Wed, 15 Jul 2009 20:41:45 +0000 (13:41 -0700)]
Patrick Scott [Wed, 15 Jul 2009 12:04:48 +0000 (08:04 -0400)]
Do not merge.
Check for a null tab in onDestroy. This fix is in master but the crash appears
in donut as well.
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:12:53 +0000 (17:12 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Leon Scroggins [Tue, 14 Jul 2009 18:48:02 +0000 (14:48 -0400)]
Integrate bookmark grid view mode with list view mode.
This way the two different modes can share code and have
all the same behaviors (i.e. context menu options).
AndroidManifest.xml
Remove BookmarkGridPage, which is no longer an Activity.
bookmarks.xml
Add a menu option to switch between the different viewing modes.
strings.xml
Name for that menu option.
AddNewBookmark.java
Remove copyTo, which is not necessary.
BookmarkGridPage.java
Change to just be a GridView, with our desired settings, and
overriding onSizeChanged to size the thumbs appropriately. Now its
constructor takes a BrowserBookmarksAdapter, which it uses instead
of its old private Adapter.
BrowserBookmarksAdapter.java
Now has two modes, so it can be used for both the bookmarks grid
and the list view. Removed a bunch of obsolete code, which was
used for searching/sorting the bookmarks.
BrowserBookmarksPage.java
Now switches back and forth between using a GridView and a ListView.
Patrick Scott [Tue, 14 Jul 2009 14:49:22 +0000 (10:49 -0400)]
Show the new tab when creating it from the bookmarks/history.
When we are in the tab picker and a new tab is created from bookmarks/history,
show the new tab in the picker and then animate to it. Only do this for the
"open tabs in background" setting since openTab() will show the tab if that
setting is false.
We animate to the new tab because we currently don't have a way to show the new
tab in the tab picker with updated picker data (title and url in particular).
So instead of showing a blank tab, animate to the tab. Once the animations have
been redesigned and the code refactored, this will hopefully get better.
Eric Fischer [Mon, 13 Jul 2009 23:33:37 +0000 (16:33 -0700)]
Eric Fischer [Mon, 13 Jul 2009 22:43:49 +0000 (15:43 -0700)]
Import new translations
Android (Google) Code Review [Mon, 13 Jul 2009 17:06:36 +0000 (10:06 -0700)]
am
bae196df: Merge change 6811 into donut
Merge commit '
bae196df36929647356d03e35cbfbdb453e3833b'
* commit '
bae196df36929647356d03e35cbfbdb453e3833b':
Fix #
1953520. When MENU is down, consume the key in the BrowserActivity which are not shortcut keys. So it won't trigger the search panel. If a shortcut action is taken, reset the mMenuIsDown as it has been used once.
Android (Google) Code Review [Mon, 13 Jul 2009 17:05:29 +0000 (10:05 -0700)]
Merge change 6811 into donut
* changes:
Fix #
1953520. When MENU is down, consume the key in the BrowserActivity which are not shortcut keys. So it won't trigger the search panel. If a shortcut action is taken, reset the mMenuIsDown as it has been used once.
Grace Kloba [Mon, 13 Jul 2009 17:04:34 +0000 (10:04 -0700)]
Fix #
1953520. When MENU is down, consume the key in the BrowserActivity which are not shortcut keys. So it won't trigger the search panel. If a shortcut action is taken, reset the mMenuIsDown as it has been used once.
Bjorn Bringert [Mon, 13 Jul 2009 16:02:30 +0000 (09:02 -0700)]
am
1e8f0583: Move Browser search description to bookmarks search.
Merge commit '
1e8f0583fb74658666dc4105bf15788f2585a6a2'
* commit '
1e8f0583fb74658666dc4105bf15788f2585a6a2':
Move Browser search description to bookmarks search.
Bjorn Bringert [Mon, 13 Jul 2009 14:53:25 +0000 (15:53 +0100)]
Move Browser search description to bookmarks search.
Before, android:searchSettingsDescription was set in searchable.xml,
but not in bookmarks_searchable.xml, which is the one that
is used from global search.
Fixes http://b/issue?id=
1971319
"Description string for Browser source not showing in settings"
Christopher Tate [Fri, 10 Jul 2009 20:36:58 +0000 (13:36 -0700)]
Remember to advance the cursor
Christopher Tate [Tue, 7 Jul 2009 20:11:41 +0000 (13:11 -0700)]
Skeleton backup agent for Browser
This is a skeleton backup agent for the Android Browser, intended to back up and
restore the bookmarks table from browser.db by extracting the bookmarks table
into a flattened file representation on backup, then unflattening and rebuilding
the table during restore.
It compiles but is completely untested, since the db code to read/write the
bookmarks table is not finished. The backup agent has been declared in the
Browser manifest, however.
Satish Sampath [Fri, 10 Jul 2009 16:58:58 +0000 (09:58 -0700)]
am
60d24e21: Make suggestion text color change based on the item state
Merge commit '
60d24e219b1763bc294974e042c67a1a6cadd8d5'
* commit '
60d24e219b1763bc294974e042c67a1a6cadd8d5':
Make suggestion text color change based on the item state
Grace Kloba [Fri, 10 Jul 2009 16:57:04 +0000 (09:57 -0700)]
am
cf849950: Fix
1970279. Like "Go", search key should get the current url and pre-fill it in the search/goto widget.
Merge commit '
cf849950fe8ad5425ccd82b48b9a014dea8a288e'
* commit '
cf849950fe8ad5425ccd82b48b9a014dea8a288e':
Fix
1970279. Like "Go", search key should get the current url and pre-fill it in the search/goto widget.
Satish Sampath [Thu, 9 Jul 2009 15:46:08 +0000 (16:46 +0100)]
Make suggestion text color change based on the item state
This is dependant on change https://android-git/g/6623
Bug: http://b/issue?id=
1865037
Grace Kloba [Fri, 10 Jul 2009 01:57:55 +0000 (18:57 -0700)]
Fix
1970279. Like "Go", search key should get the current url and pre-fill it in the search/goto widget.
Dianne Hackborn [Thu, 9 Jul 2009 19:39:23 +0000 (12:39 -0700)]
am
373d5f29: Update browser provider to allow global search to access it.
Merge commit '
373d5f2984c93b07143028bfa8af4b80c4a858c8'
* commit '
373d5f2984c93b07143028bfa8af4b80c4a858c8':
Update browser provider to allow global search to access it.
Andrei Popescu [Tue, 7 Jul 2009 09:51:15 +0000 (10:51 +0100)]
Add fullscreen support back in.
Dianne Hackborn [Wed, 8 Jul 2009 21:59:33 +0000 (14:59 -0700)]
Update browser provider to allow global search to access it.
Leon Scroggins [Tue, 7 Jul 2009 15:25:28 +0000 (11:25 -0400)]
More closely match the intended design of the bookmark grid page.
Change the look of the text. Use a blank white rectangle with
rounded corners for sites without a stored screenshot. Also
begin work on using the favicon.
Android (Google) Code Review [Tue, 7 Jul 2009 14:47:46 +0000 (07:47 -0700)]
Merge change 6348
* changes:
Associate screenshots with original url.
Leon Scroggins [Tue, 7 Jul 2009 14:36:35 +0000 (10:36 -0400)]
Associate screenshots with original url.
Partial fix for http://b/issue?id=
1949260 : can't get a thumb for
facebook.com. Associate the screenshot with the original url so
a bookmark that was redirected will still get updated with the
picture.
Leon Scroggins [Mon, 6 Jul 2009 20:40:00 +0000 (16:40 -0400)]
Allow user to create a new bookmark in the new UI.
Not the final visual design, but allows dogfooders to create new
bookmarks.
Android (Google) Code Review [Thu, 2 Jul 2009 21:25:46 +0000 (14:25 -0700)]
am
944f2208: Merge change 5882 into donut
Merge commit '
944f2208fd134d74e171772cc6a317628ee20a5f'
* commit '
944f2208fd134d74e171772cc6a317628ee20a5f':
Add new searchSettingsDescription attribute for Browser's searchable.
Ramanan Rajeswaran [Thu, 2 Jul 2009 21:25:38 +0000 (14:25 -0700)]
Grace Kloba [Wed, 1 Jul 2009 21:08:43 +0000 (14:08 -0700)]
resolved conflicts for merge of
47fdfdb9 to master
Grace Kloba [Wed, 1 Jul 2009 18:19:58 +0000 (11:19 -0700)]
am
81678d92: Fix #
1947053. Use EXTRA_POST_DATA to send POST request to the WebView. This is used for sending location now.
Merge commit '
81678d9216458266ea70cd62d52f28f744873556'
* commit '
81678d9216458266ea70cd62d52f28f744873556':
Fix #
1947053. Use EXTRA_POST_DATA to send POST request to the WebView. This is used for sending location now.
Android (Google) Code Review [Wed, 1 Jul 2009 16:47:15 +0000 (09:47 -0700)]
Merge change 5882 into donut
* changes:
Add new searchSettingsDescription attribute for Browser's searchable. This will be shown under the individual searchable item in system search settings.
Ramanan Rajeswaran [Wed, 1 Jul 2009 15:46:58 +0000 (08:46 -0700)]
set default client id
Mike LeBeau [Wed, 1 Jul 2009 01:33:06 +0000 (18:33 -0700)]
Add new searchSettingsDescription attribute for Browser's searchable.
This will be shown under the individual searchable item in system search settings.
Grace Kloba [Tue, 30 Jun 2009 18:15:34 +0000 (11:15 -0700)]
Remove "search_url" in the debug setting as search is controlled by the search manager now.
Grace Kloba [Tue, 30 Jun 2009 14:09:56 +0000 (07:09 -0700)]
Fix #
1947053. Use EXTRA_POST_DATA to send POST request to the WebView. This is used for sending location now.
Feng Qian [Mon, 29 Jun 2009 22:58:08 +0000 (15:58 -0700)]
Add a UI for setting JS flags.
The UI only shows up when 'about:debug' is typed in the address bar.
JS flags are a string '--heap-stats --log-gc' in V8 etc.
Currently this is only used by V8 build for debugging purpose.
Android (Google) Code Review [Fri, 26 Jun 2009 18:05:26 +0000 (11:05 -0700)]
Merge change 5504
* changes:
Update Browser's user agent
Andrei Popescu [Fri, 26 Jun 2009 15:50:04 +0000 (16:50 +0100)]
Make the video bg black. It is nicer
Andrei Popescu [Fri, 26 Jun 2009 13:11:30 +0000 (14:11 +0100)]
Fullscreen video support. Replaces 5140
Grace Kloba [Fri, 26 Jun 2009 07:34:46 +0000 (00:34 -0700)]
Update Browser's user agent
Grace Kloba [Thu, 25 Jun 2009 18:24:39 +0000 (11:24 -0700)]
am
2f83068b: Add the ZoomDensity support in the Browser.
Merge commit '
2f83068b9e8835f97010bc2ee1d77f3a13827ae4'
* commit '
2f83068b9e8835f97010bc2ee1d77f3a13827ae4':
Add the ZoomDensity support in the Browser.
Grace Kloba [Thu, 25 Jun 2009 18:08:53 +0000 (11:08 -0700)]
Add the ZoomDensity support in the Browser.
Per Leland's requst, change "Set text size" to "Text size" and etc.
Grace Kloba [Thu, 25 Jun 2009 17:54:22 +0000 (10:54 -0700)]
am
5b078b5b: Fix #
1705293. When we about to hijack the url, we check the intent first. If it is not resolved to any activity, we will try to download it from the Market.
Merge commit '
5b078b5b8f166a14ab88137e478f868959c5befa'
* commit '
5b078b5b8f166a14ab88137e478f868959c5befa':
Fix #
1705293. When we about to hijack the url, we check the intent first. If it is not resolved to any activity, we will try to download it from the Market.
Grace Kloba [Thu, 25 Jun 2009 03:23:41 +0000 (20:23 -0700)]
Fix #
1705293. When we about to hijack the url, we check the intent first. If it is not resolved to any activity, we will try to download it from the Market.
Android (Google) Code Review [Wed, 24 Jun 2009 04:40:44 +0000 (21:40 -0700)]
am
d1c2a433: Merge change 5160 into donut
Merge commit '
d1c2a433c79451aac4340aef8f0d83081977df84'
* commit '
d1c2a433c79451aac4340aef8f0d83081977df84':
Return the url of a browser history item in the intent query column of the
Android (Google) Code Review [Wed, 24 Jun 2009 03:03:05 +0000 (20:03 -0700)]
Merge change 5160 into donut
* changes:
Return the url of a browser history item in the intent query column of the suggestion. This is so that global search can rewrite a query in the search dialog (i.e., fill in the search box with the url of the suggestion when the user rolls over to select the suggestion). Browser uses android:searchMode="rewriteQueryFromData" to accomplish this but global search does the default thing of using the intent query column, if present, as a rewrite for the current query.
Mike LeBeau [Wed, 24 Jun 2009 00:36:59 +0000 (17:36 -0700)]
Return the url of a browser history item in the intent query column of the
suggestion. This is so that global search can rewrite a query in the search
dialog (i.e., fill in the search box with the url of the suggestion when the
user rolls over to select the suggestion). Browser uses
android:searchMode="rewriteQueryFromData" to accomplish this but global search
does the default thing of using the intent query column, if present, as a rewrite
for the current query.
Satish Sampath [Tue, 23 Jun 2009 21:47:13 +0000 (14:47 -0700)]
am
15e9f2dc: Pass through SearchManager.APP_DATA bundle in web searches.
Merge commit '
15e9f2dc92cf1621f95071b3c740f46079aa0f3b'
* commit '
15e9f2dc92cf1621f95071b3c740f46079aa0f3b':
Pass through SearchManager.APP_DATA bundle in web searches.
Satish Sampath [Tue, 23 Jun 2009 21:29:49 +0000 (22:29 +0100)]
Pass through SearchManager.APP_DATA bundle in web searches.
This got missed when we made the change to invoke the system default web search handler instead of the browser directing all searches to Google. This makes sure that the receiving web search providers can pass on the source parameter appropriately as part of the results page that they launch.
Grace Kloba [Mon, 22 Jun 2009 21:59:26 +0000 (14:59 -0700)]
am
2595f146: Use the new Secure settings for location. Also added the code to invoke the consent dialog.
Merge commit '
2595f146fecd3828231c6611362cce65acd9afb6'
* commit '
2595f146fecd3828231c6611362cce65acd9afb6':
Use the new Secure settings for location. Also added the code to invoke the consent dialog.