4465 Commits

Author SHA1 Message Date
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
1f8e5a520c am e51dcb3f: am d55de404: Don\'t scroll the title bar off screen while loading.
Merge commit 'e51dcb3f2ed6bb13a00e01cd718c4701a8fb3872'

* commit 'e51dcb3f2ed6bb13a00e01cd718c4701a8fb3872':
  Don't scroll the title bar off screen while loading.
2009-09-17 13:25:14 -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
2d5038d055 am 65540522: am 3239de8c: Merge change 25338 into eclair
Merge commit '65540522d748b62a93a8b091072c7b3d51886d3a'

* commit '65540522d748b62a93a8b091072c7b3d51886d3a':
  Remove the network connection logic from RequestQueue.
2009-09-17 12:36:19 -07: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
Dianne Hackborn
b1a3fcb31a am 3955bccd: am 4ac137ca: Merge change 25526 into eclair
Merge commit '3955bccd2d89573a065e16f3c0172f10f22fe7df'

* commit '3955bccd2d89573a065e16f3c0172f10f22fe7df':
  Add API to retrieve memory used by running processes.
2009-09-17 12:27:16 -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
Grace Kloba
37aa3a0cb7 am 467765c5: am dc2aab4f: Merge change 25524 into eclair
Merge commit '467765c55f116395bbf9a15d83b61c9d511318d6'

* commit '467765c55f116395bbf9a15d83b61c9d511318d6':
  Fix the zoom center. Now there is a titlebar, the zoom center
2009-09-17 12:24:16 -07: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
Mike Lockwood
8d7ae8eede am a038decb: am c2912a66: Merge change 25490 into eclair
Merge commit 'a038decb21419c42a70c83a84c3b8ba152524913'

* commit 'a038decb21419c42a70c83a84c3b8ba152524913':
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
2009-09-17 12:19:22 -07:00
Grace Kloba
96e81f98cd am 7ce29aa8: 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 '7ce29aa8d466d03ac109601e804edc94ea37a770'

* commit '7ce29aa8d466d03ac109601e804edc94ea37a770':
  Don't change the zoom filter during the zoom animation.
2009-09-17 12:19:06 -07:00
Debajit Ghosh
3e75268153 am 6ce4af85: am 70db3a20: Merge change 25414 into eclair
Merge commit '6ce4af8587214865771b3fb6da8ba352b9080056'

* commit '6ce4af8587214865771b3fb6da8ba352b9080056':
  refactor copy-and-paste email address filtering code.
2009-09-17 12:18:12 -07:00
Marco Nelissen
a83b4a1770 am 8b1997d0: am 94ef4991: Merge change 25502 into eclair
Merge commit '8b1997d00441687b4d00cb4817b69194e2cdf06a'

* commit '8b1997d00441687b4d00cb4817b69194e2cdf06a':
  Fix typo
2009-09-17 12:17:48 -07:00
Jeff Hamilton
1690956f09 am bd2c930e: am 2f77ffb0: Merge change 25503 into eclair
Merge commit 'bd2c930e1ae624b711c447fa5c76cc550ed243c1'

* commit 'bd2c930e1ae624b711c447fa5c76cc550ed243c1':
  Don't crash if the cursor is null.
2009-09-17 12:17:41 -07:00
Andrei Popescu
5e5ae8632d am 036e2c34: am f7c98e8d: Merge change 25493 into eclair
Merge commit '036e2c34332545babc002d1a9c7c80b3ba7d0170'

* commit '036e2c34332545babc002d1a9c7c80b3ba7d0170':
  Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
2009-09-17 12:16:55 -07:00
Nick Pelly
d87daa756b am 171318c2: am 074c11c1: Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
Merge commit '171318c2d188bdb12085af288a44ac3ae2861a30'

* commit '171318c2d188bdb12085af288a44ac3ae2861a30':
  Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
2009-09-17 12:15:55 -07:00
Grace Kloba
0ef6499fdb am c1653764: am ff22b182: Merge change 25401 into eclair
Merge commit 'c165376408804893c2f086282850862371910aed'

* commit 'c165376408804893c2f086282850862371910aed':
  Add a null checking to avoid crash.
2009-09-17 12:15:46 -07:00
Bryan Mawhinney
ccf15ac53c am 45130cff: am c7aef5d0: Merge change 25477 into eclair
Merge commit '45130cff81187eced54c37b27efd0da9e21598a4'

* commit '45130cff81187eced54c37b27efd0da9e21598a4':
  Make ACTV use all available space if height is FILL_PARENT.
2009-09-17 12:15:28 -07:00
Andrei Popescu
b4284bd9c5 am a3a40a30: am b65c5cf0: Merge change 25098 into eclair
Merge commit 'a3a40a3099914bcfa98fc381ea9d905602497b41'

* commit 'a3a40a3099914bcfa98fc381ea9d905602497b41':
  Poster support on the Java side
2009-09-17 12:15:19 -07:00
Karl Rosaen
9e912f76c3 am a891bce9: am f5a68512: Merge change 25463 into eclair
Merge commit 'a891bce913b55db4f60d2cada544229306a18271'

* commit 'a891bce913b55db4f60d2cada544229306a18271':
  First pass at pattern lock screen that includes date / time and carrier info (framework portion).
2009-09-17 12:14:59 -07:00
Bjorn Bringert
fd13165c74 am f2c7040b: am 76f01118: Merge change 25362 into eclair
Merge commit 'f2c7040b7fa4bd018107ea14815939c5d5ce5aa8'

* commit 'f2c7040b7fa4bd018107ea14815939c5d5ce5aa8':
  Handle BACK key with focus in search ACTV correctly
2009-09-17 12:14:42 -07:00
Fred Quintana
076ef940af am a1112e4c: am e9351608: Merge change 25406 into eclair
Merge commit 'a1112e4cdaae9aadf3c8ffa0c7008dbd0997ff14'

* commit 'a1112e4cdaae9aadf3c8ffa0c7008dbd0997ff14':
  remove the signin required notification as when the signin is successful
2009-09-17 12:14:24 -07:00
Jeff Sharkey
4e2ecccb28 am d2f52de6: am 81521abe: Merge change 25431 into eclair
Merge commit 'd2f52de6dd8bf17017f4c43fbdb303dbf7e92372'

* commit 'd2f52de6dd8bf17017f4c43fbdb303dbf7e92372':
  Add "MMS" to common phone number types.
2009-09-17 12:13:59 -07:00
Amith Yamasani
82ae45f773 am aa3620f3: am 12cc9d82: Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit 'aa3620f3999ccf2d79105bdc3641ce4c9134032e'

* commit 'aa3620f3999ccf2d79105bdc3641ce4c9134032e':
  Add a new flag for IMEs to disable suggestions for certain fields.
2009-09-17 12:13:42 -07:00
Jaikumar Ganesh
2548794913 am 7a00336c: am cfc7f1aa: Merge change 25382 into eclair
Merge commit '7a00336cadace0f7c1a3151953709a739c073337'

* commit '7a00336cadace0f7c1a3151953709a739c073337':
  Fix async calls with Connect And Disconnect Sink.
2009-09-17 12:13:16 -07:00
Jaikumar Ganesh
137e9a7a54 am d92593bb: am cc670b5c: Merge change 25323 into eclair
Merge commit 'd92593bb6e2e80b03bd261e9e86c0907b6939200'

* commit 'd92593bb6e2e80b03bd261e9e86c0907b6939200':
  Change handling of remoteUuids.
2009-09-17 12:12:58 -07:00
Jaikumar Ganesh
45c2da09ba am 4f377394: am 972f0e38: Merge change 25325 into eclair
Merge commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6'

* commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6':
  Add a parcelable version of UUID file.
2009-09-17 12:12:49 -07:00
Eric Fischer
8532e4e255 am b3278a5c: am 0828beee: Merge change 25386 into eclair
Merge commit 'b3278a5c8a625b5bfe532eea0c1e30d24695f4ae'

* commit 'b3278a5c8a625b5bfe532eea0c1e30d24695f4ae':
  Add one more hardware keyboard character popup: \ if you hold /
2009-09-17 12:12:16 -07:00
Leon Scroggins
379edc4cfe am 3ce97308: am 38456260: Merge change 25369 into eclair
Merge commit '3ce9730848f5e1b0ab277eb77932fe60b888b2fd'

* commit '3ce9730848f5e1b0ab277eb77932fe60b888b2fd':
  Update the input method when the selection changes.
2009-09-17 12:12:00 -07:00
Fred Quintana
3f0ea3abba am fd6bb030: am 5f78786c: Merge change 25190 into eclair
Merge commit 'fd6bb030fde10603e8d8d5deaeeee2b132e8b2c4'

* commit 'fd6bb030fde10603e8d8d5deaeeee2b132e8b2c4':
  add the ability to do a newAssert with no values
2009-09-17 12:11:52 -07:00
Romain Guy
5cbbf0afde am 2437de94: am 32c687c2: Merge change 25351 into eclair
Merge commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e'

* commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e':
  Change Theme.Light's background back to pure white.
2009-09-17 12:11:23 -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
Leon Scroggins
ce20ffddfd am 3eb9a78a: am 4295613a: Merge change 25307 into eclair
Merge commit '3eb9a78a254395097cbb28e3826d25014422ead5'

* commit '3eb9a78a254395097cbb28e3826d25014422ead5':
  Allow touches to change the selection in WebTextView.
2009-09-17 12:11:14 -07:00
Evan Millar
1d42db5380 am 6c42a4ba: am 6a20b823: Merge change 25293 into eclair
Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0'

* commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0':
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-17 12:10:55 -07:00
Jean-Baptiste Queru
e910ef2258 am e525eef4: merge from open-source master
Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'

* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
  Update comment in mediaplayer.h.
  Update documentation for getVideoWidth and getVideoHeight.
  Make Uri.parseUserPart, parseHost, and parsePort symmetric
  Javadoc used startApplication() which doesnt exists, changed to createApplication()
2009-09-17 12:10:47 -07: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