Commit Graph

9154 Commits

Author SHA1 Message Date
Jack Palevich
57ef791997 am 6d317933: am 78059337: Merge change 25523 into eclair
Merge commit '6d3179332d2093f08995ac2299ef200e3137de5d'

* commit '6d3179332d2093f08995ac2299ef200e3137de5d':
  Add additional error checking, exit early if errors occur.
2009-09-17 12:18:32 -07:00
Yusuf T. Mobile
3bb36760c4 am 5c063479: am 6c41fead: Merge change 25519 into eclair
Merge commit '5c063479966039085a5357335f961cc9ab090f02'

* commit '5c063479966039085a5357335f961cc9ab090f02':
  LocationManagerService: Take fix accuracy into account in proximity zone logic.
2009-09-17 12:18:20 -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
Alex Gruenstein
5f1cc7b381 am 255b8dd2: (-s ours) am 4b6a278c: Merge change 25366 into eclair
Merge commit '255b8dd2509c60026135422851be85d008c113b0'

* commit '255b8dd2509c60026135422851be85d008c113b0':
  do not merge.  Revert "do not merge.  Remove voicesearch-specific functionality from framework."
2009-09-17 12:15:37 -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
Ben Murdoch
f266ec9dc9 am f1638002: am f8c90acd: Merge change 25319 into eclair
Merge commit 'f1638002a77fff4e48058e7f8b704065a37b2694'

* commit 'f1638002a77fff4e48058e7f8b704065a37b2694':
  Only move to the next test in DRT after the test has completed AND the page has finished loading.
2009-09-17 12:15:10 -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
Mathias Agopian
b3d2d4e3bc am 3455f8ee: am bcef9ac3: add basic time stats for surfaces lock time
Merge commit '3455f8ee9dc685f74e083fdea55eab9a872175eb'

* commit '3455f8ee9dc685f74e083fdea55eab9a872175eb':
  add basic time stats for surfaces lock time
2009-09-17 12:14:51 -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
Hung-ying Tyan
8830928405 am 58b5ff45: am 74f79c1b: Merge change 25440 into eclair
Merge commit '58b5ff4557a22fc4e81a905dc57375e1a0954628'

* commit '58b5ff4557a22fc4e81a905dc57375e1a0954628':
  Fix a minor bug in is_alnum_string()...
2009-09-17 12:14:34 -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
Benny Wong
cab9d22fc0 am 893056c6: am e38212a2: Overlay could not set position or rotation immediately after created, it should be triggered by signalEvent(). Originally from: https://partner.source.android.com/g/#change,1074
Merge commit '893056c636c705f04cd44643017fc84c0d981df2'

* commit '893056c636c705f04cd44643017fc84c0d981df2':
  Overlay could not set position or rotation immediately after created, it should be triggered by signalEvent().
2009-09-17 12:14:17 -07:00
Mathias Agopian
b1edb77abe am e286fd96: am a6aca3e0: Merge change 25435 into eclair
Merge commit 'e286fd96580430bec37da3fe266ad1070153686a'

* commit 'e286fd96580430bec37da3fe266ad1070153686a':
  disable backbuffer preservation when possible, which may improve performance a bit
2009-09-17 12:14:08 -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
Yu Shan Emily Lau
182d75ec09 am 00e6beb6: am c82e65ae: Merge change 25228 into eclair
Merge commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1'

* commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
2009-09-17 12:13:51 -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
Mathias Agopian
1736a2f608 am f4a96094: am 75c4d498: Merge change 25423 into eclair
Merge commit 'f4a96094eae52c4c235ed5d92293b9f3fe6e9f32'

* commit 'f4a96094eae52c4c235ed5d92293b9f3fe6e9f32':
  fix [2119400] sholes: artifacting when switching orientation
2009-09-17 12:13:33 -07:00
Christopher Tate
5d81cad2ae am 69f73363: am b8eb1cb7: Be sure to include shared lib path info when dealing with agents
Merge commit '69f73363280830bcca2d62cf9ba247d6dec9e0cb'

* commit '69f73363280830bcca2d62cf9ba247d6dec9e0cb':
  Be sure to include shared lib path info when dealing with agents
2009-09-17 12:13:25 -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
Robert Greenwalt
7ecbf1269e am 8fab7265: am 2f20df19: Merge change 25398 into eclair
Merge commit '8fab7265a5ba4ce46c20de682ce6d058c363962b'

* commit '8fab7265a5ba4ce46c20de682ce6d058c363962b':
  Reintroduce wifi RssiApprox, reducing driver calls
2009-09-17 12:13:07 -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
Romain Guy
c5cb111cdd am 31b60307: am d9497f7d: Merge change 25394 into eclair
Merge commit '31b60307de864ec1a3d4371f7e3b2eb02fa17f04'

* commit '31b60307de864ec1a3d4371f7e3b2eb02fa17f04':
  Add StateListDrawable's dither flag to the constant state.
2009-09-17 12:12:41 -07:00
Mathias Agopian
a043039fe3 am f5c25eed: am 9080125f: Merge change 25393 into eclair
Merge commit 'f5c25eeda9dcaf4cc6bd5d425f1f520ee861e617'

* commit 'f5c25eeda9dcaf4cc6bd5d425f1f520ee861e617':
  fix again [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-17 12:12:33 -07:00
Dianne Hackborn
690daac133 am 11ae4695: am e777e0a3: Merge change 25388 into eclair
Merge commit '11ae4695c18587a376f5da06f377fae6c242f5a5'

* commit '11ae4695c18587a376f5da06f377fae6c242f5a5':
  Fix #1827299: Google login screen to re-enter password is not viewable
2009-09-17 12:12:25 -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
Dianne Hackborn
8a104bb4c5 am ca1475a8: am 8843620c: Merge change 25360 into eclair
Merge commit 'ca1475a868c6fe24700065a8ae321bb41425c033'

* commit 'ca1475a868c6fe24700065a8ae321bb41425c033':
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
2009-09-17 12:12:08 -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
Guang Zhu
7c238186cb am 77c65a64: am 44ca7090: Merge change 25356 into eclair
Merge commit '77c65a641afc0b090a5ad231c1ff1f805edf576c'

* commit '77c65a641afc0b090a5ad231c1ff1f805edf576c':
  Filter out failing cases for future investigation.
2009-09-17 12:11:43 -07:00
Jason Sams
0f32a03723 am 6a940930: am 07e62d1d: Merge change 25185 into eclair
Merge commit '6a9409303bf90c340637a32498701603bb964e65'

* commit '6a9409303bf90c340637a32498701603bb964e65':
  Implement renderscript Invokables.
2009-09-17 12:11:34 -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
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
Dianne Hackborn
42876517f5 am 6c7de2f0: am e09f5707: Merge change 25302 into eclair
Merge commit '6c7de2f0784abb4ae6d170dc0677acb35834a0d6'

* commit '6c7de2f0784abb4ae6d170dc0677acb35834a0d6':
  Add more features.
2009-09-17 12:11:04 -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
Jack Palevich
6d3179332d am 78059337: Merge change 25523 into eclair
Merge commit '7805933738de33b1961bd03553237a86d90792dd' into eclair-plus-aosp

* commit '7805933738de33b1961bd03553237a86d90792dd':
  Add additional error checking, exit early if errors occur.
2009-09-17 11:06:54 -07:00
Android (Google) Code Review
7805933738 Merge change 25523 into eclair
* changes:
  Add additional error checking, exit early if errors occur.
2009-09-17 14:02:06 -04:00
Yusuf T. Mobile
5c06347996 am 6c41fead: Merge change 25519 into eclair
Merge commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6' into eclair-plus-aosp

* commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6':
  LocationManagerService: Take fix accuracy into account in proximity zone logic.
2009-09-17 11:02:05 -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
Jack Palevich
fc342cbbf7 Add additional error checking, exit early if errors occur. 2009-09-17 10:59:23 -07:00
Android (Google) Code Review
6c41feadc3 Merge change 25519 into eclair
* changes:
  LocationManagerService: Take fix accuracy into account in proximity zone logic.
2009-09-17 13:58:20 -04:00
Yusuf T. Mobile
2d2078aa1d LocationManagerService: Take fix accuracy into account in proximity zone logic.
Fixes http://code.google.com/p/android/issues/detail?id=2002

Change-Id: If2b0665c556269279c5813f2254f9624a556bd92
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-17 13:56:36 -04: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