3568 Commits

Author SHA1 Message Date
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
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
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
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
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
Karl Rosaen
ae32ac6e2e am 4babd458: am 82df16c6: Merge change 25297 into eclair
Merge commit '4babd458daa3fd7ff73110b1689094a9586a3c46'

* commit '4babd458daa3fd7ff73110b1689094a9586a3c46':
  Address romain's code review comments
2009-09-17 09:59:29 -07:00
Cary Clark
611be54a5c am 20158b9c: am c9e2e661: slide the title if the site changes the scroll position
Merge commit '20158b9ce5895fdbdedf5db103583264d94a62a4'

* commit '20158b9ce5895fdbdedf5db103583264d94a62a4':
  slide the title if the site changes the scroll position
2009-09-17 09:58:27 -07:00
Mike Lockwood
ca4bb53c76 am bdd1f2e3: am 9092ab4d: Add support for launching activities when attaching to a car or desk dock.
Merge commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b'

* commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b':
  Add support for launching activities when attaching to a car or desk dock.
2009-09-17 09:57:52 -07:00
Eric Fischer
165bc88555 am 5a7477ce: am 764916d0: Merge change 23383 into eclair
Merge commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18'

* commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18':
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-17 09:57:40 -07:00
Cynthia Wong
9ff2e9392d am fc1a3657: am f5a5f045: Merge change 25296 into eclair
Merge commit 'fc1a365740478f61e671fe669fc466a9a753f031'

* commit 'fc1a365740478f61e671fe669fc466a9a753f031':
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-17 09:57:24 -07:00
Amith Yamasani
4fa32578c1 am 1272442f: am 0abc859e: Merge change 25299 into eclair
Merge commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2'

* commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2':
  Show keyboard automatically in EditTextPreference dialogs
2009-09-17 09:56:43 -07:00
Cary Clark
26b10afe9e am a78a1579: am 9f28d900: Merge change 25280 into eclair
Merge commit 'a78a157905ae49a170b0e2239df96b1f365f646d'

* commit 'a78a157905ae49a170b0e2239df96b1f365f646d':
  Don't scroll on load if titlebar is visible
2009-09-17 09:55:21 -07:00
Bjorn Bringert
db511f4cd8 am 5e3f452c: am 57384101: Merge change 25270 into eclair
Merge commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c'

* commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c':
  Use Resources to load search icons with android.resource URIs
2009-09-17 09:54:14 -07:00
Chih-Chung Chang
d127d2027f am 146a0fab: am 46ad7961: Unhide cancelAutoFocus API in Camera.
Merge commit '146a0fabb2db8d0677621d716ea02198c6a795ab'

* commit '146a0fabb2db8d0677621d716ea02198c6a795ab':
  Unhide cancelAutoFocus API in Camera.
2009-09-17 09:53:48 -07:00