OSDN Git Service
Grace Kloba [Thu, 1 Oct 2009 18:37:20 +0000 (11:37 -0700)]
am
1fb12a7a: am
1e705056: Check null for intent.getData() before using it.
Merge commit '
1fb12a7a54dd4fe0f1f4b4a128d40ab2c680c9fd'
* commit '
1fb12a7a54dd4fe0f1f4b4a128d40ab2c680c9fd':
Check null for intent.getData() before using it.
Leon Scroggins [Thu, 1 Oct 2009 18:36:06 +0000 (11:36 -0700)]
am
f82dfdd0: am
380ac10b: Merge change Id9898b22 into eclair
Merge commit '
f82dfdd0fe7237434519c6d468c11a293cf63301'
* commit '
f82dfdd0fe7237434519c6d468c11a293cf63301':
Check to make sure the captured picture is non null before using.
Android Git Automerger [Thu, 1 Oct 2009 18:28:52 +0000 (11:28 -0700)]
skipping for now
Merge commit '
a292b731'
Christopher Tate [Thu, 1 Oct 2009 18:19:28 +0000 (11:19 -0700)]
am
b33f375c: am
3a226f7c: Merge change Iffca70f6 into eclair
Merge commit '
b33f375ca37b2ebf6ce3b94812b55d7414ec36a7'
* commit '
b33f375ca37b2ebf6ce3b94812b55d7414ec36a7':
Reduce browser backup agent's amount of logging
Leon Scroggins [Thu, 1 Oct 2009 18:17:51 +0000 (11:17 -0700)]
Steve Block [Thu, 1 Oct 2009 18:17:27 +0000 (11:17 -0700)]
am
117b9b1a: am
5d590de2: Merge change I237fc084 into eclair
Merge commit '
117b9b1a772934983391fad38ae9c4086b8bd080'
* commit '
117b9b1a772934983391fad38ae9c4086b8bd080':
Makes Geolocation permissions prompt pretty.
Grace Kloba [Thu, 1 Oct 2009 18:16:55 +0000 (11:16 -0700)]
am
de993c10: am
458c81a3: Merge change I67f0a56d into eclair
Merge commit '
de993c100a90a6dcb4e7921ad5e9aaf29a75fb56'
* commit '
de993c100a90a6dcb4e7921ad5e9aaf29a75fb56':
Enable fading scrollbar for the Browser
Cary Clark [Thu, 1 Oct 2009 18:14:49 +0000 (11:14 -0700)]
am
d5b2cea1: am
a0464554: don\'t create the fake title bar when getGlobalVisible fails
Merge commit '
d5b2cea14d51b52f3a25282b0405adb9dc7310e4'
* commit '
d5b2cea14d51b52f3a25282b0405adb9dc7310e4':
don't create the fake title bar when getGlobalVisible fails
Ben Murdoch [Thu, 1 Oct 2009 18:12:47 +0000 (11:12 -0700)]
am
055fa60f: am
2694e23a: Fix miniature thumbnail problem and delay saving of a screenshot by 500ms after a page has completed loading to ensure the WebView has completed painting and that we therefore save an accurate thumbnail.
Merge commit '
055fa60f57c6ec481acba47ed0367566ede9eaab'
* commit '
055fa60f57c6ec481acba47ed0367566ede9eaab':
Fix miniature thumbnail problem and delay saving of a screenshot by 500ms after a page has completed loading to ensure the WebView has completed painting and that we therefore save an accurate thumbnail.
Mike Cleron [Thu, 1 Oct 2009 18:10:49 +0000 (11:10 -0700)]
Grace Kloba [Tue, 29 Sep 2009 21:32:29 +0000 (14:32 -0700)]
am
1e705056: Check null for intent.getData() before using it.
Merge commit '
1e70505659dd9bf0f7e03bce787ba880f9b7a8aa' into eclair-plus-aosp
* commit '
1e70505659dd9bf0f7e03bce787ba880f9b7a8aa':
Check null for intent.getData() before using it.
Grace Kloba [Tue, 29 Sep 2009 20:13:36 +0000 (13:13 -0700)]
Check null for intent.getData() before using it.
Fix http://b/issue?id=
2151485
Leon Scroggins [Tue, 29 Sep 2009 20:56:58 +0000 (13:56 -0700)]
am
380ac10b: Merge change Id9898b22 into eclair
Merge commit '
380ac10b1c694f791fa75b6f29493954b2596bd8' into eclair-plus-aosp
* commit '
380ac10b1c694f791fa75b6f29493954b2596bd8':
Check to make sure the captured picture is non null before using.
Android (Google) Code Review [Tue, 29 Sep 2009 20:52:19 +0000 (16:52 -0400)]
Merge change Id9898b22 into eclair
* changes:
Check to make sure the captured picture is non null before using.
Leon Scroggins [Tue, 29 Sep 2009 20:38:47 +0000 (16:38 -0400)]
Check to make sure the captured picture is non null before using.
Fixes http://b/issue?id=
2154493
Change-Id: Id9898b2251585e8adbae286df6173a2e1989c838
Cary Clark [Tue, 29 Sep 2009 19:51:12 +0000 (12:51 -0700)]
am
49a33f8c: Merge change I776878e9 into eclair
Merge commit '
49a33f8ca0ad04c57362edaf0692e9e3bffa1177' into eclair-plus-aosp
* commit '
49a33f8ca0ad04c57362edaf0692e9e3bffa1177':
Add '&android-home' to the google homepage string
Christopher Tate [Tue, 29 Sep 2009 19:51:09 +0000 (12:51 -0700)]
am
3a226f7c: Merge change Iffca70f6 into eclair
Merge commit '
3a226f7c9f6d3ef8b2c44b9863512e6b3e374f9c' into eclair-plus-aosp
* commit '
3a226f7c9f6d3ef8b2c44b9863512e6b3e374f9c':
Reduce browser backup agent's amount of logging
Android (Google) Code Review [Tue, 29 Sep 2009 19:45:29 +0000 (15:45 -0400)]
Merge change I776878e9 into eclair
* changes:
Add '&android-home' to the google homepage string
Android (Google) Code Review [Tue, 29 Sep 2009 19:43:35 +0000 (15:43 -0400)]
Merge change Iffca70f6 into eclair
* changes:
Reduce browser backup agent's amount of logging
Christopher Tate [Tue, 29 Sep 2009 19:40:25 +0000 (12:40 -0700)]
Reduce browser backup agent's amount of logging
DEBUG=false now, and so we emit only one-line activity summaries during backup
and restore.
Change-Id: Iffca70f60581672ce686429db0a4382d934de663
Cary Clark [Tue, 29 Sep 2009 19:12:03 +0000 (15:12 -0400)]
Add '&android-home' to the google homepage string
Also, mark it as non-translatable, and remove the translated
versions.
fixes http://b/issue?id=
2148022
Leon Scroggins [Tue, 29 Sep 2009 19:06:26 +0000 (12:06 -0700)]
am
3f68d272: Updates for the title bar.
Merge commit '
3f68d2722de5d4b848adc40662f9ead6e64235e5' into eclair-plus-aosp
* commit '
3f68d2722de5d4b848adc40662f9ead6e64235e5':
Updates for the title bar.
Leon Scroggins [Tue, 29 Sep 2009 17:08:35 +0000 (13:08 -0400)]
Updates for the title bar.
Modify the layout of the title bar to better match that of the
search bar. Also use the newer asset for the bookmarks button.
See http://b/issue?id=
2126429 and http://b/issue?id=
2145205
Change-Id: I14f05ca00a30f67d59d407ac3f6dfb2ac63a8184
Steve Block [Tue, 29 Sep 2009 18:37:09 +0000 (11:37 -0700)]
am
5d590de2: Merge change I237fc084 into eclair
Merge commit '
5d590de2d2d6338de0a516718bec4d390355a0af' into eclair-plus-aosp
* commit '
5d590de2d2d6338de0a516718bec4d390355a0af':
Makes Geolocation permissions prompt pretty.
Android (Google) Code Review [Tue, 29 Sep 2009 18:31:29 +0000 (14:31 -0400)]
Merge change I237fc084 into eclair
* changes:
Makes Geolocation permissions prompt pretty.
Grace Kloba [Tue, 29 Sep 2009 18:14:48 +0000 (11:14 -0700)]
am
458c81a3: Merge change I67f0a56d into eclair
Merge commit '
458c81a357d078f8fcb701f27a287c9e634903a7' into eclair-plus-aosp
* commit '
458c81a357d078f8fcb701f27a287c9e634903a7':
Enable fading scrollbar for the Browser
Steve Block [Tue, 29 Sep 2009 12:14:41 +0000 (13:14 +0100)]
Makes Geolocation permissions prompt pretty.
Change-Id: I237fc0845de2297babc7da448a2199c5344e2e83
Cary Clark [Tue, 29 Sep 2009 18:09:17 +0000 (11:09 -0700)]
am
e506ffd6: am
65f4a3ce: check to see if the real title bar has no parent
Merge commit '
e506ffd632750892e5f42ac7497b7469bba0d20f'
* commit '
e506ffd632750892e5f42ac7497b7469bba0d20f':
check to see if the real title bar has no parent
Leon Scroggins [Tue, 29 Sep 2009 18:06:59 +0000 (11:06 -0700)]
Leon Scroggins [Tue, 29 Sep 2009 18:06:33 +0000 (11:06 -0700)]
Android (Google) Code Review [Tue, 29 Sep 2009 18:05:48 +0000 (14:05 -0400)]
Merge change I67f0a56d into eclair
* changes:
Enable fading scrollbar for the Browser
Cary Clark [Tue, 29 Sep 2009 17:24:11 +0000 (10:24 -0700)]
am
a0464554: don\'t create the fake title bar when getGlobalVisible fails
Merge commit '
a04645545690d9f637ccae4d043a5a1b8478a832' into eclair-plus-aosp
* commit '
a04645545690d9f637ccae4d043a5a1b8478a832':
don't create the fake title bar when getGlobalVisible fails
Cary Clark [Tue, 29 Sep 2009 17:00:45 +0000 (13:00 -0400)]
don't create the fake title bar when getGlobalVisible fails
If getGlobalVisibleFails, the visible rectangle top is
assumed to be zero, as if the status bar has no height. The
fake title bar is then drawn underneath the actual status
bar. Bail on the fake title bar creation if the status bar
can't be measured.
Ben Murdoch [Tue, 29 Sep 2009 15:04:24 +0000 (08:04 -0700)]
am
2694e23a: Fix miniature thumbnail problem and delay saving of a screenshot by 500ms after a page has completed loading to ensure the WebView has completed painting and that we therefore save an accurate thumbnail.
Merge commit '
2694e23a55d5ca526fc29534a80a200e2c58698b' into eclair-plus-aosp
* commit '
2694e23a55d5ca526fc29534a80a200e2c58698b':
Fix miniature thumbnail problem and delay saving of a screenshot by 500ms after a page has completed loading to ensure the WebView has completed painting and that we therefore save an accurate thumbnail.
Ben Murdoch [Tue, 29 Sep 2009 08:41:11 +0000 (09:41 +0100)]
Fix miniature thumbnail problem and delay saving of a screenshot by 500ms after a page has completed loading to ensure the WebView has completed painting and that we therefore save an accurate thumbnail.
Change-Id: I77f5d12062de0b9703e5d3ec0c53910f4d62743d
Mike Cleron [Tue, 29 Sep 2009 07:00:53 +0000 (00:00 -0700)]
Mike Cleron [Tue, 29 Sep 2009 06:50:30 +0000 (23:50 -0700)]
New icons
Grace Kloba [Tue, 29 Sep 2009 04:24:51 +0000 (21:24 -0700)]
Enable fading scrollbar for the Browser
Fix http://b/issue?id=
2151115
Cary Clark [Mon, 28 Sep 2009 21:21:32 +0000 (14:21 -0700)]
am
65f4a3ce: check to see if the real title bar has no parent
Merge commit '
65f4a3ce9e5c4a5227bbcbb995e5e15f1f85d3d7' into eclair-plus-aosp
* commit '
65f4a3ce9e5c4a5227bbcbb995e5e15f1f85d3d7':
check to see if the real title bar has no parent
Cary Clark [Mon, 28 Sep 2009 21:05:06 +0000 (17:05 -0400)]
check to see if the real title bar has no parent
This works around a monkey-found crash that is unlikely to
be triggerable by a user.
Fixes http://b/issue?id=
2150746
Leon Scroggins [Mon, 28 Sep 2009 20:13:25 +0000 (13:13 -0700)]
am
8d19cb8f: More assets refresh.
Merge commit '
8d19cb8f08e8094d6eb4fd879c81a17c46b36cad' into eclair-plus-aosp
* commit '
8d19cb8f08e8094d6eb4fd879c81a17c46b36cad':
More assets refresh.
Leon Scroggins [Mon, 28 Sep 2009 19:59:11 +0000 (12:59 -0700)]
am
f6e05ba4: Use new bookmark assets.
Merge commit '
f6e05ba45ce286887fca129d45416fa91f3724ad' into eclair-plus-aosp
* commit '
f6e05ba45ce286887fca129d45416fa91f3724ad':
Use new bookmark assets.
Leon Scroggins [Mon, 28 Sep 2009 19:56:52 +0000 (15:56 -0400)]
More assets refresh.
Change-Id: Ieb591dd057d36919daea4578d0c15bcc896b5672
Leon Scroggins [Mon, 28 Sep 2009 19:30:44 +0000 (15:30 -0400)]
Use new bookmark assets.
Use the latest assets for the bookmark menu option, as well as for
the bookmark tab on the bookmarks page.
Fixes http://b/issue?id=
2145205
Change-Id: Ic36ce791a9352be2a175f5affba32873b4854d8e
Nicolas Roard [Mon, 28 Sep 2009 17:47:04 +0000 (10:47 -0700)]
am
55a00517: am
88fa35e4: Merge change 27451 into eclair
Merge commit '
55a00517c0842590ace2e6c7c8eff28ea1204401'
* commit '
55a00517c0842590ace2e6c7c8eff28ea1204401':
Fix for the dual notification problem
Leon Scroggins [Mon, 28 Sep 2009 17:47:00 +0000 (10:47 -0700)]
Nicolas Roard [Mon, 28 Sep 2009 17:42:07 +0000 (10:42 -0700)]
am
88fa35e4: Merge change 27451 into eclair
Merge commit '
88fa35e452de655e85ad702b74cc1447d8228711' into eclair-plus-aosp
* commit '
88fa35e452de655e85ad702b74cc1447d8228711':
Fix for the dual notification problem
Leon Scroggins [Mon, 28 Sep 2009 17:42:04 +0000 (10:42 -0700)]
am
29a6b734: Merge change 27460 into eclair
Merge commit '
29a6b73472c2876a958b2d171b3cdb5e912254df' into eclair-plus-aosp
* commit '
29a6b73472c2876a958b2d171b3cdb5e912254df':
Update menu items.
Android (Google) Code Review [Mon, 28 Sep 2009 17:37:06 +0000 (13:37 -0400)]
Merge change 27451 into eclair
* changes:
Fix for the dual notification problem
Android (Google) Code Review [Mon, 28 Sep 2009 17:36:37 +0000 (13:36 -0400)]
Merge change 27460 into eclair
* changes:
Update menu items.
Nicolas Roard [Mon, 28 Sep 2009 16:03:36 +0000 (17:03 +0100)]
Fix for the dual notification problem
Leon Scroggins [Mon, 28 Sep 2009 17:07:44 +0000 (10:07 -0700)]
am
d2959af4: am
bbe6d5b3: Make bookmarks grid view inset by the width of the scrollbar.
Merge commit '
d2959af482e0eddc8a767af19c469aa15f375cec'
* commit '
d2959af482e0eddc8a767af19c469aa15f375cec':
Make bookmarks grid view inset by the width of the scrollbar.
Cary Clark [Mon, 28 Sep 2009 17:06:52 +0000 (10:06 -0700)]
am
d1a97542: am
445aaddf: Merge change 27436 into eclair
Merge commit '
d1a975429c026de77e99989a5b9292a785a492a9'
* commit '
d1a975429c026de77e99989a5b9292a785a492a9':
append '&source=android-home' to the homepage_base string
Ben Murdoch [Mon, 28 Sep 2009 17:06:18 +0000 (10:06 -0700)]
am
733a9658: am
cbb77455: Merge change 27416 into eclair
Merge commit '
733a9658d851758621a7ae78a46c23d97f0aa206'
* commit '
733a9658d851758621a7ae78a46c23d97f0aa206':
Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
Ben Murdoch [Mon, 28 Sep 2009 17:06:14 +0000 (10:06 -0700)]
am
7dab5270: am
fbaf61ea: Fix NPE when adding a new bookmark.
Merge commit '
7dab5270d339a585eb73590f5efac39bfcd8c30c'
* commit '
7dab5270d339a585eb73590f5efac39bfcd8c30c':
Fix NPE when adding a new bookmark.
Leon Scroggins [Mon, 28 Sep 2009 16:54:35 +0000 (09:54 -0700)]
am
bbe6d5b3: Make bookmarks grid view inset by the width of the scrollbar.
Merge commit '
bbe6d5b380d1aba4b0b2eeff1aa514112328968a' into eclair-plus-aosp
* commit '
bbe6d5b380d1aba4b0b2eeff1aa514112328968a':
Make bookmarks grid view inset by the width of the scrollbar.
Leon Scroggins [Mon, 28 Sep 2009 16:01:00 +0000 (12:01 -0400)]
Make bookmarks grid view inset by the width of the scrollbar.
Fix for http://b/issue?id=
2148144
Change-Id: I2291939de843720899dfd8f4281ed9dcb6aa77a4
Leon Scroggins [Mon, 28 Sep 2009 15:21:56 +0000 (11:21 -0400)]
Update menu items.
Fix for http://b/issue?id=
2145205
Change-Id: I9c7de6fc8ff81b7a583c0c9a9724651b3304f93f
Cary Clark [Mon, 28 Sep 2009 14:55:00 +0000 (07:55 -0700)]
am
445aaddf: Merge change 27436 into eclair
Merge commit '
445aaddf7a076fa6e7868437b7034f449a00b0d2' into eclair-plus-aosp
* commit '
445aaddf7a076fa6e7868437b7034f449a00b0d2':
append '&source=android-home' to the homepage_base string
Android (Google) Code Review [Mon, 28 Sep 2009 14:49:47 +0000 (10:49 -0400)]
Merge change 27436 into eclair
* changes:
append '&source=android-home' to the homepage_base string
Cary Clark [Mon, 28 Sep 2009 14:18:29 +0000 (10:18 -0400)]
append '&source=android-home' to the homepage_base string
Additionally, either this string should be marked translatable=false
and all existing translations should be removed or all existing
translations must be updated.
This fixes http://b/issue?id=
2148022
Ben Murdoch [Mon, 28 Sep 2009 10:55:53 +0000 (03:55 -0700)]
am
cbb77455: Merge change 27416 into eclair
Merge commit '
cbb77455ffea06b527e75a8abcea3d590cbe65b8' into eclair-plus-aosp
* commit '
cbb77455ffea06b527e75a8abcea3d590cbe65b8':
Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
Android (Google) Code Review [Mon, 28 Sep 2009 10:49:35 +0000 (06:49 -0400)]
Merge change 27416 into eclair
* changes:
Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
Ben Murdoch [Mon, 28 Sep 2009 10:32:25 +0000 (03:32 -0700)]
am
fbaf61ea: Fix NPE when adding a new bookmark.
Merge commit '
fbaf61eae57f46580bc48bc76185eef7dd797fa6' into eclair-plus-aosp
* commit '
fbaf61eae57f46580bc48bc76185eef7dd797fa6':
Fix NPE when adding a new bookmark.
Ben Murdoch [Mon, 28 Sep 2009 09:59:09 +0000 (10:59 +0100)]
Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
Bug:
2148161
Change-Id: Ia226959cd18848d0eb2e302a9ef894c5c142d37d
Ben Murdoch [Mon, 28 Sep 2009 09:29:35 +0000 (10:29 +0100)]
Fix NPE when adding a new bookmark.
Bug:
2148968
Change-Id: I03025c3845e536d8aba0c1a8f2c6537333422a48
Leon Scroggins [Sun, 27 Sep 2009 22:36:55 +0000 (15:36 -0700)]
am
6492a30a: am
04b025c3: Merge change 27095 into eclair
Merge commit '
6492a30a25b4c61867a67b9000d90e390f7702b7'
* commit '
6492a30a25b4c61867a67b9000d90e390f7702b7':
Use new, consistent assets for adding a bookmark.
Leon Scroggins [Sun, 27 Sep 2009 22:36:41 +0000 (15:36 -0700)]
am
71816f14: am
b94bf273: Only draw the fake title bar\'s shadow if the webview is not scrolled.
Merge commit '
71816f14d27cb9fd51596236cf90680f7cb0cd40'
* commit '
71816f14d27cb9fd51596236cf90680f7cb0cd40':
Only draw the fake title bar's shadow if the webview is not scrolled.
Leon Scroggins [Fri, 25 Sep 2009 20:15:08 +0000 (13:15 -0700)]
am
04b025c3: Merge change 27095 into eclair
Merge commit '
04b025c3d03c5045ea9c4be7c1bb989744491dc0' into eclair-plus-aosp
* commit '
04b025c3d03c5045ea9c4be7c1bb989744491dc0':
Use new, consistent assets for adding a bookmark.
Android (Google) Code Review [Fri, 25 Sep 2009 20:09:51 +0000 (16:09 -0400)]
Merge change 27095 into eclair
* changes:
Use new, consistent assets for adding a bookmark.
Leon Scroggins [Fri, 25 Sep 2009 20:00:29 +0000 (13:00 -0700)]
am
b94bf273: Only draw the fake title bar\'s shadow if the webview is not scrolled.
Merge commit '
b94bf27370329abb27e5e33b493d6edb5662b36e' into eclair-plus-aosp
* commit '
b94bf27370329abb27e5e33b493d6edb5662b36e':
Only draw the fake title bar's shadow if the webview is not scrolled.
Leon Scroggins [Fri, 25 Sep 2009 19:47:05 +0000 (15:47 -0400)]
Use new, consistent assets for adding a bookmark.
Change-Id: I08b492a792e518acb53a69346d51c8c88c06b75e
Leon Scroggins [Fri, 25 Sep 2009 19:22:08 +0000 (15:22 -0400)]
Only draw the fake title bar's shadow if the webview is not scrolled.
Fixes http://b/issue?id=
2142575
Change-Id: I1b29cf6b7fcf89e6c7ebbb967a46434424d6ba54
Leon Scroggins [Fri, 25 Sep 2009 18:26:50 +0000 (11:26 -0700)]
am
c6ac586a: am
88eddc7b: Merge change 27061 into eclair
Merge commit '
c6ac586a248e2e2cec206b0a17777fa7769c7813'
* commit '
c6ac586a248e2e2cec206b0a17777fa7769c7813':
Update assets for new tab.
Leon Scroggins [Fri, 25 Sep 2009 18:25:50 +0000 (11:25 -0700)]
am
dc565293: am
fdd10d7a: Use new assets for list view and thumbnail view.
Merge commit '
dc56529363107521eb70a51a80496a6a34108a2d'
* commit '
dc56529363107521eb70a51a80496a6a34108a2d':
Use new assets for list view and thumbnail view.
Leon Scroggins [Fri, 25 Sep 2009 18:25:35 +0000 (11:25 -0700)]
am
b090a0c8: am
f8551617: Fix layout issues on the bookmarks screen.
Merge commit '
b090a0c86261ef2daead0e301718a9af52ffe6d6'
* commit '
b090a0c86261ef2daead0e301718a9af52ffe6d6':
Fix layout issues on the bookmarks screen.
Ben Murdoch [Fri, 25 Sep 2009 18:10:28 +0000 (11:10 -0700)]
am
e09d4e37: am
aac7aa6f: In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the boo
Merge commit '
e09d4e37eaefaf7f27186b273bcc838d03c2fc63'
* commit '
e09d4e37eaefaf7f27186b273bcc838d03c2fc63':
In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the bookmark through the add bookmark menu or clicking the add bookmark icon on the bookmarks page.
Leon Scroggins [Fri, 25 Sep 2009 18:07:15 +0000 (11:07 -0700)]
am
125fa10d: am
c6fa1104: Add a context menu for the title bar.
Merge commit '
125fa10d8913e83eff32809e152645b06fa55302'
* commit '
125fa10d8913e83eff32809e152645b06fa55302':
Add a context menu for the title bar.
Grace Kloba [Fri, 25 Sep 2009 18:05:40 +0000 (11:05 -0700)]
am
0ccf2754: am
674f39ae: Add enable plug-ins to UI. Remove pluginsPath from BrowserSettings as it is unused now.
Merge commit '
0ccf2754614f23aa85396349c9691df58fabe057'
* commit '
0ccf2754614f23aa85396349c9691df58fabe057':
Add enable plug-ins to UI. Remove pluginsPath from BrowserSettings as it is unused now.
Grace Kloba [Fri, 25 Sep 2009 18:05:36 +0000 (11:05 -0700)]
am
aac94c76: am
00d85e74: We should return after calling moveTaskToBack when there is no current tab.
Merge commit '
aac94c7617ea7d0cf274114c150d1fe79d0cdb18'
* commit '
aac94c7617ea7d0cf274114c150d1fe79d0cdb18':
We should return after calling moveTaskToBack when there is no current tab.
Grace Kloba [Fri, 25 Sep 2009 18:05:25 +0000 (11:05 -0700)]
am
527ebb6d: am
0923d69a: If we get web search request in onCreate, just finish the current activity. Otherwise it puts the BrowserActivity in a bad state where there is no current tab.
Merge commit '
527ebb6da10ce63f8b50781bd6c335b7281b8806'
* commit '
527ebb6da10ce63f8b50781bd6c335b7281b8806':
If we get web search request in onCreate, just finish the
Andrei Popescu [Fri, 25 Sep 2009 18:02:51 +0000 (11:02 -0700)]
am
b7b6ef53: am
10fdba8a: Add possibility to customize the chooser dialog used to allow the user to choose the application for sharing a link.
Merge commit '
b7b6ef53295aa5ef3673ad1ecbd9cd0a74ea7c24'
* commit '
b7b6ef53295aa5ef3673ad1ecbd9cd0a74ea7c24':
Add possibility to customize the chooser dialog used to allow the user
Leon Scroggins [Fri, 25 Sep 2009 17:53:20 +0000 (10:53 -0700)]
am
5f4b4995: am
20329570: When hiding the fake title bar, animate or not based on current scroll.
Merge commit '
5f4b4995e600daef18324f7041cdb69bfe183e2f'
* commit '
5f4b4995e600daef18324f7041cdb69bfe183e2f':
When hiding the fake title bar, animate or not based on current scroll.
Leon Scroggins [Fri, 25 Sep 2009 17:51:54 +0000 (10:51 -0700)]
am
d8145919: am
2dc5d157: Merge change 26660 into eclair
Merge commit '
d81459198a56fd00e3fc50e11020a4d78ce0863f'
* commit '
d81459198a56fd00e3fc50e11020a4d78ce0863f':
Draw pressed states on the fake title bar.
Leon Scroggins [Fri, 25 Sep 2009 17:50:05 +0000 (10:50 -0700)]
am
ede5d091: am
7c9a7ea3: Merge change 26630 into eclair
Merge commit '
ede5d091b7653dae7b0de973b7ac80e9b6030811'
* commit '
ede5d091b7653dae7b0de973b7ac80e9b6030811':
Tweaks to improve the look of the bookmarks page.
Patrick Scott [Fri, 25 Sep 2009 17:49:28 +0000 (10:49 -0700)]
am
5dbc6401: am
2a7703ba: Merge change 26588 into eclair
Merge commit '
5dbc64019bfb077e80cb42d2bf913a7ae1202335'
* commit '
5dbc64019bfb077e80cb42d2bf913a7ae1202335':
Use favicons in the tab page instead of a snapshot.
Leon Scroggins [Fri, 25 Sep 2009 17:49:04 +0000 (10:49 -0700)]
am
88eddc7b: Merge change 27061 into eclair
Merge commit '
88eddc7b7253328d9eb34c24a3f470c926b5aa15' into eclair-plus-aosp
* commit '
88eddc7b7253328d9eb34c24a3f470c926b5aa15':
Update assets for new tab.
Android (Google) Code Review [Fri, 25 Sep 2009 17:42:19 +0000 (13:42 -0400)]
Merge change 27061 into eclair
* changes:
Update assets for new tab.
Leon Scroggins [Fri, 25 Sep 2009 17:28:15 +0000 (13:28 -0400)]
Update assets for new tab.
Also remove the old one and an obsolete file which references it.
Fixes http://b/issue?id=
2099961
Change-Id: I92e08fcc07826d5bde7ddb87c71932de2e01b778
Leon Scroggins [Fri, 25 Sep 2009 17:09:35 +0000 (10:09 -0700)]
am
fdd10d7a: Use new assets for list view and thumbnail view.
Merge commit '
fdd10d7a80ccd7b90d011fbe40f56f1ac2006594' into eclair-plus-aosp
* commit '
fdd10d7a80ccd7b90d011fbe40f56f1ac2006594':
Use new assets for list view and thumbnail view.
Leon Scroggins [Fri, 25 Sep 2009 17:01:45 +0000 (13:01 -0400)]
Use new assets for list view and thumbnail view.
Change-Id: I5a5395c6d64cd71f3af404dc049d89c66dea613b
Leon Scroggins [Fri, 25 Sep 2009 16:38:59 +0000 (09:38 -0700)]
am
f8551617: Fix layout issues on the bookmarks screen.
Merge commit '
f85516172840450a4d1270b658905dc1649ceaf2' into eclair-plus-aosp
* commit '
f85516172840450a4d1270b658905dc1649ceaf2':
Fix layout issues on the bookmarks screen.
Leon Scroggins [Thu, 24 Sep 2009 20:06:02 +0000 (16:06 -0400)]
Fix layout issues on the bookmarks screen.
Limit the title of a bookmark to stop at the right edge of screenshot.
Use the new default screenshots for bookmarks without screenshots.
Resize the bookmark screenshot to match the size of the default icon.
Fixes http://b/issue?id=
2042025 and http://b/issue?id=
2098770
Change-Id: I66a10671ea98007cfe5bf7502fb1e3619276ca22
Grace Kloba [Fri, 25 Sep 2009 15:50:25 +0000 (08:50 -0700)]
am
eb2400d3: am
da0fe556: Move the page up/down shortcut key from onKeyUp to onKeyDown as WebView handles the keys in down, not up.
Merge commit '
eb2400d353b456871eaecfc6a0aab8962e3c80cb'
* commit '
eb2400d353b456871eaecfc6a0aab8962e3c80cb':
Move the page up/down shortcut key from onKeyUp to onKeyDown as
Andrei Popescu [Fri, 25 Sep 2009 15:49:59 +0000 (08:49 -0700)]
am
c4f56f25: am
a5bf1dec: Reset title bar after closing tab
Merge commit '
c4f56f25d399f523a96cdee1d4e63e1d005981b7'
* commit '
c4f56f25d399f523a96cdee1d4e63e1d005981b7':
Reset title bar after closing tab
Andrei Popescu [Fri, 25 Sep 2009 15:49:43 +0000 (08:49 -0700)]
am
421ffca8: am
c9526195: Make the deletion of bookmarks depend on both title and URL
Merge commit '
421ffca834f95fde43c9533c03644368b1986c1f'
* commit '
421ffca834f95fde43c9533c03644368b1986c1f':
Make the deletion of bookmarks depend on both title and URL
Ben Murdoch [Thu, 24 Sep 2009 21:07:12 +0000 (14:07 -0700)]
am
aac7aa6f: In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the bookmark through
Merge commit '
aac7aa6fcfcb519755987ec126be066323f589c8' into eclair-plus-aosp
* commit '
aac7aa6fcfcb519755987ec126be066323f589c8':
In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the bookmark through the add bookmark menu or clicking the add bookmark icon on the bookmarks page.
Ben Murdoch [Thu, 17 Sep 2009 15:57:40 +0000 (16:57 +0100)]
In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the bookmark through the add bookmark menu or clicking the add bookmark icon on the bookmarks page.
Change-Id: Ib2b7692a45290f9ce372968e05cde8f6903e4572
Leon Scroggins [Thu, 24 Sep 2009 17:58:13 +0000 (10:58 -0700)]
am
c6fa1104: Add a context menu for the title bar.
Merge commit '
c6fa1104e549b8f5b89195d22c41059e77672dfa' into eclair-plus-aosp
* commit '
c6fa1104e549b8f5b89195d22c41059e77672dfa':
Add a context menu for the title bar.
Leon Scroggins [Mon, 21 Sep 2009 14:40:01 +0000 (10:40 -0400)]
Add a context menu for the title bar.
Fix for http://b/issue?id=
2131232
Change-Id: I28f23d4dc1060208c3d12cf8e2bcbd0be24a9c6c