OSDN Git Service
Andrei Popescu [Mon, 21 Sep 2009 19:15:29 +0000 (12:15 -0700)]
Andrei Popescu [Mon, 21 Sep 2009 19:10:49 +0000 (12:10 -0700)]
am
cd921352: Merge change 26174 into eclair
Merge commit '
cd921352dd09c208258e85fa5926b4e3a1b34f4d' into eclair-plus-aosp
* commit '
cd921352dd09c208258e85fa5926b4e3a1b34f4d':
Remove Gears files
Android (Google) Code Review [Mon, 21 Sep 2009 19:02:56 +0000 (15:02 -0400)]
Merge change 26174 into eclair
* changes:
Remove Gears files
Andrei Popescu [Mon, 21 Sep 2009 17:49:42 +0000 (18:49 +0100)]
Remove Gears files
Patrick Scott [Mon, 21 Sep 2009 17:58:24 +0000 (10:58 -0700)]
am
3842c852: am
79c08f57: Merge change 26168 into eclair
Merge commit '
3842c852153dcef8d644c115ba16a88d8a383d0f'
* commit '
3842c852153dcef8d644c115ba16a88d8a383d0f':
Update the correct favicon when starting the load.
Patrick Scott [Mon, 21 Sep 2009 17:52:30 +0000 (10:52 -0700)]
am
79c08f57: Merge change 26168 into eclair
Merge commit '
79c08f57c8220b717f994b905b2430a940f85bce' into eclair-plus-aosp
* commit '
79c08f57c8220b717f994b905b2430a940f85bce':
Update the correct favicon when starting the load.
Android (Google) Code Review [Mon, 21 Sep 2009 17:47:07 +0000 (13:47 -0400)]
Merge change 26168 into eclair
* changes:
Update the correct favicon when starting the load.
Patrick Scott [Mon, 21 Sep 2009 17:39:37 +0000 (13:39 -0400)]
Update the correct favicon when starting the load.
The WebView's original url and current url are incorrect during the provisional
load. Use the given url instead when updating the favicon.
Cary Clark [Mon, 21 Sep 2009 17:08:41 +0000 (10:08 -0700)]
am
fc1652c4: am
41a70db6: Merge change 26151 into eclair
Merge commit '
fc1652c4e6bcdb8f2e2c7ca034f048e8b3f1e173'
* commit '
fc1652c4e6bcdb8f2e2c7ca034f048e8b3f1e173':
Account for find dialog height in content height
Cary Clark [Mon, 21 Sep 2009 17:00:50 +0000 (10:00 -0700)]
am
41a70db6: Merge change 26151 into eclair
Merge commit '
41a70db682e87c73d0758f2239ec19fd429a72c7' into eclair-plus-aosp
* commit '
41a70db682e87c73d0758f2239ec19fd429a72c7':
Account for find dialog height in content height
Android (Google) Code Review [Mon, 21 Sep 2009 16:53:26 +0000 (12:53 -0400)]
Merge change 26151 into eclair
* changes:
Account for find dialog height in content height
Cary Clark [Mon, 21 Sep 2009 16:01:52 +0000 (12:01 -0400)]
Account for find dialog height in content height
Use the set dialog height when the find dialog is up so that
found items at the bottom of the screen are scrolled into view.
This uses a companion change in webview that takes the find
dialog height into account when computing the content height.
Fixes http://b/issue?id=
2122916
Leon Scroggins [Mon, 21 Sep 2009 15:44:16 +0000 (08:44 -0700)]
am
8e4e8e82: am
3cfdf77d: Merge change 26149 into eclair
Merge commit '
8e4e8e827645640a0b046a02bdacf0d9deae6caa'
* commit '
8e4e8e827645640a0b046a02bdacf0d9deae6caa':
Show the fake title bar when loading regardless of scroll position.
Leon Scroggins [Mon, 21 Sep 2009 15:39:50 +0000 (08:39 -0700)]
am
3cfdf77d: Merge change 26149 into eclair
Merge commit '
3cfdf77d8dac3b5a4a2e1a72f27a1650c09f72e9' into eclair-plus-aosp
* commit '
3cfdf77d8dac3b5a4a2e1a72f27a1650c09f72e9':
Show the fake title bar when loading regardless of scroll position.
Android (Google) Code Review [Mon, 21 Sep 2009 15:33:22 +0000 (11:33 -0400)]
Merge change 26149 into eclair
* changes:
Show the fake title bar when loading regardless of scroll position.
Ben Murdoch [Mon, 21 Sep 2009 15:14:46 +0000 (08:14 -0700)]
am
372a3b3a: am
9f009767: Merge change 26147 into eclair
Merge commit '
372a3b3a418477547f4871ce89188adb40a0d510'
* commit '
372a3b3a418477547f4871ce89188adb40a0d510':
Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
Ben Murdoch [Mon, 21 Sep 2009 15:10:14 +0000 (08:10 -0700)]
am
9f009767: Merge change 26147 into eclair
Merge commit '
9f009767d91d8fd43607d90b832c7cbe56847a08' into eclair-plus-aosp
* commit '
9f009767d91d8fd43607d90b832c7cbe56847a08':
Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
Android (Google) Code Review [Mon, 21 Sep 2009 15:02:26 +0000 (11:02 -0400)]
Merge change 26147 into eclair
* changes:
Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
Ben Murdoch [Mon, 21 Sep 2009 14:38:54 +0000 (07:38 -0700)]
am
f7fe99ff: am
dcc2b6f0: Put current screenshot under "Add" on bookmark thumbnail page.
Merge commit '
f7fe99ff5ca52a6169cff9b8e51323e2ce9dd084'
* commit '
f7fe99ff5ca52a6169cff9b8e51323e2ce9dd084':
Put current screenshot under "Add" on bookmark thumbnail page.
Leon Scroggins [Mon, 21 Sep 2009 14:38:24 +0000 (10:38 -0400)]
Show the fake title bar when loading regardless of scroll position.
Fix for http://b/issue?id=
2131516
Change-Id: I7d5e02928a36d732b4fc4a2a6b47d7f59e473de1
Ben Murdoch [Mon, 21 Sep 2009 14:34:14 +0000 (07:34 -0700)]
am
dcc2b6f0: Put current screenshot under "Add" on bookmark thumbnail page.
Merge commit '
dcc2b6f08dd5677bc6ba761a9ba6f1c655113051' into eclair-plus-aosp
* commit '
dcc2b6f08dd5677bc6ba761a9ba6f1c655113051':
Put current screenshot under "Add" on bookmark thumbnail page.
Ben Murdoch [Mon, 21 Sep 2009 14:34:07 +0000 (15:34 +0100)]
Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
Change-Id: Ic05a19fab3ddccd99c5a07c6c9c10b85c791717a
Ben Murdoch [Mon, 21 Sep 2009 13:29:20 +0000 (14:29 +0100)]
Put current screenshot under "Add" on bookmark thumbnail page.
Change-Id: Iaf52037f755fea343ef68a23d3740f0f5cdcecb7
Grace Kloba [Sun, 20 Sep 2009 17:34:30 +0000 (10:34 -0700)]
am
409a8f0b: am
5942df0c: Handle BACK key at UP in the Browser.
Merge commit '
409a8f0bcb8b32e096b52270c8dcac0c8acbcc34'
* commit '
409a8f0bcb8b32e096b52270c8dcac0c8acbcc34':
Handle BACK key at UP in the Browser.
Grace Kloba [Sun, 20 Sep 2009 17:29:17 +0000 (10:29 -0700)]
am
5942df0c: Handle BACK key at UP in the Browser.
Merge commit '
5942df0c38dff7e4335e352e2d03f100b07b8907' into eclair-plus-aosp
* commit '
5942df0c38dff7e4335e352e2d03f100b07b8907':
Handle BACK key at UP in the Browser.
Grace Kloba [Fri, 18 Sep 2009 18:48:29 +0000 (11:48 -0700)]
Handle BACK key at UP in the Browser.
Remove KeyTracker, use KeyEvent instead.
Remove ImageGrid and ImageAdapter.
Roy West [Sat, 19 Sep 2009 01:16:57 +0000 (18:16 -0700)]
am
72e32be9: am
7d9e4240: Fix bug
2121080: edits to Browser strings.
Merge commit '
72e32be94915ff934545f4e4a706498d523f9301'
* commit '
72e32be94915ff934545f4e4a706498d523f9301':
Fix bug
2121080: edits to Browser strings.
Roy West [Sat, 19 Sep 2009 00:08:58 +0000 (17:08 -0700)]
am
7d9e4240: Fix bug
2121080: edits to Browser strings.
Merge commit '
7d9e4240fd61ccc17797e520b834b3a27c8bf6ad' into eclair-plus-aosp
* commit '
7d9e4240fd61ccc17797e520b834b3a27c8bf6ad':
Fix bug
2121080: edits to Browser strings.
Roy West [Fri, 18 Sep 2009 23:29:38 +0000 (16:29 -0700)]
Fix bug
2121080: edits to Browser strings.
Note that we are staying with "window" not "tab" for Eclair.
Leon Scroggins [Fri, 18 Sep 2009 20:13:08 +0000 (13:13 -0700)]
am
7ad769bf: am
b097c214: Merge change 25131 into eclair
Merge commit '
7ad769bf90f106ed96e0cae2017e230280504d43'
* commit '
7ad769bf90f106ed96e0cae2017e230280504d43':
Add javacript to intent filters for the Browser.
Leon Scroggins [Fri, 18 Sep 2009 20:07:44 +0000 (13:07 -0700)]
am
b097c214: Merge change 25131 into eclair
Merge commit '
b097c214161b596c661f28bfcbf421fa73103e12' into eclair-plus-aosp
* commit '
b097c214161b596c661f28bfcbf421fa73103e12':
Add javacript to intent filters for the Browser.
Android (Google) Code Review [Fri, 18 Sep 2009 20:02:49 +0000 (16:02 -0400)]
Merge change 25131 into eclair
* changes:
Add javacript to intent filters for the Browser.
Leon Scroggins [Tue, 15 Sep 2009 21:33:20 +0000 (17:33 -0400)]
Add javacript to intent filters for the Browser.
Enables having a shortcut on the home screen of a bookmark which is
javascript.
Change-Id: Icae2785b144cfb1885e21ebbd7f86685447c2b5e
Leon Scroggins [Fri, 18 Sep 2009 19:37:48 +0000 (12:37 -0700)]
am
a4c7f360: am
d5921f69: Merge change 25777 into eclair
Merge commit '
a4c7f360a60e792d03f2ffbfba02a10ba85eaf15'
* commit '
a4c7f360a60e792d03f2ffbfba02a10ba85eaf15':
Give more space to the close button, and highlight separately from tab.
Leon Scroggins [Fri, 18 Sep 2009 19:33:20 +0000 (12:33 -0700)]
am
d5921f69: Merge change 25777 into eclair
Merge commit '
d5921f69a662fe3df1087a8042e3b7a1bf6fc62d' into eclair-plus-aosp
* commit '
d5921f69a662fe3df1087a8042e3b7a1bf6fc62d':
Give more space to the close button, and highlight separately from tab.
Android (Google) Code Review [Fri, 18 Sep 2009 19:24:47 +0000 (15:24 -0400)]
Merge change 25777 into eclair
* changes:
Give more space to the close button, and highlight separately from tab.
Leon Scroggins [Fri, 18 Sep 2009 18:21:08 +0000 (14:21 -0400)]
Give more space to the close button, and highlight separately from tab.
Fix for http://b/issue?id=
2126503 and http://b/issue?id=
2124781
Change-Id: I4a83223477e553d124ed667d92bc4970a3ebca0e
Andrei Popescu [Fri, 18 Sep 2009 18:33:27 +0000 (11:33 -0700)]
am
73881fd6: am
540035df: Add progress view and default poster for the <video> implementation
Merge commit '
73881fd6dea5a161cea6dec57dadc1f321ff2c9e'
* commit '
73881fd6dea5a161cea6dec57dadc1f321ff2c9e':
Add progress view and default poster for the <video> implementation
Andrei Popescu [Fri, 18 Sep 2009 18:28:32 +0000 (11:28 -0700)]
am
540035df: Add progress view and default poster for the <video> implementation
Merge commit '
540035dfd1347c78eeec10ec0847e18fcc50ef36' into eclair-plus-aosp
* commit '
540035dfd1347c78eeec10ec0847e18fcc50ef36':
Add progress view and default poster for the <video> implementation
Andrei Popescu [Fri, 18 Sep 2009 17:59:20 +0000 (18:59 +0100)]
Add progress view and default poster for the <video> implementation
Andrei Popescu [Fri, 18 Sep 2009 12:10:39 +0000 (05:10 -0700)]
Andrei Popescu [Fri, 18 Sep 2009 12:06:05 +0000 (05:06 -0700)]
am
07712d13: Merge change 25749 into eclair
Merge commit '
07712d137998b271e958b285c05eea38a0b8e600' into eclair-plus-aosp
* commit '
07712d137998b271e958b285c05eea38a0b8e600':
Fix for
2023896
Android (Google) Code Review [Fri, 18 Sep 2009 11:59:54 +0000 (07:59 -0400)]
Merge change 25749 into eclair
* changes:
Fix for
2023896
Andrei Popescu [Fri, 18 Sep 2009 11:54:46 +0000 (12:54 +0100)]
Eric Fischer [Thu, 17 Sep 2009 22:14:19 +0000 (15:14 -0700)]
am
073253a3: (-s ours) am
b13c3470: Import revised translations. DO NOT MERGE
Merge commit '
073253a3d76b0ad91d1e48754b53da618912d278'
* commit '
073253a3d76b0ad91d1e48754b53da618912d278':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:08:59 +0000 (15:08 -0700)]
am
b13c3470: Import revised translations. DO NOT MERGE
Merge commit '
b13c3470b732c39069012d7deaf28c3f32665760' into eclair-plus-aosp
* commit '
b13c3470b732c39069012d7deaf28c3f32665760':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:28:50 +0000 (14:28 -0700)]
Import revised translations. DO NOT MERGE
Grace Kloba [Thu, 17 Sep 2009 20:45:43 +0000 (13:45 -0700)]
am
c468fdb3: am
c928c30a: This tries to address a potential Browser CPU spinning problem.
Merge commit '
c468fdb3b85228c8051cda538622f00ffe30ac16'
* commit '
c468fdb3b85228c8051cda538622f00ffe30ac16':
This tries to address a potential Browser CPU spinning
Grace Kloba [Thu, 17 Sep 2009 20:40:46 +0000 (13:40 -0700)]
am
c928c30a: This tries to address a potential Browser CPU spinning problem.
Merge commit '
c928c30a51eee84b40cb7045842c288c1cfafff0' into eclair-plus-aosp
* commit '
c928c30a51eee84b40cb7045842c288c1cfafff0':
This tries to address a potential Browser CPU spinning
Grace Kloba [Thu, 17 Sep 2009 18:51:21 +0000 (11:51 -0700)]
This tries to address a potential Browser CPU spinning
problem.
Fix http://b/issue?id=
2127825
Patrick Scott [Thu, 17 Sep 2009 19:18:24 +0000 (12:18 -0700)]
am
b9fabfca: am
8f0076b7: Display favicons for history items.
Merge commit '
b9fabfcaaba9323bb2f09a116c1fa420f7a18b36'
* commit '
b9fabfcaaba9323bb2f09a116c1fa420f7a18b36':
Display favicons for history items.
Grace Kloba [Thu, 17 Sep 2009 19:16:42 +0000 (12:16 -0700)]
am
8760a235: am
799fccd2: Merge change 25402 into eclair
Merge commit '
8760a235497fe2d73b36d634ed6c63cc0cf56b10'
* commit '
8760a235497fe2d73b36d634ed6c63cc0cf56b10':
Remove the extra padding in the Tabs.
Nicolas Roard [Thu, 17 Sep 2009 19:16:18 +0000 (12:16 -0700)]
Patrick Scott [Thu, 17 Sep 2009 19:16:15 +0000 (12:16 -0700)]
am
e3acdf08: am
d0119535: Remove the WebView from its container to change focus.
Merge commit '
e3acdf08e8d91e2c7abdcd286961b7850d526477'
* commit '
e3acdf08e8d91e2c7abdcd286961b7850d526477':
Remove the WebView from its container to change focus.
Patrick Scott [Thu, 17 Sep 2009 19:16:11 +0000 (12:16 -0700)]
am
fb3904b0: am
eb6ab2ae: Remove the old network status intent.
Merge commit '
fb3904b01d2151401f4d4f7e4c6b306dbee249b6'
* commit '
fb3904b01d2151401f4d4f7e4c6b306dbee249b6':
Remove the old network status intent.
Grace Kloba [Thu, 17 Sep 2009 19:16:07 +0000 (12:16 -0700)]
am
f05657ff: am
45e1e540: Merge change 25371 into eclair
Merge commit '
f05657ff871f0570925711bc2553a835354941da'
* commit '
f05657ff871f0570925711bc2553a835354941da':
Remove the shadow in the Browser. Use xml to indicate windowNoTitle.
Nicolas Roard [Thu, 17 Sep 2009 19:16:03 +0000 (12:16 -0700)]
am
dbd18729: am
1382b490: Fix for the progress indicator not spinning
Merge commit '
dbd18729396011acfce3258872a2bda929f74c31'
* commit '
dbd18729396011acfce3258872a2bda929f74c31':
Fix for the progress indicator not spinning
Leon Scroggins [Thu, 17 Sep 2009 19:15:59 +0000 (12:15 -0700)]
am
4e87eda9: am
06d352c8: Merge change 25349 into eclair
Merge commit '
4e87eda9d3491c73df3062e36a21822cb47b4abb'
* commit '
4e87eda9d3491c73df3062e36a21822cb47b4abb':
Use an "X" on the title bar to allow the user to stop loading.
Patrick Scott [Thu, 17 Sep 2009 18:06:47 +0000 (11:06 -0700)]
am
8f0076b7: Display favicons for history items.
Merge commit '
8f0076b720c9ee1e9ef9d29910c261634fd5fb25' into eclair-plus-aosp
* commit '
8f0076b720c9ee1e9ef9d29910c261634fd5fb25':
Display favicons for history items.
Patrick Scott [Thu, 17 Sep 2009 17:51:30 +0000 (13:51 -0400)]
Display favicons for history items.
Use the data from the java database before talking to the native database. The
bookmarks database may contain favicons that the native database does not have a
mapping for. Used the native icon database for recent history items since those
are not stored in the java db. Request the icons each time the activity is
created since the url->bitmap mapping is a global.
Leon Scroggins [Thu, 17 Sep 2009 16:59:16 +0000 (09:59 -0700)]
am
ed63cdf1: am
c01e4a83: Make the fake title bar extend to the full width.
Merge commit '
ed63cdf1d225dfa3b5fb2e0499eded3e75a5ea7a'
* commit '
ed63cdf1d225dfa3b5fb2e0499eded3e75a5ea7a':
Make the fake title bar extend to the full width.
Grace Kloba [Thu, 17 Sep 2009 16:56:52 +0000 (09:56 -0700)]
am
16eda642: am
eb6eef4c: Fix the lock icon when switch tabs.
Merge commit '
16eda6425bc4e198a2e7c612cd655f03363b1da2'
* commit '
16eda6425bc4e198a2e7c612cd655f03363b1da2':
Fix the lock icon when switch tabs.
Leon Scroggins [Thu, 17 Sep 2009 16:56:17 +0000 (09:56 -0700)]
am
def0ecfb: am
d8fd2fcf: Make the fake title bar look more like the regular title bar.
Merge commit '
def0ecfb2064bef69e802f18b1cbdc3b1d0ceed1'
* commit '
def0ecfb2064bef69e802f18b1cbdc3b1d0ceed1':
Make the fake title bar look more like the regular title bar.
Grace Kloba [Thu, 17 Sep 2009 16:54:37 +0000 (09:54 -0700)]
am
5b4b07f2: am
83cdb2c4: Need to add touch icon when adding bookmark through menu.
Merge commit '
5b4b07f29015f332907e1f71ef7d766de1130b8d'
* commit '
5b4b07f29015f332907e1f71ef7d766de1130b8d':
Need to add touch icon when adding bookmark through menu.
Nicolas Roard [Thu, 17 Sep 2009 16:53:39 +0000 (09:53 -0700)]
Ben Murdoch [Thu, 17 Sep 2009 16:53:35 +0000 (09:53 -0700)]
am
3d4b84a8: am
60ccd45b: Merge change 25264 into eclair
Merge commit '
3d4b84a86ef347e18443cf97c742423b5c923a18'
* commit '
3d4b84a86ef347e18443cf97c742423b5c923a18':
Make the view mode that the user sets (either grid or list) in the bookmarks/most visited page sticky.
Leon Scroggins [Thu, 17 Sep 2009 16:53:31 +0000 (09:53 -0700)]
am
8c9599b4: am
4d7e4069: Do not show the title bar if the Activity is paused.
Merge commit '
8c9599b48c3760013c789b671a83ac9618980403'
* commit '
8c9599b48c3760013c789b671a83ac9618980403':
Do not show the title bar if the Activity is paused.
Leon Scroggins [Thu, 17 Sep 2009 16:53:27 +0000 (09:53 -0700)]
am
85d7df77: am
68579393: Remove the tab slider, and go back to simply using a touchable title bar.
Merge commit '
85d7df770bd94e28637c34584fc39ab49ae3ea19'
* commit '
85d7df770bd94e28637c34584fc39ab49ae3ea19':
Remove the tab slider, and go back to simply using a touchable title bar.
Grace Kloba [Thu, 17 Sep 2009 16:45:23 +0000 (09:45 -0700)]
am
799fccd2: Merge change 25402 into eclair
Merge commit '
799fccd2479184178e13c3342d3051b997893793' into eclair-plus-aosp
* commit '
799fccd2479184178e13c3342d3051b997893793':
Remove the extra padding in the Tabs.
Android (Google) Code Review [Thu, 17 Sep 2009 16:40:10 +0000 (12:40 -0400)]
Merge change 25402 into eclair
* changes:
Remove the extra padding in the Tabs.
Grace Kloba [Wed, 16 Sep 2009 22:56:40 +0000 (15:56 -0700)]
Remove the extra padding in the Tabs.
Use scheme to define the Bookmark style.
Fix http://b/issue?id=
2125502
Nicolas Roard [Thu, 17 Sep 2009 16:07:13 +0000 (09:07 -0700)]
Nicolas Roard [Thu, 17 Sep 2009 15:56:27 +0000 (16:56 +0100)]
Fix warning
Patrick Scott [Thu, 17 Sep 2009 15:48:34 +0000 (08:48 -0700)]
am
d0119535: Remove the WebView from its container to change focus.
Merge commit '
d0119535d0c490e087be114ae8fd1639bb1945dc' into eclair-plus-aosp
* commit '
d0119535d0c490e087be114ae8fd1639bb1945dc':
Remove the WebView from its container to change focus.
Patrick Scott [Thu, 17 Sep 2009 15:48:19 +0000 (08:48 -0700)]
am
eb6ab2ae: Remove the old network status intent.
Merge commit '
eb6ab2aeeccb5ddfba7faefd9c1b5fe14ee8d885' into eclair-plus-aosp
* commit '
eb6ab2aeeccb5ddfba7faefd9c1b5fe14ee8d885':
Remove the old network status intent.
Grace Kloba [Thu, 17 Sep 2009 15:41:42 +0000 (08:41 -0700)]
am
45e1e540: Merge change 25371 into eclair
Merge commit '
45e1e540a0d180cbe2724688b43ad6d8df26cb65' into eclair-plus-aosp
* commit '
45e1e540a0d180cbe2724688b43ad6d8df26cb65':
Remove the shadow in the Browser. Use xml to indicate windowNoTitle.
Nicolas Roard [Thu, 17 Sep 2009 15:40:58 +0000 (08:40 -0700)]
am
1382b490: Fix for the progress indicator not spinning
Merge commit '
1382b490adc3971916ca14978f8bd2d9f5f2a344' into eclair-plus-aosp
* commit '
1382b490adc3971916ca14978f8bd2d9f5f2a344':
Fix for the progress indicator not spinning
Leon Scroggins [Thu, 17 Sep 2009 15:39:15 +0000 (08:39 -0700)]
am
06d352c8: Merge change 25349 into eclair
Merge commit '
06d352c85ef4394062fb77fd627013ae3155922c' into eclair-plus-aosp
* commit '
06d352c85ef4394062fb77fd627013ae3155922c':
Use an "X" on the title bar to allow the user to stop loading.
Patrick Scott [Thu, 17 Sep 2009 12:00:31 +0000 (08:00 -0400)]
Remove the WebView from its container to change focus.
When the container is removed from the content view, its child views do not lose
focus. Removing the WebView from the container as well will trigger a focus
change from the WebView. Move the attach/remove logic to TabControl since it
knows all about the containers.
Patrick Scott [Wed, 16 Sep 2009 14:00:17 +0000 (10:00 -0400)]
Remove the old network status intent.
Use NetworkInfo to see if we are connected to a network instead of the intent
extra. Update the network dialog text and refactor the alert dialog creation to
reuse code.
Leon Scroggins [Thu, 17 Sep 2009 12:28:22 +0000 (05:28 -0700)]
am
8167e964: am
25d3547e: When opening in the background, do not move the tab to front.
Merge commit '
8167e96413d4af5ec9f3b0f7d916710d93b59c08'
* commit '
8167e96413d4af5ec9f3b0f7d916710d93b59c08':
When opening in the background, do not move the tab to front.
Leon Scroggins [Thu, 17 Sep 2009 12:27:50 +0000 (05:27 -0700)]
am
46f6a4e0: am
43de6166: Prevent showing the title bar while the active tabs page is showing.
Merge commit '
46f6a4e016a7f2cab25b70fc0841bd39845ad656'
* commit '
46f6a4e016a7f2cab25b70fc0841bd39845ad656':
Prevent showing the title bar while the active tabs page is showing.
Patrick Scott [Thu, 17 Sep 2009 12:26:48 +0000 (05:26 -0700)]
am
9a7e89a4: am
db22ea70: Call resetTitle() when switching tabs.
Merge commit '
9a7e89a4b7101eb2da62bde92a6e92dc38a868da'
* commit '
9a7e89a4b7101eb2da62bde92a6e92dc38a868da':
Call resetTitle() when switching tabs.
Leon Scroggins [Thu, 17 Sep 2009 01:21:23 +0000 (18:21 -0700)]
am
854d400a: am
659d0ed1: Merge change 24961 into eclair
Merge commit '
854d400a096c973a6fbe1590cb3d006fc3ec596e'
* commit '
854d400a096c973a6fbe1590cb3d006fc3ec596e':
When opening in a new tab in the background, restore the old tab position.
Leon Scroggins [Thu, 17 Sep 2009 01:21:20 +0000 (18:21 -0700)]
am
b74680da: am
bb85b901: Fix a potential null pointer exception.
Merge commit '
b74680dae128774402de364881d2aed8319b4300'
* commit '
b74680dae128774402de364881d2aed8319b4300':
Fix a potential null pointer exception.
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.
Android (Google) Code Review [Wed, 16 Sep 2009 22:50:34 +0000 (18:50 -0400)]
Merge change 25371 into eclair
* changes:
Remove the shadow in the Browser. Use xml to indicate windowNoTitle.
Grace Kloba [Wed, 16 Sep 2009 22:43:22 +0000 (15:43 -0700)]
Remove the shadow in the Browser. Use xml to indicate windowNoTitle.
http://b/issue?id=
2125456
Nicolas Roard [Wed, 16 Sep 2009 20:50:06 +0000 (21:50 +0100)]
Fix for the progress indicator not spinning
Android (Google) Code Review [Wed, 16 Sep 2009 21:47:16 +0000 (17:47 -0400)]
Merge change 25349 into eclair
* changes:
Use an "X" on the title bar to allow the user to stop loading.
Leon Scroggins [Wed, 16 Sep 2009 21:33:32 +0000 (14:33 -0700)]
am
c01e4a83: Make the fake title bar extend to the full width.
Merge commit '
c01e4a8342c9478f9ba0c53c2ebca25b4b5c3173' into eclair-plus-aosp
* commit '
c01e4a8342c9478f9ba0c53c2ebca25b4b5c3173':
Make the fake title bar extend to the full width.
Leon Scroggins [Wed, 16 Sep 2009 21:31:59 +0000 (17:31 -0400)]
Use an "X" on the title bar to allow the user to stop loading.
See http://b/issue?id=
2111209
Change-Id: I751f2f94d342fac67c4a9172704fbb0edda69075
Leon Scroggins [Wed, 16 Sep 2009 18:41:00 +0000 (14:41 -0400)]
Make the fake title bar extend to the full width.
Change-Id: I3d20459c6c93e4d5186a8135168b3b7e7d97ad1c
Grace Kloba [Wed, 16 Sep 2009 18:25:01 +0000 (11:25 -0700)]
am
eb6eef4c: Fix the lock icon when switch tabs.
Merge commit '
eb6eef4c45df2d65c3e70660493a147a2be405e3' into eclair-plus-aosp
* commit '
eb6eef4c45df2d65c3e70660493a147a2be405e3':
Fix the lock icon when switch tabs.
Grace Kloba [Wed, 16 Sep 2009 00:56:32 +0000 (17:56 -0700)]
Fix the lock icon when switch tabs.
In switchToTab, I think it is wrong code where it calls removeTabFromContentView(tab).
In openTabAndShow, we should really attach after we the tab to the current.
Fix http://b/issue?id=
2067930
Leon Scroggins [Wed, 16 Sep 2009 18:00:47 +0000 (11:00 -0700)]
am
d8fd2fcf: Make the fake title bar look more like the regular title bar.
Merge commit '
d8fd2fcf4eb037fd65ae923c6dbeff6c6ecb4d4f' into eclair-plus-aosp
* commit '
d8fd2fcf4eb037fd65ae923c6dbeff6c6ecb4d4f':
Make the fake title bar look more like the regular title bar.