4211 Commits

Author SHA1 Message Date
Sanjay Jeyakumar
ab45e534ec am e9506e36: Merge change 25561 into eclair
Merge commit 'e9506e3684c36a62533211022541997034088d2f' into eclair-plus-aosp

* commit 'e9506e3684c36a62533211022541997034088d2f':
  Add Gservices settings required for carrier billing.
2009-09-17 14:58:56 -07:00
Grace Kloba
a6412cc438 am 76a9b9c2: Merge change 25567 into eclair
Merge commit '76a9b9c246efc116967691c5a362c1f68daa6a0b' into eclair-plus-aosp

* commit '76a9b9c246efc116967691c5a362c1f68daa6a0b':
  The starting progress for WebView should be 100 as it is
2009-09-17 14:58:48 -07:00
Android (Google) Code Review
e9506e3684 Merge change 25561 into eclair
* changes:
  Add Gservices settings required for carrier billing.
2009-09-17 17:56:31 -04:00
Android (Google) Code Review
76a9b9c246 Merge change 25567 into eclair
* changes:
  The starting progress for WebView should be 100 as it is not in the loading state.
2009-09-17 17:54:11 -04:00
Sanjay Jeyakumar
8cbaa832ae Add Gservices settings required for carrier billing. 2009-09-17 14:47:43 -07:00
Jeff Sharkey
898f0de957 am 6449eb06: Added API for triggering FastTrack.
Merge commit '6449eb06acc934ba4007475680f236721181ee47' into eclair-plus-aosp

* commit '6449eb06acc934ba4007475680f236721181ee47':
  Added API for triggering FastTrack.
2009-09-17 14:29:31 -07:00
Eric Fischer
4175b5f34a Import revised translations. DO NOT MERGE 2009-09-17 14:28:06 -07:00
Grace Kloba
5a4fbd6c20 The starting progress for WebView should be 100 as it is
not in the loading state.
2009-09-17 14:20:28 -07:00
Jeff Sharkey
6449eb06ac Added API for triggering FastTrack.
I added a new API to help us move away from launching
FastTrack through SHOW_OR_CREATE.  For now it's going to
still pass through as an Intent with extras, but in the
future this could be used to launch a Window from a system
service.

Partially fixes http://b/2087222
2009-09-17 13:57:33 -07:00
Leon Scroggins
e51dcb3f2e am d55de404: Don\'t scroll the title bar off screen while loading.
Merge commit 'd55de40481c6ec7d8fbd1a38c80a6c66bf462a71' into eclair-plus-aosp

* commit 'd55de40481c6ec7d8fbd1a38c80a6c66bf462a71':
  Don't scroll the title bar off screen while loading.
2009-09-17 13:15:57 -07:00
Leon Scroggins
d55de40481 Don't scroll the title bar off screen while loading.
Though the user can still manually scroll the title bar
off screen, we do not want it to happen automatically.
When we load a new page, its scroll position can be
set to (0,0).  Make sure that we simply set it to the
top without adding in the title bar's height.  Also,
prevent javascript which attempts to scroll the page
to (0,0) or (0,1) from removing the title bar.

Fixes http://b/issue?id=2113398 and http://b/issue?id=2123079

Change-Id: Ida64d8c94be6744c7b0b4d60af1c229b2cc83673
2009-09-17 15:48:37 -04:00
Patrick Scott
65540522d7 am 3239de8c: Merge change 25338 into eclair
Merge commit '3239de8cd78b3fa292d85ee7658a9871cdfbc79b' into eclair-plus-aosp

* commit '3239de8cd78b3fa292d85ee7658a9871cdfbc79b':
  Remove the network connection logic from RequestQueue.
2009-09-17 12:31:14 -07:00
Android (Google) Code Review
3239de8cd7 Merge change 25338 into eclair
* changes:
  Remove the network connection logic from RequestQueue.
2009-09-17 15:25:52 -04:00
Dianne Hackborn
3955bccd2d am 4ac137ca: Merge change 25526 into eclair
Merge commit '4ac137cad9fb9aa5b69776b4ae3c8f906cc57511' into eclair-plus-aosp

* commit '4ac137cad9fb9aa5b69776b4ae3c8f906cc57511':
  Add API to retrieve memory used by running processes.
2009-09-17 12:20:12 -07:00
Android (Google) Code Review
4ac137cad9 Merge change 25526 into eclair
* changes:
  Add API to retrieve memory used by running processes.
2009-09-17 15:11:22 -04:00
Grace Kloba
467765c55f am dc2aab4f: Merge change 25524 into eclair
Merge commit 'dc2aab4ff2afbb414549a0311d46765e62c225be' into eclair-plus-aosp

* commit 'dc2aab4ff2afbb414549a0311d46765e62c225be':
  Fix the zoom center. Now there is a titlebar, the zoom center
2009-09-17 12:10:44 -07:00
Patrick Scott
aaebc86386 Remove the network connection logic from RequestQueue.
This doesn't always work right and is causing some problems if the network comes
back up without sending the broadcast.
2009-09-17 15:10:30 -04:00
Grace Kloba
c0c03af15f Fix the zoom center. Now there is a titlebar, the zoom center
needs to be adjusted for it as the user really cares the spot
in the document. We need to pin zoom around that spot.

Fix http://b/issue?id=2126300
2009-09-17 11:56:28 -07:00
Mike Lockwood
a038decb21 am c2912a66: Merge change 25490 into eclair
Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp

* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
2009-09-17 11:45:25 -07:00
Grace Kloba
7ce29aa8d4 am dfe095a0: Don\'t change the zoom filter during the zoom animation. Call another invalidate() to draw with the final filters. This fixed the problem where the end of the zoom animation is slow and jagged.
Merge commit 'dfe095a045f132dd9c75da4286b87532d9a973a0' into eclair-plus-aosp

* commit 'dfe095a045f132dd9c75da4286b87532d9a973a0':
  Don't change the zoom filter during the zoom animation.
2009-09-17 11:40:41 -07:00
Android (Google) Code Review
c2912a662d Merge change 25490 into eclair
* changes:
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
2009-09-17 14:39:43 -04:00
Grace Kloba
dfe095a045 Don't change the zoom filter during the zoom animation.
Call another invalidate() to draw with the final filters.
This fixed the problem where the end of the zoom animation
is slow and jagged.

Fix http://b/issue?id=2126523
2009-09-17 11:36:02 -07:00
Dianne Hackborn
4f21c4cf07 Add API to retrieve memory used by running processes.
Change-Id: I9c1935c2ef3c78bd67ec4dfd811a1caaab4514c3
2009-09-17 11:13:45 -07:00
Debajit Ghosh
6ce4af8587 am 70db3a20: Merge change 25414 into eclair
Merge commit '70db3a20cfa73fad0794679dda4102461a88057b' into eclair-plus-aosp

* commit '70db3a20cfa73fad0794679dda4102461a88057b':
  refactor copy-and-paste email address filtering code.
2009-09-17 11:01:57 -07:00
Android (Google) Code Review
70db3a20cf Merge change 25414 into eclair
* changes:
  refactor copy-and-paste email address filtering code. add a column to Calendar.Events contract class.
2009-09-17 13:53:37 -04:00
Marco Nelissen
8b1997d004 am 94ef4991: Merge change 25502 into eclair
Merge commit '94ef49918240cedaa559ad7f7752d20cf4d1668b' into eclair-plus-aosp

* commit '94ef49918240cedaa559ad7f7752d20cf4d1668b':
  Fix typo
2009-09-17 10:23:32 -07:00
Jeff Hamilton
bd2c930e1a am 2f77ffb0: Merge change 25503 into eclair
Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp

* commit '2f77ffb087892f9474b35cb019f593025653e492':
  Don't crash if the cursor is null.
2009-09-17 10:23:21 -07:00
Android (Google) Code Review
94ef499182 Merge change 25502 into eclair
* changes:
  Fix typo
2009-09-17 13:17:55 -04:00
Android (Google) Code Review
2f77ffb087 Merge change 25503 into eclair
* changes:
  Don't crash if the cursor is null.
2009-09-17 13:07:04 -04:00
Andrei Popescu
036e2c3433 am f7c98e8d: Merge change 25493 into eclair
Merge commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823' into eclair-plus-aosp

* commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823':
  Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
2009-09-17 10:00:03 -07:00
Android (Google) Code Review
f7c98e8d18 Merge change 25493 into eclair
* changes:
  Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
2009-09-17 12:52:59 -04:00
Jeff Hamilton
8d570b3a24 Don't crash if the cursor is null.
Change-Id: Ibbacc97f781c1485599a5e11217527930d97fe2d
2009-09-17 11:52:43 -05:00
Marco Nelissen
ae87bd089a Fix typo 2009-09-17 09:44:43 -07:00
Andrei Popescu
290c34ac3a Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate 2009-09-17 17:27:51 +01:00
Mike Lockwood
c17f07aa04 Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
This reverts commit ddfe879b783ad72603308e28e8f683454464684e.
2009-09-17 11:58:01 -04:00
Nick Pelly
171318c2d1 am 074c11c1: Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
Merge commit '074c11c1649a097ba1beae719069f8d4a2dd43e3' into eclair-plus-aosp

* commit '074c11c1649a097ba1beae719069f8d4a2dd43e3':
  Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
2009-09-17 08:53:07 -07:00
Grace Kloba
c165376408 am ff22b182: Merge change 25401 into eclair
Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp

* commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296':
  Add a null checking to avoid crash.
2009-09-17 08:48:53 -07:00
Alex Gruenstein
255b8dd250 am 4b6a278c: Merge change 25366 into eclair
Merge commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3' into eclair-plus-aosp

* commit '4b6a278cb6b6c80c9f6ed9d35dd67b7898981aa3':
  do not merge.  Revert "do not merge.  Remove voicesearch-specific functionality from framework."
2009-09-17 08:48:45 -07:00
Bryan Mawhinney
45130cff81 am c7aef5d0: Merge change 25477 into eclair
Merge commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017' into eclair-plus-aosp

* commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017':
  Make ACTV use all available space if height is FILL_PARENT.
2009-09-17 08:48:31 -07:00
Andrei Popescu
a3a40a3099 am b65c5cf0: Merge change 25098 into eclair
Merge commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0' into eclair-plus-aosp

* commit 'b65c5cf0746338a26bb6e721aa61283742ae58d0':
  Poster support on the Java side
2009-09-17 08:48:00 -07:00
Karl Rosaen
a891bce913 am f5a68512: Merge change 25463 into eclair
Merge commit 'f5a68512c3d0624584c3e6da1523863e401e49d0' into eclair-plus-aosp

* commit 'f5a68512c3d0624584c3e6da1523863e401e49d0':
  First pass at pattern lock screen that includes date / time and carrier info (framework portion).
2009-09-17 08:47:32 -07:00
Bjorn Bringert
f2c7040b7f am 76f01118: Merge change 25362 into eclair
Merge commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c' into eclair-plus-aosp

* commit '76f0111845f0886f522cfe1eb5ec1dee34181f7c':
  Handle BACK key with focus in search ACTV correctly
2009-09-17 08:46:57 -07:00
Fred Quintana
a1112e4cda am e9351608: Merge change 25406 into eclair
Merge commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6' into eclair-plus-aosp

* commit 'e9351608c6360b70f1311e30b7a6c6917726bbd6':
  remove the signin required notification as when the signin is successful
2009-09-17 08:46:32 -07:00
Jeff Sharkey
d2f52de6dd am 81521abe: Merge change 25431 into eclair
Merge commit '81521abea121683643cedbb7483a9a7eb0e466ae' into eclair-plus-aosp

* commit '81521abea121683643cedbb7483a9a7eb0e466ae':
  Add "MMS" to common phone number types.
2009-09-17 08:45:16 -07:00
Amith Yamasani
aa3620f399 am 12cc9d82: Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a' into eclair-plus-aosp

* commit '12cc9d82a6f3bd2aebad8ed97a29e2cbad3ec77a':
  Add a new flag for IMEs to disable suggestions for certain fields.
2009-09-17 08:44:53 -07:00
Jaikumar Ganesh
7a00336cad am cfc7f1aa: Merge change 25382 into eclair
Merge commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678' into eclair-plus-aosp

* commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678':
  Fix async calls with Connect And Disconnect Sink.
2009-09-17 08:43:56 -07:00
Jaikumar Ganesh
d92593bb6e am cc670b5c: Merge change 25323 into eclair
Merge commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48' into eclair-plus-aosp

* commit 'cc670b5ca26e4a6ac8d34fa0ee0e51c895067c48':
  Change handling of remoteUuids.
2009-09-17 08:43:41 -07:00
Jaikumar Ganesh
4f377394a9 am 972f0e38: Merge change 25325 into eclair
Merge commit '972f0e3806f379b7fb6e43265f56ddd91c38107e' into eclair-plus-aosp

* commit '972f0e3806f379b7fb6e43265f56ddd91c38107e':
  Add a parcelable version of UUID file.
2009-09-17 08:43:19 -07:00
Eric Fischer
b3278a5c8a am 0828beee: Merge change 25386 into eclair
Merge commit '0828beee503b99a8f38f456416592d4ed6c799ae' into eclair-plus-aosp

* commit '0828beee503b99a8f38f456416592d4ed6c799ae':
  Add one more hardware keyboard character popup: \ if you hold /
2009-09-17 08:42:29 -07:00
Leon Scroggins
3ce9730848 am 38456260: Merge change 25369 into eclair
Merge commit '38456260b919497bf948c1e3fd5a7b76b5dda68a' into eclair-plus-aosp

* commit '38456260b919497bf948c1e3fd5a7b76b5dda68a':
  Update the input method when the selection changes.
2009-09-17 08:41:50 -07:00