Commit Graph

5033 Commits

Author SHA1 Message Date
Suchi Amalapurapu
9a7da5d9ba am 0d51d635: Merge change 25626 into eclair
Merge commit '0d51d63595014c4237010118aaac891e657c2d23' into eclair-plus-aosp

* commit '0d51d63595014c4237010118aaac891e657c2d23':
  Check if rename of current settings file was successful before persisting
2009-09-17 16:40:34 -07:00
Android (Google) Code Review
2da4aa942d Merge change 25626 into eclair
* changes:
  Check if rename of current settings file was successful before persisting new changes to settings.
2009-09-17 19:32:34 -04:00
Debajit Ghosh
cdc732e0c7 am 96352104: Merge change 25550 into eclair
Merge commit '96352104fbb172d91f957551c772988e02d79f33' into eclair-plus-aosp

* commit '96352104fbb172d91f957551c772988e02d79f33':
  add system property to disable gzip, to help with debugging.
2009-09-17 16:15:58 -07:00
Android (Google) Code Review
e10cfb278d Merge change 25550 into eclair
* changes:
  add system property to disable gzip, to help with debugging.
2009-09-17 19:07:05 -04:00
Amith Yamasani
a626625844 am 6817946f: Merge change 25601 into eclair
Merge commit '6817946fd0a009a554f6c0aae1b6c608ebd531c5' into eclair-plus-aosp

* commit '6817946fd0a009a554f6c0aae1b6c608ebd531c5':
  Fix possible race condition when switching keyboards while there are pending messages.
2009-09-17 15:56:02 -07:00
Fred Quintana
94c27b788a am 3ecd5f43: - Make the AccountManagerService delete accounts that have no Authenticator, both when the package is removed and when the phone is booted. - add the ability to register with the RegisteredServicesCache to be notified when the set of Authenticators
Merge commit '3ecd5f437580e49d80beecd29489d5fb1f7a7db0' into eclair-plus-aosp

* commit '3ecd5f437580e49d80beecd29489d5fb1f7a7db0':
  - Make the AccountManagerService delete accounts that
2009-09-17 15:55:53 -07:00
Android (Google) Code Review
972fac9a91 Merge change 25601 into eclair
* changes:
  Fix possible race condition when switching keyboards while there are pending messages.
2009-09-17 18:49:51 -04:00
Eric Fischer
52d200cd4a am ddbeed5d: Merge change 25571 into eclair
Merge commit 'ddbeed5d11f2ef0c286bbc9b5283ad0fab62ef5e' into eclair-plus-aosp

* commit 'ddbeed5d11f2ef0c286bbc9b5283ad0fab62ef5e':
  Import revised translations.  DO NOT MERGE
2009-09-17 15:09:07 -07:00
Android (Google) Code Review
2a8bf44aef Merge change 25571 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-09-17 18:03:26 -04:00
Sanjay Jeyakumar
0ca03e9757 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
b0804d4e81 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
2c154bea89 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
3106b15a7c 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
Jeff Sharkey
548dfb4059 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
Leon Scroggins
7911941c3a 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
Patrick Scott
3f2d354a0f 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
1147de42a2 Merge change 25338 into eclair
* changes:
  Remove the network connection logic from RequestQueue.
2009-09-17 15:25:52 -04:00
Dianne Hackborn
874ddb23f7 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
78898bb2a9 Merge change 25526 into eclair
* changes:
  Add API to retrieve memory used by running processes.
2009-09-17 15:11:22 -04:00
Satish Roddom
f176c8a954 am b9c107a3: Merge change 25534 into eclair
Merge commit 'b9c107a362d85deda61da3cfac594cc1de7b6294' into eclair-plus-aosp

* commit 'b9c107a362d85deda61da3cfac594cc1de7b6294':
  Message Reject notification shouldn't be shown in Emergency Calling Mode
2009-09-17 12:10:52 -07:00
Grace Kloba
ea1fa2e17a 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
Android (Google) Code Review
187cc0cd44 Merge change 25534 into eclair
* changes:
  Message Reject notification shouldn't be shown in Emergency Calling Mode
2009-09-17 15:03:27 -04:00
Android (Google) Code Review
44860cb6b9 Merge change 25524 into eclair
* changes:
  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.
2009-09-17 15:02:16 -04:00
Christian Gustafsson
0ae56bb7f8 am 8460be7a: Merge change 25535 into eclair
Merge commit '8460be7a57117d786adf2e1233ef02c4e96f0030' into eclair-plus-aosp

* commit '8460be7a57117d786adf2e1233ef02c4e96f0030':
  CDMA Check for network duplicate sms
2009-09-17 12:00:52 -07:00
Andreas Huber
f7af3d39e7 am 3065a3ca: Merge change 25528 into eclair
Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp

* commit '3065a3cad069b847165c99a38a251c072950d07f':
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
2009-09-17 12:00:45 -07:00
Android (Google) Code Review
45aa55cfd1 Merge change 25535 into eclair
* changes:
  CDMA Check for network duplicate sms
2009-09-17 14:53:45 -04:00
Android (Google) Code Review
d6783b6642 Merge change 25528 into eclair
* changes:
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
2009-09-17 14:46:45 -04:00
Mike Lockwood
57c2bba520 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
e68b17505f 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
fa564a52af 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
Jack Palevich
4908186950 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
2e8693aae3 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
e5e5fb94b7 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
c9486cf733 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
058777592d Add additional error checking, exit early if errors occur. 2009-09-17 10:59:23 -07:00
Android (Google) Code Review
b70aab591e Merge change 25519 into eclair
* changes:
  LocationManagerService: Take fix accuracy into account in proximity zone logic.
2009-09-17 13:58:20 -04:00
Android (Google) Code Review
41290b6bf0 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
82fd8849b0 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
bc6c5a7105 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
83d9dc5dcd Merge change 25502 into eclair
* changes:
  Fix typo
2009-09-17 13:17:55 -04:00
Android (Google) Code Review
a9c0ce0f71 Merge change 25503 into eclair
* changes:
  Don't crash if the cursor is null.
2009-09-17 13:07:04 -04:00
Andrei Popescu
527f3b1dc8 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
d6050dc23b 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
Nick Pelly
ad335fa500 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
fd3d03206f 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
f12c6d42d3 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
70e555abdf 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
d7501a31e5 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
Ben Murdoch
44b3e30fb5 am f8c90acd: Merge change 25319 into eclair
Merge commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc' into eclair-plus-aosp

* commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc':
  Only move to the next test in DRT after the test has completed AND the page has finished loading.
2009-09-17 08:47:53 -07:00
Karl Rosaen
b702558c29 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