7054 Commits

Author SHA1 Message Date
Wei Huang
cc6bd5a0d3 fix typo 2009-08-24 14:29:44 -07:00
Leon Scroggins
f3c55d5bc8 am d0dcd101: am 7bc08e9d: Merge change 21944 into eclair
Merge commit 'd0dcd1011617e4bed5c1f16f8c2c8f3a9fb7217b'

* commit 'd0dcd1011617e4bed5c1f16f8c2c8f3a9fb7217b':
  Implement new title bar hiding/showing behavior.
2009-08-24 14:18:03 -07:00
Leon Scroggins
d0dcd10116 am 7bc08e9d: Merge change 21944 into eclair
Merge commit '7bc08e9d51d3142717a94098f897a776f7b7bd71' into eclair-plus-aosp

* commit '7bc08e9d51d3142717a94098f897a776f7b7bd71':
  Implement new title bar hiding/showing behavior.
2009-08-24 14:15:47 -07:00
Android (Google) Code Review
7bc08e9d51 Merge change 21944 into eclair
* changes:
  Implement new title bar hiding/showing behavior.
2009-08-24 14:13:05 -07:00
Mike Lockwood
bc6c3aff01 am 2bca061c: am ac8ebcd1: Merge change 22478 into eclair
Merge commit '2bca061c2126ce3a0bb2072e9c53ef0411d2ca6c'

* commit '2bca061c2126ce3a0bb2072e9c53ef0411d2ca6c':
  DockObserver: minor cleanup.
2009-08-24 14:03:36 -07:00
Mike Lockwood
2bca061c21 am ac8ebcd1: Merge change 22478 into eclair
Merge commit 'ac8ebcd1071b433c1c5093e7a5bcb67224f5f620' into eclair-plus-aosp

* commit 'ac8ebcd1071b433c1c5093e7a5bcb67224f5f620':
  DockObserver: minor cleanup.
2009-08-24 14:01:21 -07:00
Android (Google) Code Review
ac8ebcd107 Merge change 22478 into eclair
* changes:
  DockObserver: minor cleanup.
2009-08-24 13:59:29 -07:00
Leon Scroggins
b2359262b4 Implement new title bar hiding/showing behavior.
Remove the code that hides the title bar when the page finishes loading.
When the user double taps, if it did not result in changing the viewing
mode (i.e. on a mobile site), send a message to the client so we can
toggle the title bar's visibility.  Required for a change to
packages/apps/Browser

Change-Id: I0040fd183ce5673a4069e943f38eb31599c0ca7d
2009-08-24 16:55:42 -04:00
Mike Lockwood
e4465e2eac DockObserver: minor cleanup.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-24 13:51:58 -07:00
Satish Roddom
6557ee2570 am aae6751c: am c0234a9d: Merge change 22474 into eclair
Merge commit 'aae6751c48e9690033f73c5a6323ffb82854701c'

* commit 'aae6751c48e9690033f73c5a6323ffb82854701c':
  Compose Message "To" field allows adding sequence of characters as contact
2009-08-24 13:49:58 -07:00
Mike Lockwood
c66fab337c am 2f6d42fc: am 4df8dd8a: Merge change 22470 into eclair
Merge commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f'

* commit '2f6d42fc43dad2b15b3aba4a259ead86241c996f':
  Fix some Javadoc typos.
2009-08-24 13:49:55 -07:00
Satish Roddom
aae6751c48 am c0234a9d: Merge change 22474 into eclair
Merge commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3' into eclair-plus-aosp

* commit 'c0234a9df9cffc0166c39eb0e8561d664a5438a3':
  Compose Message "To" field allows adding sequence of characters as contact
2009-08-24 13:47:45 -07:00
Android (Google) Code Review
c0234a9df9 Merge change 22474 into eclair
* changes:
  Compose Message "To" field allows adding sequence of characters as contact
2009-08-24 13:45:30 -07:00
Mike Lockwood
2f6d42fc43 am 4df8dd8a: Merge change 22470 into eclair
Merge commit '4df8dd8aea518644a4f937eff5e7ac87f77ad9c2' into eclair-plus-aosp

* commit '4df8dd8aea518644a4f937eff5e7ac87f77ad9c2':
  Fix some Javadoc typos.
2009-08-24 13:17:23 -07:00
Romain Guy
9464c87c56 am ade12b88: am 40ed81ec: Merge change 22472 into eclair
Merge commit 'ade12b885425084c5f8c4d6b4bd06e051308bd06'

* commit 'ade12b885425084c5f8c4d6b4bd06e051308bd06':
  Remove Galaxy Render Script, replaced by its wallpaper equivalent.
2009-08-24 13:17:14 -07:00
Romain Guy
ade12b8854 am 40ed81ec: Merge change 22472 into eclair
Merge commit '40ed81ec98e4c221e90273a8b842b1d110d8258b' into eclair-plus-aosp

* commit '40ed81ec98e4c221e90273a8b842b1d110d8258b':
  Remove Galaxy Render Script, replaced by its wallpaper equivalent.
2009-08-24 13:16:01 -07:00
Android (Google) Code Review
4df8dd8aea Merge change 22470 into eclair
* changes:
  Fix some Javadoc typos.
2009-08-24 13:15:47 -07:00
Android (Google) Code Review
40ed81ec98 Merge change 22472 into eclair
* changes:
  Remove Galaxy Render Script, replaced by its wallpaper equivalent.
2009-08-24 13:14:25 -07:00
Romain Guy
463a60830f Remove Galaxy Render Script, replaced by its wallpaper equivalent.
Change-Id: I28c91d648fe5ab6e794bf55d11879388b139dbe9
2009-08-24 13:12:40 -07:00
Mike Lockwood
725fcbf5ec Fix some Javadoc typos.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-24 13:09:20 -07:00
Derek Sollenberger
49150ab184 am 7a47a74c: am df8a3f31: adding harness for plugin testing to be built upon
Merge commit '7a47a74cee9b2c170860d7561cbe31935ce682e3'

* commit '7a47a74cee9b2c170860d7561cbe31935ce682e3':
  adding harness for plugin testing to be built upon
2009-08-24 12:20:25 -07:00
Derek Sollenberger
7a47a74cee am df8a3f31: adding harness for plugin testing to be built upon
Merge commit 'df8a3f31d871db25e952972c2eb346a71186e9e3' into eclair-plus-aosp

* commit 'df8a3f31d871db25e952972c2eb346a71186e9e3':
  adding harness for plugin testing to be built upon
2009-08-24 12:19:20 -07:00
Derek Sollenberger
df8a3f31d8 adding harness for plugin testing to be built upon 2009-08-24 15:10:48 -04:00
Cary Clark
1c6646bd69 am decbc3db: am 840b856d: Merge change 22452 into eclair
Merge commit 'decbc3dbc4d4d3c368319ae0784307b5182bd2fe'

* commit 'decbc3dbc4d4d3c368319ae0784307b5182bd2fe':
  don't center zoom on size change if zoom is in progress
2009-08-24 11:52:28 -07:00
Cary Clark
decbc3dbc4 am 840b856d: Merge change 22452 into eclair
Merge commit '840b856d2a7287e98526d3957715eba3677e872f' into eclair-plus-aosp

* commit '840b856d2a7287e98526d3957715eba3677e872f':
  don't center zoom on size change if zoom is in progress
2009-08-24 11:50:15 -07:00
Android (Google) Code Review
840b856d2a Merge change 22452 into eclair
* changes:
  don't center zoom on size change if zoom is in progress
2009-08-24 11:47:53 -07:00
Cary Clark
a91874d1f9 don't center zoom on size change if zoom is in progress
The onSizeChange code is called when the device is rotated and
when the title bar is hidden. In the latter case, it is in response
to the zooming transition from overview mode to reading mode, and
the zoom center should not be recomputed.

http://b/issue?id=2060720
2009-08-24 14:08:43 -04:00
Patrick Scott
595159ee0c am ab3803bd: am d507ff21: Merge change 22449 into eclair
Merge commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab'

* commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab':
  Check for a null history item to avoid crashing.
2009-08-24 11:04:38 -07:00
Patrick Scott
ab3803bd8d am d507ff21: Merge change 22449 into eclair
Merge commit 'd507ff21296b10ed57feec1200a8fe7eb09c0fc4' into eclair-plus-aosp

* commit 'd507ff21296b10ed57feec1200a8fe7eb09c0fc4':
  Check for a null history item to avoid crashing.
2009-08-24 11:02:28 -07:00
Android (Google) Code Review
d507ff2129 Merge change 22449 into eclair
* changes:
  Check for a null history item to avoid crashing.
2009-08-24 11:00:30 -07:00
Steve Block
c84e475d41 am dbaf246e: am ba9f5f3f: Merge change 22440 into eclair
Merge commit 'dbaf246ef7996db74b41a5f54d8defa336c39644'

* commit 'dbaf246ef7996db74b41a5f54d8defa336c39644':
  Java-side changes to persist Geolocation permissions between browser sessions.
2009-08-24 11:00:11 -07:00
Patrick Scott
af31c3a42d Check for a null history item to avoid crashing.
The history item may be null if this page is loaded through loadDataWithBaseURL
so we cannot count on the item being non-null.

Bug: 2073490
2009-08-24 13:59:55 -04:00
Steve Block
dbaf246ef7 am ba9f5f3f: Merge change 22440 into eclair
Merge commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616' into eclair-plus-aosp

* commit 'ba9f5f3f6b0e499708fb9aa05f30f4a2e7d8b616':
  Java-side changes to persist Geolocation permissions between browser sessions.
2009-08-24 10:57:54 -07:00
Android (Google) Code Review
ba9f5f3f6b Merge change 22440 into eclair
* changes:
  Java-side changes to persist Geolocation permissions between browser sessions.
2009-08-24 10:56:10 -07:00
Scott Su
85ad7bcf6f am cd5a2960: am b321625b: Merge change 22430 into eclair
Merge commit 'cd5a2960bc8e6aebf889f0373247f6edd4b1fe93'

* commit 'cd5a2960bc8e6aebf889f0373247f6edd4b1fe93':
  Remove frameworks/base/im since these stuff are only used by IM app
2009-08-24 10:39:01 -07:00
Yu Shan Emily Lau
5fffedf74f am c703dc40: am b91c52f7: am 8c937a17: Merge change 22379 into donut
Merge commit 'c703dc405cc1b8c87aa972fbf9a3e24f61175c1b'

* commit 'c703dc405cc1b8c87aa972fbf9a3e24f61175c1b':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:37:29 -07:00
Scott Su
cd5a2960bc am b321625b: Merge change 22430 into eclair
Merge commit 'b321625b859f2db4407810929ca6fa6074f65403' into eclair-plus-aosp

* commit 'b321625b859f2db4407810929ca6fa6074f65403':
  Remove frameworks/base/im since these stuff are only used by IM app
2009-08-24 10:36:49 -07:00
Yu Shan Emily Lau
c703dc405c am b91c52f7: am 8c937a17: Merge change 22379 into donut
Merge commit 'b91c52f77387a95b4ae554b369644e0f41e401ea' into eclair-plus-aosp

* commit 'b91c52f77387a95b4ae554b369644e0f41e401ea':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:35:15 -07:00
Android (Google) Code Review
b321625b85 Merge change 22430 into eclair
* changes:
  Remove frameworks/base/im since these stuff are only used by IM app
2009-08-24 10:34:32 -07:00
Yu Shan Emily Lau
b91c52f773 am 8c937a17: Merge change 22379 into donut
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:14:25 -07:00
Android (Google) Code Review
8c937a1766 Merge change 22379 into donut
* changes:
  	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
2009-08-24 10:11:00 -07:00
Satish Roddom
e43a6a02dd Compose Message "To" field allows adding sequence of characters as contact
When we select this option, this sequence of characters (which is neither a
valid email address nor a phone number), gets stored in contact with type MOBILE.

Fix: In function canAddToContacts, adding a check to validate whether the contact
to be added is a valid email address or phone number. If not, user will not be shown
with the option "Add to Contacts".
2009-08-24 09:19:08 -07:00
Patrick Scott
3bcc52e963 am 1aa196ef: am 4e9718d6: Fix synchronous xml requests with ssl errors.
Merge commit '1aa196ef7a7649f9c7394619235541b70221899c'

* commit '1aa196ef7a7649f9c7394619235541b70221899c':
  Fix synchronous xml requests with ssl errors.
2009-08-24 09:06:57 -07:00
Patrick Scott
1aa196ef7a am 4e9718d6: Fix synchronous xml requests with ssl errors.
Merge commit '4e9718d6ae3433a3f78fddf158a15701101ba781' into eclair-plus-aosp

* commit '4e9718d6ae3433a3f78fddf158a15701101ba781':
  Fix synchronous xml requests with ssl errors.
2009-08-24 09:05:24 -07:00
Patrick Scott
4e9718d6ae Fix synchronous xml requests with ssl errors.
Use the in-memory ssl preference table before posting a message to the WebCore
thread. Since the WebCore thread is blocked waiting for the ssl resource, we
cannot query the user for their preference. If the table does not contain the
user's decision, bail on the request to avoid a deadlock.

Also mark a few of the ssl handler's method's as synchronized. This was reported
by findbugs.
2009-08-24 12:02:51 -04:00
Grace Kloba
b5f970b06e am 92bd45f9: am 7fdab7f9: Merge change 22377 into eclair
Merge commit '92bd45f9444d3b1fca7bf687b73b46ccc7d8fcec'

* commit '92bd45f9444d3b1fca7bf687b73b46ccc7d8fcec':
  The new webkit won't keep RAM cache if http header has "no-store". So remove
2009-08-24 08:48:31 -07:00
Grace Kloba
92bd45f944 am 7fdab7f9: Merge change 22377 into eclair
Merge commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658' into eclair-plus-aosp

* commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658':
  The new webkit won't keep RAM cache if http header has "no-store". So remove
2009-08-24 08:47:01 -07:00
Android (Google) Code Review
7fdab7f967 Merge change 22377 into eclair
* changes:
  The new webkit won't keep RAM cache if http header has "no-store". So remove it from StreamLoader. And fix the code where we only want to cache network  result.
2009-08-24 08:45:06 -07:00
Steve Block
9d3273f622 Java-side changes to persist Geolocation permissions between browser sessions.
This fixes bug http://b/issue?id=2054365.
2009-08-24 11:59:42 +01:00
Steve Block
a4940c8555 am 4cc89b91: am 8a2000df: Merge change 22262 into eclair
Merge commit '4cc89b91b75cd605868f71a932d652f3fc7e320c'

* commit '4cc89b91b75cd605868f71a932d652f3fc7e320c':
  Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
2009-08-24 03:10:29 -07:00