OSDN Git Service
Android (Google) Code Review [Thu, 3 Sep 2009 18:43:58 +0000 (11:43 -0700)]
Merge change 23812 into eclair
* changes:
Show the full url in the title bar.
Leon Scroggins [Thu, 3 Sep 2009 14:20:44 +0000 (10:20 -0400)]
Show the full url in the title bar.
Fix for http://b/issue?id=
2096235
Change-Id: I79d34c6e847587c63dc79b8c68813508eacaf9d5
Leon Scroggins [Thu, 3 Sep 2009 01:20:30 +0000 (21:20 -0400)]
Attach the title bar to the top of the page.
Remove the old notions of changing the viewing mode
resulting in changing the visibility of the title bar.
Instead, attach the title bar to the current WebView.
Requires a change to frameworks/base.
Change-Id: I65ba1182db040848700840e6229d7e1a7c6050d0
Xia Wang [Wed, 2 Sep 2009 20:51:34 +0000 (13:51 -0700)]
Revert "Add a test case in browser to measure the power usage of loading a web page"
This reverts commit
a4d616c5291877646558d954f5e3cc9733309b4c.
Android (Google) Code Review [Wed, 2 Sep 2009 19:43:25 +0000 (12:43 -0700)]
Merge change 23647 into eclair
* changes:
Add a test case in browser to measure the power usage of loading a web page
Xia Wang [Wed, 2 Sep 2009 04:50:48 +0000 (21:50 -0700)]
Add a test case in browser to measure the power usage of loading a web page
Android (Google) Code Review [Wed, 2 Sep 2009 17:56:28 +0000 (10:56 -0700)]
Merge change 23445 into eclair
* changes:
When removing a tab, go back to the correct parent tab.
Grace Kloba [Tue, 1 Sep 2009 07:56:09 +0000 (00:56 -0700)]
When we close a window on exit, make sure pauseWebView taking action by
setting mPageStarted to false.
Part 1 for fixing http://b/issue?id=
2087410
Leon Scroggins [Tue, 1 Sep 2009 16:33:07 +0000 (12:33 -0400)]
When removing a tab, go back to the correct parent tab.
Fix for http://b/issue?id=
2075182 . We re-set the Adapter so
that it refreshes itself. Before calling removeTab, we set
the selection to the correct one. Keep track of that selection
and set it again after re-setting the Adapter.
Change-Id: I2dd07dd9bbf5f2abbbf99e004b5c37560495ec3a
Android (Google) Code Review [Tue, 1 Sep 2009 16:19:11 +0000 (09:19 -0700)]
Merge change 23440 into eclair
* changes:
allow adding content: bookmarks
Cary Clark [Tue, 1 Sep 2009 15:45:37 +0000 (11:45 -0400)]
allow adding content: bookmarks
Leon Scroggins [Mon, 31 Aug 2009 21:05:41 +0000 (17:05 -0400)]
Update the appearance of the title bar in the browser.
Change the title bar to use the look of the search bar. Remove
the new tab button, which is now a part of the updated menu. Make
the title bar for each WebView span the width of the screen. Make
the title bar appear when pressing the menu button.
Change-Id: I7ad1c955412d422be0fc6f26ec8d286172a0a99a
Patrick Scott [Tue, 25 Aug 2009 17:52:46 +0000 (13:52 -0400)]
Use the new code values for onReceivedError.
Patrick Scott [Mon, 31 Aug 2009 18:31:52 +0000 (14:31 -0400)]
Do not include ourselves as a candidate for downloading content.
If we are attempting to download a file and try to resolve to another activity,
it is possible to get BrowserActivity as the best candidate. In that case, we
need to fall back to the download manager. If we do not, we end up in a loop
trying to download the file and sending ourselves a new intent.
BUG:
2062310
Patrick Scott [Mon, 31 Aug 2009 13:48:37 +0000 (09:48 -0400)]
Check for null tabs before acquiring the parent tab.
This prevents a NPE when the current tab is null. This is very rare but can
still possibly happen.
Android (Google) Code Review [Fri, 28 Aug 2009 20:13:15 +0000 (13:13 -0700)]
Merge change 23134 into eclair
* changes:
High-resolution (hdpi) artwork from TAT for Browser.
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Browser.
Android (Google) Code Review [Fri, 28 Aug 2009 18:15:06 +0000 (11:15 -0700)]
Merge change 23104 into eclair
* changes:
Improve the appearance of the minitabs on the landing page.
Leon Scroggins [Fri, 28 Aug 2009 15:44:12 +0000 (11:44 -0400)]
Improve the appearance of the minitabs on the landing page.
Use the default look, but modified to be shorter in height.
Change-Id: Ib0b8a6ab4ce0a809504d92a2b40ac39224264626
Eric Fischer [Fri, 28 Aug 2009 00:23:43 +0000 (17:23 -0700)]
Armor string format tokens with translation placeholders.
Change-Id: Ia5b9e9f58cc8355b3d5d522afc3f02d6ff0d2b0e
Grace Kloba [Thu, 27 Aug 2009 21:40:32 +0000 (14:40 -0700)]
am
b8a9cb0e: Fix the activity leak in the Browser.
Merge commit '
b8a9cb0e2b3b2a1bb250853a79b8ea2046ff3d6e' into eclair
* commit '
b8a9cb0e2b3b2a1bb250853a79b8ea2046ff3d6e':
Fix the activity leak in the Browser.
Grace Kloba [Thu, 27 Aug 2009 18:53:36 +0000 (11:53 -0700)]
Fix the activity leak in the Browser.
The IconListenerSet inside CombinedBookmarkHistoryActivity is static. So when
the activity is destroyed, it needs to remove its listener to avoid leak.
Ben Murdoch [Tue, 25 Aug 2009 18:38:07 +0000 (19:38 +0100)]
Use the estimated size of new databases as the default quota if we have enough space to satisfy it.
Change-Id:I23daac8fbf27f50f304ee53060353423deaed50a
Leon Scroggins [Wed, 19 Aug 2009 20:26:12 +0000 (16:26 -0400)]
Implement new title bar behavior.
Depends on a change to frameworks/base. When loading a new page,
display the title bar. Implement a callback so that we can toggle
the title bar's visibility on mobile sites.
Change-Id: Ie2cbe2a53bcfd1bcc9fb9d2f12285ecf45e06997
Steve Block [Fri, 21 Aug 2009 12:16:58 +0000 (13:16 +0100)]
Browser-side changes to persist Geolocation permissions between browser sessions.
This fixes bug http://b/issue?id=
2054365.
Steve Block [Fri, 21 Aug 2009 11:54:47 +0000 (12:54 +0100)]
Removes unnecessary syncing of databse and app cache paths with browser settings XML.
These paths are not stored in the XML, so syncing is not required.
This code is probably a legacy from when there were plans to include the paths in the browser settings and hence the XML.
Android (Google) Code Review [Mon, 24 Aug 2009 10:09:36 +0000 (03:09 -0700)]
Merge change 22261 into eclair
* changes:
Adds browser-side of logic to make Geolocation obey Browser 'Enable Location' setting.
Android (Google) Code Review [Mon, 24 Aug 2009 09:29:43 +0000 (02:29 -0700)]
Merge change 22080 into eclair
* changes:
Fixes a bug in the browser settings menu. Correctly hooks up 'Clear location access'.
Leon Scroggins [Fri, 21 Aug 2009 15:58:28 +0000 (11:58 -0400)]
Improve the look of the search bar on the landing page.
Use the actual look as defined in search_bar.xml. Fixes:
http://b/issue?id=
2042059
http://b/issue?id=
2042041
Steve Block [Fri, 21 Aug 2009 09:26:25 +0000 (10:26 +0100)]
Adds browser-side of logic to make Geolocation obey Browser 'Enable Location' setting.
This fixes bug http://b/issue?id=
2067559.
Steve Block [Thu, 20 Aug 2009 17:11:08 +0000 (18:11 +0100)]
Fixes a bug in the browser settings menu. Correctly hooks up 'Clear location access'.
Android (Google) Code Review [Wed, 19 Aug 2009 19:43:28 +0000 (12:43 -0700)]
Merge change 21933 into eclair
* changes:
Fix a bug where we were opening a new tab unnecessarily.
Leon Scroggins [Wed, 19 Aug 2009 19:31:58 +0000 (15:31 -0400)]
Fix a bug where we were opening a new tab unnecessarily.
Code got changed along with other code. When changing to an appTab,
if it matches the current tab, do nothing. Fixes
http:/b/issue?id=197317
Leon Scroggins [Tue, 18 Aug 2009 18:13:31 +0000 (14:13 -0400)]
Fix a crasher on the most visited page when the history is empty.
Make sure that the empty view is always available by setting it
as the content view, and adding the list or grid. Fixes
http://b/issue?id=
2041975
Android (Google) Code Review [Wed, 19 Aug 2009 16:06:15 +0000 (09:06 -0700)]
Merge change 21887 into eclair
* changes:
Fix a crash.
Leon Scroggins [Wed, 19 Aug 2009 15:25:14 +0000 (11:25 -0400)]
Fix a crash.
When the bookmarks page is opened to create a shortcut, there is
no menu. So do not modify it.
Leon Scroggins [Tue, 18 Aug 2009 23:47:09 +0000 (19:47 -0400)]
Allow user to enter a URL to visit a site without closing the browser.
Eric Fischer [Tue, 18 Aug 2009 18:00:22 +0000 (11:00 -0700)]
am
9f0d27c8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9f0d27c82baa6d838147afabdf6f0764bf265a21' into eclair
* commit '
9f0d27c82baa6d838147afabdf6f0764bf265a21':
Import revised translations. DO NOT MERGE
Grace Kloba [Tue, 18 Aug 2009 15:42:32 +0000 (08:42 -0700)]
resolved conflicts for merge of
918e1d78 to eclair
Leon Scroggins [Tue, 18 Aug 2009 14:22:05 +0000 (10:22 -0400)]
Ensure that switching tabs also updates the title bar.
In particular, when we open a tab associated with an appId, move
the title bar to that tab's title.
Leon Scroggins [Mon, 17 Aug 2009 21:01:38 +0000 (17:01 -0400)]
Disable "open in new window" if Go came up from a new tab.
Eric Fischer [Mon, 17 Aug 2009 20:14:08 +0000 (13:14 -0700)]
Import revised translations. DO NOT MERGE
Leon Scroggins [Fri, 14 Aug 2009 22:28:01 +0000 (18:28 -0400)]
Fix several bugs surrounding the "go" screen and closing tabs.
http://b/issue?id=
2053635 : Home page should appear when last tab is closed
http://b/issue?id=
2049620 : click on a link opening a new window should skip the landing page
http://b/issue?id=
2042079 : When I open a new tab, then hit back get strange state
Now if you close the last tab, it will bring up the "go" screen.
If you hit back, it closes the browser; otherwise it will go where
the user specifies. When opening a new tab, if the user hits
back, it will close this new tab. This also prevents the "go"
screen from coming up unnecessarily when a link opens in a new
window.
Leon Scroggins [Mon, 17 Aug 2009 16:04:20 +0000 (12:04 -0400)]
Bring up search directly from the Go page.
Rather than returning to BrowserActivity to bring up search, bring
it up directly from the Go page. This means that hitting back from
search will take you to the Go page (if you reached search from
the Go page). Fixes http://b/issue?id=
2042017
Leon Scroggins [Fri, 14 Aug 2009 20:32:43 +0000 (16:32 -0400)]
Prevent opening the keyboard from changing the tab.
Leon Scroggins [Fri, 7 Aug 2009 20:12:57 +0000 (16:12 -0400)]
Hide the title bar when zoomed in
Patrick Scott [Fri, 14 Aug 2009 17:35:53 +0000 (13:35 -0400)]
Set the new tab as the current tab to reflect the old behavior.
Android (Google) Code Review [Fri, 14 Aug 2009 18:30:10 +0000 (11:30 -0700)]
Merge change 21291 into eclair
* changes:
Bring up the "Go" page when touching the title bar.
Android (Google) Code Review [Fri, 14 Aug 2009 18:24:37 +0000 (11:24 -0700)]
Merge change 21296 into eclair
* changes:
Fix a class cast exception.
Leon Scroggins [Fri, 14 Aug 2009 18:16:10 +0000 (14:16 -0400)]
Fix a class cast exception.
If we are in grid mode, the target view will not be
a history item. Find out the information using the
BookmarksAdapter instead.
Leon Scroggins [Fri, 14 Aug 2009 18:12:47 +0000 (14:12 -0400)]
Use the correct resource for the add bookmark item in the menu.
Leon Scroggins [Fri, 14 Aug 2009 17:39:05 +0000 (13:39 -0400)]
Bring up the "Go" page when touching the title bar.
Grace Kloba [Thu, 13 Aug 2009 21:55:06 +0000 (14:55 -0700)]
Fix b/issue?id=
2052775. According to the comment, we try to call
pauseWebView(). But as mActivityInPause is false, pauseWebView doesn't do
anything. This cause inbalanced pause/resume and the WebCoreThread's timer
is never put on hold even Browser is in the background.
Christopher Tate [Thu, 13 Aug 2009 21:19:10 +0000 (14:19 -0700)]
Add BACKUP_DATA permission to the browser
Cary Clark [Wed, 12 Aug 2009 16:56:42 +0000 (12:56 -0400)]
handle false results in file.delete and similar calls
found by findbugs
http://b/issue?id=
1856614
Leon Scroggins [Mon, 10 Aug 2009 21:36:42 +0000 (17:36 -0400)]
Initial attempt to get the sliding title bar working, using a Gallery.
In addition the sliding title bar, I have now removed the TabPicker.
Now, when changing to a new tab, we just go straight there. Also
put back in Add bookmark in the top level menu. And fix the bug
where switching tabs was always bringing up the bookmarks.
Andrei Popescu [Wed, 12 Aug 2009 18:35:50 +0000 (19:35 +0100)]
remove gears
Ramanan Rajeswaran [Wed, 12 Aug 2009 22:18:36 +0000 (15:18 -0700)]
Merge commit '
60c8c06e' into manualmerge
Ramanan Rajeswaran [Wed, 12 Aug 2009 21:35:44 +0000 (14:35 -0700)]
Change the default google homepage to google.co.jp
Patrick Scott [Wed, 12 Aug 2009 13:15:51 +0000 (09:15 -0400)]
Pass unhandled keys up to the main tab.
Grace Kloba [Wed, 12 Aug 2009 16:35:42 +0000 (09:35 -0700)]
Change the Browser trace file from data dir to sdcard, increase the size
from 8M to 20M so that common sites like nytimes.com can fit.
Cary Clark [Tue, 11 Aug 2009 21:40:45 +0000 (17:40 -0400)]
close streams when done
found by findbugs
http://b/issue?id=
1856630
Cary Clark [Tue, 11 Aug 2009 20:42:26 +0000 (16:42 -0400)]
make private inner classes static
bug found by findbugs
http://b/issue?id=
1856695
Cary Clark [Tue, 11 Aug 2009 18:49:51 +0000 (14:49 -0400)]
remove unused locals
found by findbugs
http://b/issue?id=
1856758
Android (Google) Code Review [Tue, 11 Aug 2009 18:41:58 +0000 (11:41 -0700)]
Merge change 20761
* changes:
make finals static, remove unused local
Cary Clark [Tue, 11 Aug 2009 18:19:06 +0000 (14:19 -0400)]
make finals static, remove unused local
found by findbugs
http://b/issue?id=
1856725
http://b/issue?id=
1856786
Cary Clark [Tue, 11 Aug 2009 18:04:49 +0000 (14:04 -0400)]
remove unused variable
found by findbugs
http://b/issue?id=
1856781
Leon Scroggins [Fri, 7 Aug 2009 16:03:34 +0000 (12:03 -0400)]
No load home page.
Rather than load a home page, bring up the browser/new tabs
displaying the bookmarks page, with a search bar that can be
clicked to open the omnibox. Also rearrange the menu. Fix for
http://b/issue?id=
2018524
Grace Kloba [Thu, 6 Aug 2009 00:19:17 +0000 (17:19 -0700)]
Add a setting to load a page in overview mode.
Leon Scroggins [Wed, 5 Aug 2009 18:07:58 +0000 (14:07 -0400)]
Make the "Most visited" page have a thumbnail viewing mode.
Start capturing screenshots for all visited pages, and show them
in a grid view on the most visited page. Modify the BrowserBookmarks-
Page and Adapter so they can be used for the "Most visited" page.
Also change some of the ids for context menu items to be the same
in the browser and history context menus, for simplicity in
handling them in BrowserBookmarksPage.
Steve Block [Fri, 31 Jul 2009 07:38:58 +0000 (08:38 +0100)]
Fix for bug
2024912. Sets title in browser Website Settings menu.
Steve Block [Thu, 30 Jul 2009 13:45:13 +0000 (14:45 +0100)]
Adds the browser Geolocation permissions prompt.
Note that the appearance of the prompt has not yet been finalized.
Also the interaction of the prompt with the animation used to move to and from
the tab picker is not fixed. This may become unecessary if the tab selection UI
is redisgned.
Patrick Scott [Tue, 4 Aug 2009 17:22:29 +0000 (13:22 -0400)]
Implement onReceivedTouchIconUrl.
Add DownloadTouchIcon, an AsyncTask that downloads the apple-touch-icon for urls
that are marked as bookmarks. The touch icon is stored in the bookmark database
similar to favicons and thumbnails. If a shortcut is created for a bookmark
containing a touch icon, the touch icon is used (with rounded corners).
Refactor the bookmarks query to be a static function. The function uses the
original url and new url to look for matching bookmarks. This takes care of
redirects as well as bookmarks containing queries.
Android (Google) Code Review [Wed, 5 Aug 2009 13:04:41 +0000 (06:04 -0700)]
Merge change 9700
* changes:
Updates for the look of the bookmarks page.
Leon Scroggins [Tue, 4 Aug 2009 20:04:55 +0000 (16:04 -0400)]
Updates for the look of the bookmarks page.
Add new assets.
-tab_indicator.xml
State selector for the background of tabs in the CombinedHistoryActivity
-bookmark_thumnail.xml
Web page title is now above the thumb. Removed the favicon. Added a
shadow.
-tab_header.xml
Layout for the tabs in CombinedHistoryActivity
-tabs.xml
Change the height of the tabs.
-bookmarks.xml
Remove the title for the "switch" menu item, which gets set in Java,
depending on the current viewing mode.
-strings.xml
Remove the placeholder menu item text, add the actual text for
switching between modes.
-BrowserBookmarksAdapter
No longer set the favicon on top of the bookmark thumbs in grid mode.
-BrowserBookmarksPage
Implement onPrepareOptionsMenu, and set the title of a menu option,
depending on the current viewing state.
-CombinedHistoryActivity
Create a common function for setting up all the tabs. Change the
look of the tabs to match the new design.
Android (Google) Code Review [Tue, 4 Aug 2009 17:03:47 +0000 (10:03 -0700)]
Merge change 9477
* changes:
Enable workers for V8. Also remove the quota parameters, unused after the storage UI refactoring.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Mon, 3 Aug 2009 23:41:26 +0000 (16:41 -0700)]
am
9f53534e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9f53534e31a0407a07aa2753e116728a85dfd9ec'
* commit '
9f53534e31a0407a07aa2753e116728a85dfd9ec':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:07:35 +0000 (16:07 -0700)]
Import revised translations. DO NOT MERGE
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
Andrei Popescu [Mon, 3 Aug 2009 15:03:24 +0000 (16:03 +0100)]
Enable workers for V8. Also remove the quota parameters, unused after the storage UI refactoring.
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:45:46 +0000 (07:45 -0700)]
merge from donut
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
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)]
merge from donut
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.