OSDN Git Service
Leon Scroggins [Thu, 17 Sep 2009 01:20:34 +0000 (18:20 -0700)]
am
368cacb3: am
b40bf27e: Use a new resource for pages that do not have a screenshot in bookmarks.
Merge commit '
368cacb37249148c6ad607fcea1282f7243e85da'
* commit '
368cacb37249148c6ad607fcea1282f7243e85da':
Use a new resource for pages that do not have a screenshot in bookmarks.
Leon Scroggins [Thu, 17 Sep 2009 01:17:59 +0000 (18:17 -0700)]
am
f2d1a30e: am
f4bb18a4: Limit the touch area for opening search to the right edge of the textfield.
Merge commit '
f2d1a30e594e57e98553811c238dc9d6c226070b'
* commit '
f2d1a30e594e57e98553811c238dc9d6c226070b':
Limit the touch area for opening search to the right edge of the textfield.
Nicolas Roard [Thu, 17 Sep 2009 01:17:52 +0000 (18:17 -0700)]
am
eead548b: am
11d2375b: Merge change 24908 into eclair
Merge commit '
eead548b67ecc186b83826fe2c60c4e2505045cf'
* commit '
eead548b67ecc186b83826fe2c60c4e2505045cf':
Show icons for storage and geolocation
Leon Scroggins [Thu, 17 Sep 2009 01:17:11 +0000 (18:17 -0700)]
am
bc3e09a0: am
a27ff19e: Show title bar while loading, and hide it when finished loading.
Merge commit '
bc3e09a00ef5137610cfb9cdf41f289ea3a3bcfb'
* commit '
bc3e09a00ef5137610cfb9cdf41f289ea3a3bcfb':
Show title bar while loading, and hide it when finished loading.
Ben Murdoch [Thu, 17 Sep 2009 01:00:43 +0000 (18:00 -0700)]
am
376ac458: am
b9daacb7: Add an options menu to the web site settings activity with just one option to clear all websites\' storage/geolocation permissions.
Merge commit '
376ac45802e16b57264f896a79be4a37ed99dbee'
* commit '
376ac45802e16b57264f896a79be4a37ed99dbee':
Add an options menu to the web site settings activity with just one option to clear all websites' storage/geolocation permissions.
Leon Scroggins [Tue, 15 Sep 2009 20:18:41 +0000 (13:18 -0700)]
am
8d4052b9: am
3bbb6caa: Show the title bar when pressing bringing up the menu.
Merge commit '
8d4052b9e510908d38edf39ce608ca982267c497'
* commit '
8d4052b9e510908d38edf39ce608ca982267c497':
Show the title bar when pressing bringing up the menu.
Leon Scroggins [Tue, 15 Sep 2009 20:15:05 +0000 (13:15 -0700)]
am
cce1eba7: am
9f79346d: Merge change 24688 into eclair
Merge commit '
cce1eba7231358c97da40bb5b24eea867d6cec12'
* commit '
cce1eba7231358c97da40bb5b24eea867d6cec12':
Adjustments for the look of the tab page.
Leon Scroggins [Tue, 15 Sep 2009 20:14:27 +0000 (13:14 -0700)]
am
5186022e: am
1ec74f76: Merge change 24694 into eclair
Merge commit '
5186022eff0c6abc30a4a437f795794bc90b1148'
* commit '
5186022eff0c6abc30a4a437f795794bc90b1148':
Remove the active tabs page when pausing the BrowserActivity.
Grace Kloba [Tue, 15 Sep 2009 20:13:36 +0000 (13:13 -0700)]
am
0bdad0ba: am
819a7f0a: Merge change 24651 into eclair
Merge commit '
0bdad0ba67d5bde0de5c2b0d06015a1c457c8a12'
* commit '
0bdad0ba67d5bde0de5c2b0d06015a1c457c8a12':
Always enable "OK" in the homepage dialog. If it is like "cnn.com",
Leon Scroggins [Mon, 14 Sep 2009 23:08:58 +0000 (16:08 -0700)]
am
b40bf27e: Use a new resource for pages that do not have a screenshot in bookmarks.
Merge commit '
b40bf27e35243d85b616908acd641a223807d137' into eclair-plus-aosp
* commit '
b40bf27e35243d85b616908acd641a223807d137':
Use a new resource for pages that do not have a screenshot in bookmarks.
Leon Scroggins [Mon, 14 Sep 2009 22:43:27 +0000 (18:43 -0400)]
Use a new resource for pages that do not have a screenshot in bookmarks.
Change-Id: Iff64adbd0549be5c182dd38a18c5fbeb5e88a1e8
Leon Scroggins [Mon, 14 Sep 2009 20:33:57 +0000 (13:33 -0700)]
am
f4bb18a4: Limit the touch area for opening search to the right edge of the textfield.
Merge commit '
f4bb18a41259ce62209c768484547d33583f9c77' into eclair-plus-aosp
* commit '
f4bb18a41259ce62209c768484547d33583f9c77':
Limit the touch area for opening search to the right edge of the textfield.
Leon Scroggins [Fri, 11 Sep 2009 22:37:53 +0000 (18:37 -0400)]
Limit the touch area for opening search to the right edge of the textfield.
Now all single taps to the title bar will result in either
a search or opening the bookmarks picker, depending on whether
they were past the right edge of the textfield.
Fixes http://b/issue?id=
2113429
Also move the lock icon in between the favicon and the url. See
http://b/issue?id=
2085847
Change-Id: I30447aa7517b6fc801d3cf34eff233db3a4ce635
Nicolas Roard [Mon, 14 Sep 2009 20:08:48 +0000 (13:08 -0700)]
am
11d2375b: Merge change 24908 into eclair
Merge commit '
11d2375bfc3042e3750028e026244bc9fc8d48b1' into eclair-plus-aosp
* commit '
11d2375bfc3042e3750028e026244bc9fc8d48b1':
Show icons for storage and geolocation
Android (Google) Code Review [Mon, 14 Sep 2009 20:04:51 +0000 (16:04 -0400)]
Merge change 24908 into eclair
* changes:
Show icons for storage and geolocation
Nicolas Roard [Mon, 14 Sep 2009 19:39:08 +0000 (20:39 +0100)]
Show icons for storage and geolocation
Leon Scroggins [Mon, 14 Sep 2009 19:17:30 +0000 (12:17 -0700)]
am
a27ff19e: Show title bar while loading, and hide it when finished loading.
Merge commit '
a27ff19e24cb1c9fef5624dbc4554548349b5b31' into eclair-plus-aosp
* commit '
a27ff19e24cb1c9fef5624dbc4554548349b5b31':
Show title bar while loading, and hide it when finished loading.
Leon Scroggins [Mon, 14 Sep 2009 16:58:04 +0000 (12:58 -0400)]
Show title bar while loading, and hide it when finished loading.
Fix for http://b/issue?id=
2107276
Change-Id: I96cb4d3bd71edeb38b3afc7e58a339021a81ed46
Ben Murdoch [Mon, 14 Sep 2009 15:29:24 +0000 (08:29 -0700)]
am
b9daacb7: Add an options menu to the web site settings activity with just one option to clear all websites\' storage/geolocation permissions.
Merge commit '
b9daacb7513c5a42000285ad456cc614af1915c0' into eclair-plus-aosp
* commit '
b9daacb7513c5a42000285ad456cc614af1915c0':
Add an options menu to the web site settings activity with just one option to clear all websites' storage/geolocation permissions.
Ben Murdoch [Mon, 14 Sep 2009 09:48:24 +0000 (10:48 +0100)]
Add an options menu to the web site settings activity with just one option to clear all websites' storage/geolocation permissions.
Change-Id: Idbcf24f5340491e8d75353838c482bc2d5039da8
Leon Scroggins [Fri, 11 Sep 2009 22:56:46 +0000 (15:56 -0700)]
am
3bbb6caa: Show the title bar when pressing bringing up the menu.
Merge commit '
3bbb6caa3ceaec1106fe1de76066f5e1a186795e' into eclair-plus-aosp
* commit '
3bbb6caa3ceaec1106fe1de76066f5e1a186795e':
Show the title bar when pressing bringing up the menu.
Leon Scroggins [Wed, 9 Sep 2009 16:51:10 +0000 (12:51 -0400)]
Show the title bar when pressing bringing up the menu.
Show an actionable title bar at the top of the screen when the
menu shows.
Change TitleBar* to take a Bitmap for setFavicon, and move the
logic for creating the drawable into TitleBar, so that we can
update directly from the WebView (whose getFavicon method returns
a bitmap).
Remove CUSTOM_BROWSER_BAR, since we are set on using our custom
title bar, and it enabled me to put mGenericFavicon in TitleBar.
Also take screen density into account when sizing the icons for
the title bar.
Change-Id: I3ee6b1d02e8845299f9cd1f648b271543683954a
Leon Scroggins [Fri, 11 Sep 2009 18:28:26 +0000 (11:28 -0700)]
am
9f79346d: Merge change 24688 into eclair
Merge commit '
9f79346da9f52970cd299c78b11917e069507ebb' into eclair-plus-aosp
* commit '
9f79346da9f52970cd299c78b11917e069507ebb':
Adjustments for the look of the tab page.
Android (Google) Code Review [Fri, 11 Sep 2009 18:22:52 +0000 (14:22 -0400)]
Merge change 24688 into eclair
* changes:
Adjustments for the look of the tab page.
Leon Scroggins [Fri, 11 Sep 2009 15:12:58 +0000 (11:12 -0400)]
Adjustments for the look of the tab page.
Remove http://; center "New tab"
Use a drawable with a hi dpi version
Add some padding
Add a divider before the close button
Change-Id: I1e7c98e3e03f2a7b3c8df6db1917a604a6309fb8
Leon Scroggins [Fri, 11 Sep 2009 18:18:06 +0000 (11:18 -0700)]
am
1ec74f76: Merge change 24694 into eclair
Merge commit '
1ec74f76e629980e58a2d316b3b9ab1b1c26f446' into eclair-plus-aosp
* commit '
1ec74f76e629980e58a2d316b3b9ab1b1c26f446':
Remove the active tabs page when pausing the BrowserActivity.
Android (Google) Code Review [Fri, 11 Sep 2009 18:11:58 +0000 (14:11 -0400)]
Merge change 24694 into eclair
* changes:
Remove the active tabs page when pausing the BrowserActivity.
Leon Scroggins [Fri, 11 Sep 2009 15:49:52 +0000 (11:49 -0400)]
Remove the active tabs page when pausing the BrowserActivity.
This fixes http://b/issue?id=
2113505
Change-Id: Ibb66546a86082986170ec983c4e081008182baac
Grace Kloba [Fri, 11 Sep 2009 17:26:11 +0000 (10:26 -0700)]
am
819a7f0a: Merge change 24651 into eclair
Merge commit '
819a7f0ae1183c10384df378df266ed31349a83f' into eclair-plus-aosp
* commit '
819a7f0ae1183c10384df378df266ed31349a83f':
Always enable "OK" in the homepage dialog. If it is like "cnn.com",
Android (Google) Code Review [Fri, 11 Sep 2009 17:17:20 +0000 (13:17 -0400)]
Merge change 24651 into eclair
* changes:
Always enable "OK" in the homepage dialog. If it is like "cnn.com", make it "http://cnn.com". If it has space or has colon, but doesn't match the acceptable schema, show an error dialog and don't take the invalid result.
Cary Clark [Fri, 11 Sep 2009 13:36:32 +0000 (06:36 -0700)]
am
7fa57a79: am
652ff87f: allow mixed-case schemes in user-defined URLs
Merge commit '
7fa57a79ada1b0bcf81e94cb3a175e69bf901e5e'
* commit '
7fa57a79ada1b0bcf81e94cb3a175e69bf901e5e':
allow mixed-case schemes in user-defined URLs
Cary Clark [Fri, 11 Sep 2009 13:31:18 +0000 (06:31 -0700)]
am
652ff87f: allow mixed-case schemes in user-defined URLs
Merge commit '
652ff87f0905abd11f2fdb6cb4de7840985a0810' into eclair-plus-aosp
* commit '
652ff87f0905abd11f2fdb6cb4de7840985a0810':
allow mixed-case schemes in user-defined URLs
Grace Kloba [Fri, 11 Sep 2009 04:28:18 +0000 (21:28 -0700)]
Always enable "OK" in the homepage dialog. If it is like "cnn.com",
make it "http://cnn.com". If it has space or has colon, but doesn't
match the acceptable schema, show an error dialog and don't take the
invalid result.
Fix http://b/issue?id=
2106155
Cary Clark [Thu, 10 Sep 2009 17:34:44 +0000 (13:34 -0400)]
allow mixed-case schemes in user-defined URLs
Adjust the scheme to all lower case before fixing the URL. This
allows mixed-case entries in bookmarks to resolve to a conical
lower case URL.
Leon Scroggins [Thu, 10 Sep 2009 20:52:21 +0000 (13:52 -0700)]
am
2c521653: am
fcbd1d9d: Merge change 24561 into eclair
Merge commit '
2c5216535b80a79ce75af36fcb8ad53a7198c356'
* commit '
2c5216535b80a79ce75af36fcb8ad53a7198c356':
Remove the search bar from the bookmarks page.
Leon Scroggins [Thu, 10 Sep 2009 20:52:18 +0000 (13:52 -0700)]
am
996c8491: am
9dd042fc: Merge change 24566 into eclair
Merge commit '
996c8491a4bd1189b513b7752a008e5ae146bd59'
* commit '
996c8491a4bd1189b513b7752a008e5ae146bd59':
Make the text in the title bar larger and centered.
Leon Scroggins [Thu, 10 Sep 2009 20:47:37 +0000 (13:47 -0700)]
am
fcbd1d9d: Merge change 24561 into eclair
Merge commit '
fcbd1d9d88d0f7a97504ce4604553f46b5da6b7b' into eclair-plus-aosp
* commit '
fcbd1d9d88d0f7a97504ce4604553f46b5da6b7b':
Remove the search bar from the bookmarks page.
Leon Scroggins [Thu, 10 Sep 2009 20:47:34 +0000 (13:47 -0700)]
am
9dd042fc: Merge change 24566 into eclair
Merge commit '
9dd042fc32038c464265ee466a874e4ae742e384' into eclair-plus-aosp
* commit '
9dd042fc32038c464265ee466a874e4ae742e384':
Make the text in the title bar larger and centered.
Android (Google) Code Review [Thu, 10 Sep 2009 20:39:55 +0000 (16:39 -0400)]
Merge change 24561 into eclair
* changes:
Remove the search bar from the bookmarks page.
Android (Google) Code Review [Thu, 10 Sep 2009 20:38:54 +0000 (16:38 -0400)]
Merge change 24566 into eclair
* changes:
Make the text in the title bar larger and centered.
Leon Scroggins [Thu, 10 Sep 2009 20:22:48 +0000 (16:22 -0400)]
Make the text in the title bar larger and centered.
Fixes http://b/issue?id=
2107393
Change-Id: Id9d959769e0fb988459c960c91ecd1fdb7064786
Leon Scroggins [Thu, 10 Sep 2009 19:16:01 +0000 (15:16 -0400)]
Remove the search bar from the bookmarks page.
Now that the bookmarks page is no longer the landing page, there is
no need to have a search bar at the top. Since there is now more
screen real estate, turn the mini-tabs back into regular tabs, and
return their icons. Also switch the states to look appropriate with
the new look of tabs.
Change-Id: I4cf3544753a16a57caf7a8cf1bf375008caad67c
Leon Scroggins [Thu, 10 Sep 2009 18:46:34 +0000 (11:46 -0700)]
Leon Scroggins [Thu, 10 Sep 2009 18:41:58 +0000 (11:41 -0700)]
am
0a64ba58: Add an active tabs page.
Merge commit '
0a64ba581c9e476ef10f36a62825df933771427d' into eclair-plus-aosp
* commit '
0a64ba581c9e476ef10f36a62825df933771427d':
Add an active tabs page.
Leon Scroggins [Tue, 8 Sep 2009 19:35:33 +0000 (15:35 -0400)]
Add an active tabs page.
The active tabs page gives the user the ability to see all of their
open tabs in a list, and switch tabs, create a new one, or close
an old one.
Fix for http://b/issue?id=
2101994
Change-Id: Id4c14dd437f769144dbdb02011144ea97d8fd030
Steve Block [Thu, 10 Sep 2009 16:24:33 +0000 (09:24 -0700)]
am
cf3d2b7f: am
44f1b387: Merge change 24521 into eclair
Merge commit '
cf3d2b7f7b7a2fa66239671ab1be65c44dbeb22d'
* commit '
cf3d2b7f7b7a2fa66239671ab1be65c44dbeb22d':
Rounds up to the nearest 0.1MB when displaying the storage used by a website.
Grace Kloba [Thu, 10 Sep 2009 16:24:30 +0000 (09:24 -0700)]
am
f0465f20: am
6b52a55e: Remove clientid from the url before it is added to the database. So that we won\'t show them in the auto-complete list.
Merge commit '
f0465f2090bae34864cea7b80ea9ad0740869ef3'
* commit '
f0465f2090bae34864cea7b80ea9ad0740869ef3':
Remove clientid from the url before it is added to the database. So that we
Steve Block [Thu, 10 Sep 2009 15:54:06 +0000 (08:54 -0700)]
am
44f1b387: Merge change 24521 into eclair
Merge commit '
44f1b38741122789fea19affc1a80a5cf90b81bf' into eclair-plus-aosp
* commit '
44f1b38741122789fea19affc1a80a5cf90b81bf':
Rounds up to the nearest 0.1MB when displaying the storage used by a website.
Android (Google) Code Review [Thu, 10 Sep 2009 15:50:02 +0000 (11:50 -0400)]
Merge change 24521 into eclair
* changes:
Rounds up to the nearest 0.1MB when displaying the storage used by a website.
Grace Kloba [Thu, 10 Sep 2009 15:39:33 +0000 (08:39 -0700)]
am
6b52a55e: Remove clientid from the url before it is added to the database. So that we won\'t show them in the auto-complete list.
Merge commit '
6b52a55ecd3b91ca31a0d7111f87a5d7937f215b' into eclair-plus-aosp
* commit '
6b52a55ecd3b91ca31a0d7111f87a5d7937f215b':
Remove clientid from the url before it is added to the database. So that we
Steve Block [Thu, 10 Sep 2009 14:01:37 +0000 (15:01 +0100)]
Rounds up to the nearest 0.1MB when displaying the storage used by a website.
This fixes bug http://b/issue?id=
2024901.
Change-Id: Ifa8d12e3a5844c8e5b27ce9ddd817058257eabc6
Cary Clark [Wed, 9 Sep 2009 23:27:11 +0000 (16:27 -0700)]
am
5258c121: am
54ba51c4: Merge change 23974 into eclair
Merge commit '
5258c1211df748457139743f4ac4a8f37f16bc5c'
* commit '
5258c1211df748457139743f4ac4a8f37f16bc5c':
allow file: scheme in the browser
Grace Kloba [Thu, 3 Sep 2009 23:29:56 +0000 (16:29 -0700)]
Remove clientid from the url before it is added to the database. So that we
won't show them in the auto-complete list.
Update the browser.db and remove history only entries who has clientid.
Fix http://b/issue?id=
2099727
Eric Fischer [Wed, 9 Sep 2009 17:56:30 +0000 (10:56 -0700)]
am
435e4ed4: (-s ours) am
85f976ef: Import revised translations. DO NOT MERGE
Merge commit '
435e4ed4dce7f26f7b77c5d469fb17c30be83a0d'
* commit '
435e4ed4dce7f26f7b77c5d469fb17c30be83a0d':
Import revised translations. DO NOT MERGE
Cary Clark [Wed, 9 Sep 2009 16:47:32 +0000 (09:47 -0700)]
am
54ba51c4: Merge change 23974 into eclair
Merge commit '
54ba51c47f42ef4c37005fada71c2bda978e8e43' into eclair-plus-aosp
* commit '
54ba51c47f42ef4c37005fada71c2bda978e8e43':
allow file: scheme in the browser
Android (Google) Code Review [Wed, 9 Sep 2009 16:41:35 +0000 (12:41 -0400)]
Merge change 23974 into eclair
* changes:
allow file: scheme in the browser
Cary Clark [Fri, 4 Sep 2009 16:25:10 +0000 (12:25 -0400)]
allow file: scheme in the browser
When creating a bookmark, allow the book's URL to start with
javascript: . Use URI to isolate the scheme
to take care of case and special characters.
fixes http://b/issue?id=
2059889
Eric Fischer [Wed, 9 Sep 2009 00:02:35 +0000 (17:02 -0700)]
am
85f976ef: Import revised translations. DO NOT MERGE
Merge commit '
85f976ef9a4f70757829845f1a0bdaeea5ccd7d3' into eclair-plus-aosp
* commit '
85f976ef9a4f70757829845f1a0bdaeea5ccd7d3':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:24:45 +0000 (16:24 -0700)]
Import revised translations. DO NOT MERGE
Leon Scroggins [Tue, 8 Sep 2009 23:00:47 +0000 (16:00 -0700)]
am
27f73cf0: am
241cfc29: Adjust the height of the mini-tabs to account for density.
Merge commit '
27f73cf05086337fb55e323e6c9f69dfeab9a858'
* commit '
27f73cf05086337fb55e323e6c9f69dfeab9a858':
Adjust the height of the mini-tabs to account for density.
Patrick Scott [Tue, 8 Sep 2009 23:00:45 +0000 (16:00 -0700)]
am
6894602b: am
3aa8204d: Merge changes 23486,23988 into eclair
Merge commit '
6894602b42d3fb3d7d4609decf66f3ba0d783d9c'
* commit '
6894602b42d3fb3d7d4609decf66f3ba0d783d9c':
enable plugins to launch an activity within the browser
Leon Scroggins [Tue, 8 Sep 2009 20:40:33 +0000 (13:40 -0700)]
am
241cfc29: Adjust the height of the mini-tabs to account for density.
Merge commit '
241cfc2942a48a8da198a16ac14df2f4e10b93fa' into eclair-plus-aosp
* commit '
241cfc2942a48a8da198a16ac14df2f4e10b93fa':
Adjust the height of the mini-tabs to account for density.
Patrick Scott [Tue, 8 Sep 2009 20:40:31 +0000 (13:40 -0700)]
am
3aa8204d: Merge changes 23486,23988 into eclair
Merge commit '
3aa8204dffd85a291305cc5fbf133c05cc6fbc91' into eclair-plus-aosp
* commit '
3aa8204dffd85a291305cc5fbf133c05cc6fbc91':
enable plugins to launch an activity within the browser
Leon Scroggins [Tue, 8 Sep 2009 18:55:19 +0000 (14:55 -0400)]
Adjust the height of the mini-tabs to account for density.
Fix for http://b/issue?id=
2098612
Change-Id: Ieb905a35f0205e9bffe8cd790f01aa6b061f8bdc
Android (Google) Code Review [Tue, 8 Sep 2009 12:46:48 +0000 (05:46 -0700)]
Merge changes 23486,23988 into eclair
* changes:
Update the manifest to mark the activity as the default.
enable plugins to launch an activity within the browser
Leon Scroggins [Fri, 4 Sep 2009 23:00:26 +0000 (16:00 -0700)]
am
207d12ff: am
30444237: Go to the home page when opening a new tab/the browser.
Merge commit '
207d12ffc19e90f3d3ad8fb368922d7454592f21'
* commit '
207d12ffc19e90f3d3ad8fb368922d7454592f21':
Go to the home page when opening a new tab/the browser.
Leon Scroggins [Fri, 4 Sep 2009 22:58:45 +0000 (15:58 -0700)]
am
30444237: Go to the home page when opening a new tab/the browser.
Merge commit '
304442375719effd41dbd53ae62de7a8d0cec7d9' into eclair-plus-aosp
* commit '
304442375719effd41dbd53ae62de7a8d0cec7d9':
Go to the home page when opening a new tab/the browser.
Leon Scroggins [Fri, 4 Sep 2009 22:36:20 +0000 (18:36 -0400)]
Go to the home page when opening a new tab/the browser.
As requested in http://b/issue?id=
2101999, we are going
back to opening the home page when opening the browser or
a new tab.
Change-Id: I2608bab74494a0af2919bf351340579bcd58201f
Leon Scroggins [Fri, 4 Sep 2009 21:43:12 +0000 (14:43 -0700)]
am
18377b1e: am
55a5bc2a: Clean up changes from attaching title bar to top of WebView
Merge commit '
18377b1e3a57bb253ca44b1e231bb6ed111a4fe3'
* commit '
18377b1e3a57bb253ca44b1e231bb6ed111a4fe3':
Clean up changes from attaching title bar to top of WebView
Leon Scroggins [Fri, 4 Sep 2009 21:40:40 +0000 (14:40 -0700)]
am
55a5bc2a: Clean up changes from attaching title bar to top of WebView
Merge commit '
55a5bc2a8f3c9a0721eeaa5a45241e00d5da95ef' into eclair-plus-aosp
* commit '
55a5bc2a8f3c9a0721eeaa5a45241e00d5da95ef':
Clean up changes from attaching title bar to top of WebView
Leon Scroggins [Fri, 4 Sep 2009 21:00:08 +0000 (17:00 -0400)]
Clean up changes from attaching title bar to top of WebView
Renamed addTitleBar to setEmbeddedTitleBar. Requires a
change to frameworks/base
Change-Id: I0ea3c969dbd8c365a9f71eb373b11ddb0aa30b9b
Patrick Scott [Fri, 4 Sep 2009 13:51:45 +0000 (09:51 -0400)]
Update the manifest to mark the activity as the default.
This was needed during testing and threw an exception without it. Not sure how
Derek got around not having it before.
Leon Scroggins [Fri, 4 Sep 2009 18:07:27 +0000 (11:07 -0700)]
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:08 +0000 (11:06 -0700)]
Leon Scroggins [Fri, 4 Sep 2009 17:54:38 +0000 (10:54 -0700)]
am
62e8f941: New title bar look.
Merge commit '
62e8f9415c0d7f9d4034cde28e009cf03871fe1b' into eclair-plus-aosp
* commit '
62e8f9415c0d7f9d4034cde28e009cf03871fe1b':
New title bar look.
Leon Scroggins [Thu, 3 Sep 2009 19:08:54 +0000 (15:08 -0400)]
New title bar look.
Use the same method as the search bar for showing the circular
progress, which is much more visible than the current model.
Use latest assets.
Move the lock icon outside the textbox.
Change-Id: I7fd5911cb4492d3cd52132e817da75f720b42b55
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:16 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:12 +0000 (14:13 -0700)]
merge from donut
Leon Scroggins [Thu, 3 Sep 2009 18:48:37 +0000 (11:48 -0700)]
am
387f2d13: Merge change 23812 into eclair
Merge commit '
387f2d1357f85b5e7f6d17bba8917a81d6ca455f'
* commit '
387f2d1357f85b5e7f6d17bba8917a81d6ca455f':
Show the full url in the title bar.
Leon Scroggins [Thu, 3 Sep 2009 18:48:35 +0000 (11:48 -0700)]
am
39ab28eb: Attach the title bar to the top of the page.
Merge commit '
39ab28eba0c8c837ac80851ec0dd2af336aa3f85'
* commit '
39ab28eba0c8c837ac80851ec0dd2af336aa3f85':
Attach the title bar to the top of the page.
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:58:45 +0000 (13:58 -0700)]
am
13fbf511: Revert "Add a test case in browser to measure the power usage of loading a web page"
Merge commit '
13fbf511bbaec5fdb4a4358b82ff54d0d9bb69e8'
* commit '
13fbf511bbaec5fdb4a4358b82ff54d0d9bb69e8':
Revert "Add a test case in browser to measure the power usage of loading a web page"
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.
Xia Wang [Wed, 2 Sep 2009 20:35:08 +0000 (13:35 -0700)]
am
1b9d863e: Merge change 23647 into eclair
Merge commit '
1b9d863e2ae3a37809c96de61b398a2bb0391613'
* commit '
1b9d863e2ae3a37809c96de61b398a2bb0391613':
Add a test case in browser to measure the power usage of loading a web page
Leon Scroggins [Wed, 2 Sep 2009 20:34:12 +0000 (13:34 -0700)]
am
f6c80180: Merge change 23445 into eclair
Merge commit '
f6c80180348f3e6e10270b531992257e53b2e372'
* commit '
f6c80180348f3e6e10270b531992257e53b2e372':
When removing a tab, go back to the correct parent tab.
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 23:13:11 +0000 (16:13 -0700)]
am
bb0af5ce: When we close a window on exit, make sure pauseWebView taking action by setting mPageStarted to false.
Merge commit '
bb0af5ced906e5100d54f0c08e073e669edf2290'
* commit '
bb0af5ced906e5100d54f0c08e073e669edf2290':
When we close a window on exit, make sure pauseWebView taking action by
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
Derek Sollenberger [Tue, 1 Sep 2009 20:24:08 +0000 (16:24 -0400)]
enable plugins to launch an activity within the browser
Change-Id: Ife459b2d248a2ce0c0a4de3f69b74c86ee472266
Cary Clark [Tue, 1 Sep 2009 19:14:51 +0000 (12:14 -0700)]
am
f78844b8: Merge change 23440 into eclair
Merge commit '
f78844b84f4101026df34464a899ae51c9214d77'
* commit '
f78844b84f4101026df34464a899ae51c9214d77':
allow adding content: bookmarks
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 [Tue, 1 Sep 2009 14:11:40 +0000 (07:11 -0700)]
am
a81a7640: Update the appearance of the title bar in the browser.
Merge commit '
a81a764063d2f849fba0cbc3039f86e67c2960dd'
* commit '
a81a764063d2f849fba0cbc3039f86e67c2960dd':
Update the appearance of the title bar in the browser.
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, 1 Sep 2009 12:42:32 +0000 (05:42 -0700)]
am
5d61a6c4: Use the new code values for onReceivedError.
Merge commit '
5d61a6c4dfb1f6e7b811f33c2a9bbe09b955293b'
* commit '
5d61a6c4dfb1f6e7b811f33c2a9bbe09b955293b':
Use the new code values for onReceivedError.