OSDN Git Service
Patrick Scott [Mon, 12 Oct 2009 18:26:40 +0000 (11:26 -0700)]
am
589e40e1: am
4aff3aae: Scale the favicon by the density of the screen.
Merge commit '
589e40e17ee01e9f5e8d2fbd11b23e4e50b02cbe'
* commit '
589e40e17ee01e9f5e8d2fbd11b23e4e50b02cbe':
Scale the favicon by the density of the screen.
Mike Lockwood [Mon, 12 Oct 2009 18:26:36 +0000 (11:26 -0700)]
am
1138a161: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Merge commit '
1138a16137caed3ee88c5219f42edab30ea3c57e'
* commit '
1138a16137caed3ee88c5219f42edab30ea3c57e':
Eric Fischer [Mon, 12 Oct 2009 18:24:26 +0000 (11:24 -0700)]
am
bdc7f435: (-s ours) am
07b8eb36: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
bdc7f435711950b83274c591eb88143169a9deb9'
* commit '
bdc7f435711950b83274c591eb88143169a9deb9':
Import revised translations. DO NOT MERGE
Cary Clark [Wed, 7 Oct 2009 13:56:38 +0000 (09:56 -0400)]
do not merge
Change https://android-git.corp.google.com/g/#change,27762
conflicted when the auto-merger ran -- this implements
the change by hand. The original comments:
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
Patrick Scott [Mon, 5 Oct 2009 17:13:09 +0000 (10:13 -0700)]
am
4aff3aae: Scale the favicon by the density of the screen.
Merge commit '
4aff3aae62553f308612d7c6f284ca84aa33e026' into eclair-mr2-plus-aosp
* commit '
4aff3aae62553f308612d7c6f284ca84aa33e026':
Scale the favicon by the density of the screen.
Mike Lockwood [Mon, 5 Oct 2009 17:13:04 +0000 (10:13 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Patrick Scott [Mon, 5 Oct 2009 13:32:46 +0000 (09:32 -0400)]
Scale the favicon by the density of the screen.
Scale the favicon but keep the padding the same. It looks a little better with
the current bookmark asset.
Bug:
2162987
Eric Fischer [Sun, 4 Oct 2009 22:15:51 +0000 (15:15 -0700)]
am
07b8eb36: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
07b8eb36b7029cc06fc952b496a2e1b5bbcdf84e' into eclair-mr2
* commit '
07b8eb36b7029cc06fc952b496a2e1b5bbcdf84e':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 1 Oct 2009 23:55:49 +0000 (16:55 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Steve Block [Thu, 1 Oct 2009 22:11:38 +0000 (15:11 -0700)]
am
0de55a33: am
5f3ecb74: Merge change I5c303ac8 into eclair
Merge commit '
0de55a338666a847b55d404aa20246f24bef88e5'
* commit '
0de55a338666a847b55d404aa20246f24bef88e5':
Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
Ben Murdoch [Thu, 1 Oct 2009 22:11:10 +0000 (15:11 -0700)]
am
0bfecb01: am
a753d009: Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Merge commit '
0bfecb01cd20f6c1c0515c86e8c274a33db49556'
* commit '
0bfecb01cd20f6c1c0515c86e8c274a33db49556':
Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Grace Kloba [Thu, 1 Oct 2009 20:38:55 +0000 (13:38 -0700)]
am
d43041cf: am
18edf869: Remove the shadow in the bookmark as it doesn\'t have title.
Merge commit '
d43041cfd104832753f943b5fbb16693709f87d0'
* commit '
d43041cfd104832753f943b5fbb16693709f87d0':
Remove the shadow in the bookmark as it doesn't have title.
Leon Scroggins [Thu, 1 Oct 2009 19:21:14 +0000 (12:21 -0700)]
am
3e3064dd: am
bd7d5178: Adjust the spacing between the title and bookmarks/stop button.
Merge commit '
3e3064dd83da115144891208ab883d1a41d4180a'
* commit '
3e3064dd83da115144891208ab883d1a41d4180a':
Adjust the spacing between the title and bookmarks/stop button.
Leon Scroggins [Thu, 1 Oct 2009 19:15:42 +0000 (12:15 -0700)]
am
7717ab32: am
84a2df8e: Merge change I3c58dbaa into eclair
Merge commit '
7717ab323d41d55469dc75098a34dca17e142d90'
* commit '
7717ab323d41d55469dc75098a34dca17e142d90':
New assets. This makes the title bar's button match the voice button.
Nicolas Roard [Thu, 1 Oct 2009 19:15:31 +0000 (12:15 -0700)]
Ben Murdoch [Thu, 1 Oct 2009 19:15:05 +0000 (12:15 -0700)]
am
a60c6c72: am
e64b3a09: Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
Merge commit '
a60c6c728b1d4ad67cf962be85f0c195f765d654'
* commit '
a60c6c728b1d4ad67cf962be85f0c195f765d654':
Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
Nicolas Roard [Thu, 1 Oct 2009 18:59:31 +0000 (11:59 -0700)]
am
f1e80834: am
9725fac3: Merge change I9cdaba5e into eclair
Merge commit '
f1e80834961948f18dd07ea26ac385b521454682'
* commit '
f1e80834961948f18dd07ea26ac385b521454682':
New assets for settings
Steve Block [Thu, 1 Oct 2009 18:58:58 +0000 (11:58 -0700)]
am
fb90e5e4: am
322c39b5: Merge change I0d0fa17a into eclair
Merge commit '
fb90e5e4e33ee6f583414ac528141f511f22a199'
* commit '
fb90e5e4e33ee6f583414ac528141f511f22a199':
Sets the intial state of the Geolocation permission prompt 'remember' checkbox to checked every time it is shown.
Leon Scroggins [Thu, 1 Oct 2009 18:58:50 +0000 (11:58 -0700)]
Leon Scroggins [Thu, 1 Oct 2009 18:57:58 +0000 (11:57 -0700)]
am
19bd5c8a: am
f59fb4ef: Merge change I417aa61d into eclair
Merge commit '
19bd5c8a78337008d0f8369e73472926c966e10b'
* commit '
19bd5c8a78337008d0f8369e73472926c966e10b':
New asset for the bookmark button in the title bar.
Leon Scroggins [Thu, 1 Oct 2009 18:57:52 +0000 (11:57 -0700)]
am
1c8cd377: am
306feaf5: Merge change Ibf40bd9e into eclair
Merge commit '
1c8cd3772ee62d5f44daba9a51ed8b6757e52500'
* commit '
1c8cd3772ee62d5f44daba9a51ed8b6757e52500':
Slide the title bar onto the screen rather than stretching it.
Ben Murdoch [Thu, 1 Oct 2009 18:57:47 +0000 (11:57 -0700)]
am
b3482d77: am
bd955bf1: Merge change I834ba6d2 into eclair
Merge commit '
b3482d77a796ef46678639d2e914cd5a8f4fd799'
* commit '
b3482d77a796ef46678639d2e914cd5a8f4fd799':
Update the CNN bookmark to point to www.cnn.com/index.html. (Bug
2139637)
Steve Block [Thu, 1 Oct 2009 18:57:40 +0000 (11:57 -0700)]
am
aedc94ea: am
cbd20bf6: Merge change I7cb3951e into eclair
Merge commit '
aedc94ea3b427ef721a347a93f8ca64ed895e2ae'
* commit '
aedc94ea3b427ef721a347a93f8ca64ed895e2ae':
Removes the list of values previously used when prompting the user to increase the HTML5 database quota.
Ben Murdoch [Thu, 1 Oct 2009 18:56:36 +0000 (11:56 -0700)]
am
7f086fcf: am
1794fe25: Save a new bookmark to the bookmarks DB asynchronously. Fix for bug
2151093.
Merge commit '
7f086fcf34911d31d627887b7e453308a4214b85'
* commit '
7f086fcf34911d31d627887b7e453308a4214b85':
Save a new bookmark to the bookmarks DB asynchronously. Fix for bug
2151093.
Steve Block [Thu, 1 Oct 2009 18:56:24 +0000 (11:56 -0700)]
am
ebc8ef4a: am
9957024e: Merge change Ic78ed87e into eclair
Merge commit '
ebc8ef4a12ff9efc77c6c372b2a16516fe73670c'
* commit '
ebc8ef4a12ff9efc77c6c372b2a16516fe73670c':
Changes "New York Times" to "NY Times" in bookmarks list.
Leon Clarke [Thu, 1 Oct 2009 18:55:29 +0000 (11:55 -0700)]
am
f866b1c1: am
cb6cc864: Link coloring - do db lookup in new thread
Merge commit '
f866b1c17da52570106570bf3788429a262d4b43'
* commit '
f866b1c17da52570106570bf3788429a262d4b43':
Link coloring - do db lookup in new thread
Mike Cleron [Thu, 1 Oct 2009 18:53:57 +0000 (11:53 -0700)]
Daniel Sandler [Thu, 1 Oct 2009 18:48:52 +0000 (11:48 -0700)]
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)]
Steve Block [Thu, 1 Oct 2009 13:32:53 +0000 (06:32 -0700)]
am
5f3ecb74: Merge change I5c303ac8 into eclair
Merge commit '
5f3ecb74fe829ba4b4931bef69d6713f9e5819a5' into eclair-plus-aosp
* commit '
5f3ecb74fe829ba4b4931bef69d6713f9e5819a5':
Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
Android (Google) Code Review [Thu, 1 Oct 2009 13:26:56 +0000 (09:26 -0400)]
Merge change I5c303ac8 into eclair
* changes:
Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
Steve Block [Thu, 1 Oct 2009 11:20:11 +0000 (12:20 +0100)]
Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
This is a fix for bug http://b/issue?id=
2076246.
Change-Id: I5c303ac873b50bf1ca4bc7a6ccd3365bd4dfbb22
Ben Murdoch [Thu, 1 Oct 2009 12:20:59 +0000 (05:20 -0700)]
am
a753d009: Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Merge commit '
a753d009f11cabc73259f0a1c565301550ef1aa2' into eclair-plus-aosp
* commit '
a753d009f11cabc73259f0a1c565301550ef1aa2':
Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Ben Murdoch [Thu, 1 Oct 2009 10:36:19 +0000 (11:36 +0100)]
Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Change-Id: I2e6b75a4205a2fdc7a2dbecf276e1ad5cf567d75
Grace Kloba [Thu, 1 Oct 2009 04:18:45 +0000 (21:18 -0700)]
am
18edf869: Remove the shadow in the bookmark as it doesn\'t have title.
Merge commit '
18edf86985b23b63c65f5729c747e16dc5c915fc' into eclair-plus-aosp
* commit '
18edf86985b23b63c65f5729c747e16dc5c915fc':
Remove the shadow in the bookmark as it doesn't have title.
Grace Kloba [Thu, 1 Oct 2009 02:20:42 +0000 (19:20 -0700)]
Remove the shadow in the bookmark as it doesn't have title.
Fix http://b/issue?id=
2158516
Leon Scroggins [Wed, 30 Sep 2009 22:22:59 +0000 (15:22 -0700)]
am
bd7d5178: Adjust the spacing between the title and bookmarks/stop button.
Merge commit '
bd7d51781ccc0b3a067d17f417c5097cde94f25d' into eclair-plus-aosp
* commit '
bd7d51781ccc0b3a067d17f417c5097cde94f25d':
Adjust the spacing between the title and bookmarks/stop button.
Leon Scroggins [Wed, 30 Sep 2009 22:14:38 +0000 (18:14 -0400)]
Adjust the spacing between the title and bookmarks/stop button.
Makes the spacing look more like the spacing between the search
bar's go button and microphone button, which are roughly in the
place.
Change-Id: I61d8619c3af8daa3e33ff5b263819f0ffdadb553
Leon Scroggins [Wed, 30 Sep 2009 19:44:39 +0000 (12:44 -0700)]
am
84a2df8e: Merge change I3c58dbaa into eclair
Merge commit '
84a2df8efc941db78e78340c9e5a9e808b4eabba' into eclair-plus-aosp
* commit '
84a2df8efc941db78e78340c9e5a9e808b4eabba':
New assets. This makes the title bar's button match the voice button.
Android (Google) Code Review [Wed, 30 Sep 2009 19:38:24 +0000 (15:38 -0400)]
Merge change I3c58dbaa into eclair
* changes:
New assets. This makes the title bar's button match the voice button.
Leon Scroggins [Wed, 30 Sep 2009 19:29:45 +0000 (15:29 -0400)]
New assets. This makes the title bar's button match the voice button.
Change-Id: I3c58dbaa02b5f81c6db5fb96ec1b8021728a5e66
Nicolas Roard [Wed, 30 Sep 2009 19:30:55 +0000 (12:30 -0700)]
am
4df3c35c: Merge change Ie3890f91 into eclair
Merge commit '
4df3c35c741cad228730607c3fa3bc4effa26539' into eclair-plus-aosp
* commit '
4df3c35c741cad228730607c3fa3bc4effa26539':
Fixes
Android (Google) Code Review [Wed, 30 Sep 2009 19:23:57 +0000 (15:23 -0400)]
Merge change Ie3890f91 into eclair
* changes:
Fixes
Ben Murdoch [Wed, 30 Sep 2009 19:15:54 +0000 (12:15 -0700)]
am
e64b3a09: Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
Merge commit '
e64b3a094b90ba9a9ec6732fce49700b310bb0a3' into eclair-plus-aosp
* commit '
e64b3a094b90ba9a9ec6732fce49700b310bb0a3':
Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
Nicolas Roard [Wed, 30 Sep 2009 19:00:15 +0000 (20:00 +0100)]
Fixes
Ben Murdoch [Wed, 30 Sep 2009 18:19:39 +0000 (19:19 +0100)]
Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
Change-Id: I7793e77b4ae29c60185c6819430a2adbeb5d4a35
Nicolas Roard [Wed, 30 Sep 2009 17:14:22 +0000 (10:14 -0700)]
am
9725fac3: Merge change I9cdaba5e into eclair
Merge commit '
9725fac3df5e4ef3bf7d49d9b0ee0bb4acbc7379' into eclair-plus-aosp
* commit '
9725fac3df5e4ef3bf7d49d9b0ee0bb4acbc7379':
New assets for settings
Android (Google) Code Review [Wed, 30 Sep 2009 17:07:13 +0000 (13:07 -0400)]
Merge change I9cdaba5e into eclair
* changes:
New assets for settings
Steve Block [Wed, 30 Sep 2009 17:02:47 +0000 (10:02 -0700)]
am
322c39b5: Merge change I0d0fa17a into eclair
Merge commit '
322c39b55f6418d0173a8925c3cdc38b13d13f14' into eclair-plus-aosp
* commit '
322c39b55f6418d0173a8925c3cdc38b13d13f14':
Sets the intial state of the Geolocation permission prompt 'remember' checkbox to checked every time it is shown.
Leon Scroggins [Wed, 30 Sep 2009 16:57:53 +0000 (09:57 -0700)]
am
1336e6da: Remove unused assets.
Merge commit '
1336e6dacceddbf177e7a40128c5ad965fc9a6af' into eclair-plus-aosp
* commit '
1336e6dacceddbf177e7a40128c5ad965fc9a6af':
Remove unused assets.
Android (Google) Code Review [Wed, 30 Sep 2009 16:57:25 +0000 (12:57 -0400)]
Merge change I0d0fa17a into eclair
* changes:
Sets the intial state of the Geolocation permission prompt 'remember' checkbox to checked every time it is shown.
Steve Block [Wed, 30 Sep 2009 16:46:24 +0000 (17:46 +0100)]
Sets the intial state of the Geolocation permission prompt 'remember' checkbox to checked every time it is shown.
This fixes http://b/issue?id=
2156885.
Change-Id: I0d0fa17ae6065335bbef3e439b44509711ab98dd
Leon Scroggins [Wed, 30 Sep 2009 16:51:27 +0000 (12:51 -0400)]
Remove unused assets.
Change-Id: I591c987be33b032289232cf7ae8aa45ee4e4957c
Leon Scroggins [Wed, 30 Sep 2009 16:07:59 +0000 (09:07 -0700)]
am
f59fb4ef: Merge change I417aa61d into eclair
Merge commit '
f59fb4ef72a3ba091aaa6eb0f306680c442c0d5a' into eclair-plus-aosp
* commit '
f59fb4ef72a3ba091aaa6eb0f306680c442c0d5a':
New asset for the bookmark button in the title bar.
Leon Scroggins [Wed, 30 Sep 2009 16:07:55 +0000 (09:07 -0700)]
am
306feaf5: Merge change Ibf40bd9e into eclair
Merge commit '
306feaf596407d33ab8157d63b1788789a6accd4' into eclair-plus-aosp
* commit '
306feaf596407d33ab8157d63b1788789a6accd4':
Slide the title bar onto the screen rather than stretching it.
Android (Google) Code Review [Wed, 30 Sep 2009 16:05:08 +0000 (12:05 -0400)]
Merge change I417aa61d into eclair
* changes:
New asset for the bookmark button in the title bar.
Android (Google) Code Review [Wed, 30 Sep 2009 16:03:40 +0000 (12:03 -0400)]
Merge change Ibf40bd9e into eclair
* changes:
Slide the title bar onto the screen rather than stretching it.
Ben Murdoch [Wed, 30 Sep 2009 16:03:17 +0000 (09:03 -0700)]
am
bd955bf1: Merge change I834ba6d2 into eclair
Merge commit '
bd955bf11e88920aa44ae9b043b7bfb8573bbc4a' into eclair-plus-aosp
* commit '
bd955bf11e88920aa44ae9b043b7bfb8573bbc4a':
Update the CNN bookmark to point to www.cnn.com/index.html. (Bug
2139637)
Android (Google) Code Review [Wed, 30 Sep 2009 15:56:58 +0000 (11:56 -0400)]
Merge change I834ba6d2 into eclair
* changes:
Update the CNN bookmark to point to www.cnn.com/index.html. (Bug
2139637)
Leon Scroggins [Wed, 30 Sep 2009 15:55:54 +0000 (11:55 -0400)]
Slide the title bar onto the screen rather than stretching it.
Fix for http://b/issue?id=
2154614
Also update the header for the find dialog animations.
Change-Id: Ibf40bd9ee12c270c2794d4d2316143686a072458
Nicolas Roard [Wed, 30 Sep 2009 15:54:34 +0000 (16:54 +0100)]
New assets for settings
Steve Block [Wed, 30 Sep 2009 15:43:56 +0000 (08:43 -0700)]
am
cbd20bf6: Merge change I7cb3951e into eclair
Merge commit '
cbd20bf6d415881f5f749c4c379fdb1662b079ee' into eclair-plus-aosp
* commit '
cbd20bf6d415881f5f749c4c379fdb1662b079ee':
Removes the list of values previously used when prompting the user to increase the HTML5 database quota.
Android (Google) Code Review [Wed, 30 Sep 2009 15:35:28 +0000 (11:35 -0400)]
Merge change I7cb3951e into eclair
* changes:
Removes the list of values previously used when prompting the user to increase the HTML5 database quota.
Leon Scroggins [Wed, 30 Sep 2009 15:23:20 +0000 (11:23 -0400)]
New asset for the bookmark button in the title bar.
Fixes http://b/issue?id=
2145205
Change-Id: I417aa61d7613fea274c22c8c8a8fe8ba38cdf5d2
Ben Murdoch [Wed, 30 Sep 2009 15:12:21 +0000 (16:12 +0100)]
Update the CNN bookmark to point to cnn.com/index.html. (Bug
2139637)
Change-Id: I834ba6d23717de852395a5382f25b2958dcfb6a5
Ben Murdoch [Wed, 30 Sep 2009 15:06:59 +0000 (08:06 -0700)]
am
1794fe25: Save a new bookmark to the bookmarks DB asynchronously. Fix for bug
2151093.
Merge commit '
1794fe252866c311f3b4700a2a1e44e843962243' into eclair-plus-aosp
* commit '
1794fe252866c311f3b4700a2a1e44e843962243':
Save a new bookmark to the bookmarks DB asynchronously. Fix for bug
2151093.
Ben Murdoch [Tue, 29 Sep 2009 17:14:30 +0000 (18:14 +0100)]
Save a new bookmark to the bookmarks DB asynchronously. Fix for bug
2151093.
Change-Id: I860482f0a0610669f87965947b0818508d8988b7
Steve Block [Wed, 30 Sep 2009 14:17:51 +0000 (07:17 -0700)]
am
9957024e: Merge change Ic78ed87e into eclair
Merge commit '
9957024e9a4c904c83d76df03c4ebf9bdaa5f4c6' into eclair-plus-aosp
* commit '
9957024e9a4c904c83d76df03c4ebf9bdaa5f4c6':
Changes "New York Times" to "NY Times" in bookmarks list.
Android (Google) Code Review [Wed, 30 Sep 2009 14:09:38 +0000 (10:09 -0400)]
Merge change Ic78ed87e into eclair
* changes:
Changes "New York Times" to "NY Times" in bookmarks list.
Steve Block [Wed, 30 Sep 2009 13:58:51 +0000 (14:58 +0100)]
Removes the list of values previously used when prompting the user to increase the HTML5 database quota.
These values are superfluous, as the user is no longer prompted in this way.
Change-Id: I7cb3951e26091df24736fe1cf26636fdee3d79dc
Steve Block [Wed, 30 Sep 2009 09:46:44 +0000 (10:46 +0100)]
Changes "New York Times" to "NY Times" in bookmarks list.
This is part of the fix for http://b/issue?id=
2155414.
Also requires changes to vendor-specific strings.
Change-Id: Ic78ed87ebbe33a73fac6635b885b2c9d3113cbce
Leon Clarke [Wed, 30 Sep 2009 10:16:24 +0000 (03:16 -0700)]
am
cb6cc864: Link coloring - do db lookup in new thread
Merge commit '
cb6cc864e53f7d916622daf3b2cec133b36d6a55' into eclair-plus-aosp
* commit '
cb6cc864e53f7d916622daf3b2cec133b36d6a55':
Link coloring - do db lookup in new thread
Leon Clarke [Tue, 29 Sep 2009 17:35:13 +0000 (18:35 +0100)]
Link coloring - do db lookup in new thread
Typo
(cherry picked from commit
ccfb951aa11cfdd7ec8ac97e6003193a1a1d7d5b)
Conflicts:
src/com/android/browser/BrowserActivity.java
Mike Cleron [Wed, 30 Sep 2009 08:40:47 +0000 (01:40 -0700)]
Mike Cleron [Wed, 30 Sep 2009 08:10:05 +0000 (01:10 -0700)]
Newer icons
Daniel Sandler [Wed, 30 Sep 2009 04:40:24 +0000 (21:40 -0700)]
am
1208723c: New hdpi assets.
Merge commit '
1208723c787f42050c28e2278c6567c67de142d0' into eclair-plus-aosp
* commit '
1208723c787f42050c28e2278c6567c67de142d0':
New hdpi assets.
Daniel Sandler [Wed, 30 Sep 2009 04:33:22 +0000 (00:33 -0400)]
New hdpi assets.
Drop dated 29-Sep-2009.
Change-Id: I49bda866e8d96bafa31b601d4842e7f2a4514e9f
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.