5311 Commits

Author SHA1 Message Date
Android (Google) Code Review
fe6f45c814 Merge change 8098 into donut
* changes:
  cast is floor. Use round instead.  This fixes a few layout issues (that was due to smaller widnow size)
2009-07-21 17:39:05 -07:00
Android (Google) Code Review
55616f95af am 74cb705f: Merge change 8121 into donut
Merge commit '74cb705f0c1ee5ccb598b2b676aa50a36e6af7f9'

* commit '74cb705f0c1ee5ccb598b2b676aa50a36e6af7f9':
  Fixes #1818201. Do not attempt to display the popup until after the first layout.
2009-07-21 17:29:43 -07:00
Android (Google) Code Review
74cb705f0c Merge change 8121 into donut
* changes:
  Fixes #1818201. Do not attempt to display the popup until after the first layout.
2009-07-21 17:06:04 -07:00
Romain Guy
9bc9fa1538 Fixes #1818201. Do not attempt to display the popup until after the first layout. 2009-07-21 17:05:09 -07:00
Jinghui Guo
5e9760c16b Fix remote caller ID unknow issue in 3 way call 2009-07-21 16:44:59 -07:00
Android (Google) Code Review
fff89ca293 am 7e71fb28: Merge change 8111 into donut
Merge commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca'

* commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca':
  Don't start search from a dialog if there is no activity associated with
2009-07-21 16:43:24 -07:00
Mitsuru Oshima
61324e58c5 cast is floor. Use round instead.
This fixes a few layout issues (that was due to smaller widnow size)
2009-07-21 16:42:41 -07:00
Android (Google) Code Review
7e71fb284d Merge change 8111 into donut
* changes:
  Don't start search from a dialog if there is no activity associated with the search manager at that point.
2009-07-21 16:41:41 -07:00
Android (Google) Code Review
078bc317b7 am 43f8d2e5: Merge change 8106 into donut
Merge commit '43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a'

* commit '43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a':
  Add note to Intent.fillIn javadoc to describe component copying behavior.
2009-07-21 16:34:37 -07:00
Android (Google) Code Review
43f8d2e58c Merge change 8106 into donut
* changes:
  Add note to Intent.fillIn javadoc to describe component copying behavior.
2009-07-21 16:32:14 -07:00
Karl Rosaen
ec0a12cf19 Don't start search from a dialog if there is no activity associated with
the search manager at that point.

Still works:
- hitting search when a managed dialog of an app is showing will dismiss
  the dialog and start in-app search (if it supports it), falling back
  on global search
- hitting search when a dialog of an app (not managed by the activity) will
  dismiss the dialog and start global search
- hitting search when a system dialog is showing will just dismiss the dialog.
2009-07-21 16:21:32 -07:00
Brett Chabot
3e391759d9 Add note to Intent.fillIn javadoc to describe component copying behavior. 2009-07-21 16:09:08 -07:00
Android (Google) Code Review
8487ab3e9f Merge change 8087
* changes:
  Fix the media button style to use dip instead of px.
2009-07-21 15:14:08 -07:00
Android (Google) Code Review
c6a936aa1b Merge change 8084
* changes:
  Fix for enabling auto-switch back to alpha mode from symbols.
2009-07-21 15:10:24 -07:00
Amith Yamasani
b974c7a749 Fix for enabling auto-switch back to alpha mode from symbols.
When switching keyboards in the IME view, make sure that any pending touches
don't generate up events when released.
2009-07-21 15:09:24 -07:00
Marco Nelissen
2fc22398a6 Fix the media button style to use dip instead of px. 2009-07-21 15:07:31 -07:00
Chung-yih Wang
24988b3491 Cleanup the old keystore APIs. 2009-07-22 06:04:58 +08:00
Android (Google) Code Review
eceb3bf907 Merge change 8038
* changes:
  Fix hardware overlay so all changes are commited when done.
2009-07-21 14:46:50 -07:00
Android (Google) Code Review
538ed77af4 am 841ed859: Merge change 8073 into donut
Merge commit '841ed8596a745d90822467bc2c0e13880bb59cc9'

* commit '841ed8596a745d90822467bc2c0e13880bb59cc9':
  Reset the speech synth singleton to null when the service is destroyed
2009-07-21 14:46:20 -07:00
Chung-yih Wang
447865eec7 am 22726cf8: Return error codes for storing the key/cert in addPkcs12Keystore()
Merge commit '22726cf8174fe00a097c89b8da397b10626cdd00'

* commit '22726cf8174fe00a097c89b8da397b10626cdd00':
  Return error codes for storing the key/cert in addPkcs12Keystore()
2009-07-21 14:44:55 -07:00
Android (Google) Code Review
841ed8596a Merge change 8073 into donut
* changes:
  Reset the speech synth singleton to null when the service is destroyed so it can be recreated when the service is initialized. In the interface with the native synthesizer library, close the lib in the finalizer, delete the global ref to the SynthProxy java object.
2009-07-21 14:44:18 -07:00
Android (Google) Code Review
75c0928c59 am 8ece3445: Merge change 8061 into donut
Merge commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd'

* commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd':
  Throw a connecting exception when timed out.
2009-07-21 14:39:01 -07:00
Jean-Baptiste Queru
4eb5479bdf am db7db69a: Merge snapshot variant of donut back into main tree
Merge commit 'db7db69a2162439bf722d0f1f65429ca3ca19dcd'

* commit 'db7db69a2162439bf722d0f1f65429ca3ca19dcd':
  donut snapshot
2009-07-21 14:38:36 -07:00
Android (Google) Code Review
fe923cf2d6 am 2c25fac2: Merge change 8036 into donut
Merge commit '2c25fac23e5daafd62238f4c3dd031e3f4cd76f1'

* commit '2c25fac23e5daafd62238f4c3dd031e3f4cd76f1':
  * Disable compatibility mode for all cases.
2009-07-21 14:38:32 -07:00
Android (Google) Code Review
71effba5ac am 6fb608ee: Merge change 7854 into donut
Merge commit '6fb608ee67c3ad82baf2253b87b63fff8907992a'

* commit '6fb608ee67c3ad82baf2253b87b63fff8907992a':
  Issue #1884058 (Need to only record frequency and duration for selected Google apps)
2009-07-21 14:38:26 -07:00
Chung-yih Wang
22726cf817 Return error codes for storing the key/cert in addPkcs12Keystore() 2009-07-22 05:35:20 +08:00
Android (Google) Code Review
bd2007e2e3 Merge change 7168
* changes:
  udev rules files don't need execute permission.
2009-07-21 14:31:09 -07:00
Jean-Michel Trivi
cee3bd4d68 Reset the speech synth singleton to null when the service is destroyed
so it can be recreated when the service is initialized.
In the interface with the native synthesizer library, close the lib
in the finalizer, delete the global ref to the SynthProxy java object.
2009-07-21 14:22:25 -07:00
Android (Google) Code Review
8ece3445e8 Merge change 8061 into donut
* changes:
  Throw a connecting exception when timed out.
2009-07-21 14:16:55 -07:00
Hung-ying Tyan
bb22192421 Throw a connecting exception when timed out. 2009-07-22 04:37:39 +08:00
Android (Google) Code Review
80e2ecc520 Merge change 8048
* changes:
  Add text extensions to the extension mime type map.
2009-07-21 13:34:56 -07:00
Patrick Scott
9f61732e9b Add text extensions to the extension mime type map.
The Browser used to have a concern around mapping text extensions to various
text/* mime types. If a text extension mapped to an unknown text/* mime type,
the Browser would attempt to download a url instead of just displaying the
content.

There is another change in external/webkit that uses 2 static functions in
DOMImplementation that determine if a mime type is text or xml. The text
function in particular checks for a leading "text/" string in the mime type.
With that change, pruning text mime types is no longer needed.

Bug: 1988375
2009-07-21 15:28:12 -04:00
Android (Google) Code Review
4de2a95af8 Merge change 8050
* changes:
  Enable light sources and update film test app.
2009-07-21 12:22:27 -07:00
Jason Sams
ee41112e15 Enable light sources and update film test app. 2009-07-21 12:20:54 -07:00
Jean-Baptiste Queru
db7db69a21 Merge snapshot variant of donut back into main tree 2009-07-21 11:55:23 -07:00
Android (Google) Code Review
2c25fac23e Merge change 8036 into donut
* changes:
  * Disable compatibility mode for all cases.
2009-07-21 11:37:27 -07:00
Mitsuru Oshima
69fff4a72d * Disable compatibility mode for all cases. 2009-07-21 11:35:18 -07:00
Jean-Baptiste Queru
cf4550c319 donut snapshot 2009-07-21 11:16:54 -07:00
Android (Google) Code Review
6fb608ee67 Merge change 7854 into donut
* changes:
  Issue #1884058 (Need to only record frequency and duration for selected Google apps)
2009-07-21 11:10:16 -07:00
Rebecca Schultz Zavin
7ac5e698b2 Fix hardware overlay so all changes are commited when done. 2009-07-21 11:07:23 -07:00
Andrei Popescu
af9c77edbd wire appcache to the HTML5 UI 2009-07-21 18:24:38 +01:00
Android (Google) Code Review
305d9ba85d am 69a841a1: Merge change 8026 into donut
Merge commit '69a841a1649390d68b32b3bcf0c429a60c400cfa'

* commit '69a841a1649390d68b32b3bcf0c429a60c400cfa':
  Make sure the speech synthesizer proxy is a singleton in the TTS service.
2009-07-21 10:23:06 -07:00
Android (Google) Code Review
69a841a164 Merge change 8026 into donut
* changes:
  Make sure the speech synthesizer proxy is a singleton in the TTS service.
2009-07-21 10:20:48 -07:00
Android (Google) Code Review
f24239355f Merge change 8008
* changes:
  Allow 205 and 305 to have content.
2009-07-21 10:17:27 -07:00
Jean-Michel Trivi
a73d5cd055 Make sure the speech synthesizer proxy is a singleton in the TTS service. 2009-07-21 10:13:41 -07:00
Dave Sparks
4b5a8f84b1 am da57856d: Add logging to help track down intermittent bug
Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'

* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
  Add logging to help track down intermittent bug
2009-07-21 09:22:54 -07:00
Dave Sparks
da57856d74 Add logging to help track down intermittent bug 2009-07-21 08:43:29 -07:00
The Android Open Source Project
707f498b94 Merge commit 'remotes/goog/donut' into donut-release 2009-07-21 08:34:59 -07:00
Patrick Scott
c319c69b12 Allow 205 and 305 to have content.
205 is interpreted by Safari to be like 200 and show the given content. Change
canHaveResponseBody to allow 205 to have a body.

305 is a very rare server response indicating to the client to use the given
Location header as a proxy and reissue the original request. Curl doesn't do
anything with this header and neither does internal networking code. For now,
we will just allow the response body to propagate to webcore.
2009-07-21 07:55:50 -04:00
Mike LeBeau
4f7b7c3cc6 am eb1eab12: Remove unused search dialog layout files.
Merge commit 'eb1eab1214dbe0b25355e7bde4279fca804af9f7'

* commit 'eb1eab1214dbe0b25355e7bde4279fca804af9f7':
  Remove unused search dialog layout files.
2009-07-20 23:34:17 -07:00