Commit Graph

4071 Commits

Author SHA1 Message Date
Eric Fischer
d0f0cf28a1 am bfa1d083: Merge change 22962 into eclair
Merge commit 'bfa1d083aac92a8fc315e18a381287108b138baf' into eclair-plus-aosp

* commit 'bfa1d083aac92a8fc315e18a381287108b138baf':
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:04:06 -07:00
Android (Google) Code Review
96300f3b76 Merge change 22962 into eclair
* changes:
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:01:59 -07:00
Andreas Huber
24bea193c8 am c1dccce7: Merge change 22986 into eclair
Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp

* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
  Squashed commit of the following:
2009-08-27 15:26:09 -07:00
Dianne Hackborn
07d4d644f7 am d6ac7c73: Merge change 22975 into eclair
Merge commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5' into eclair-plus-aosp

* commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5':
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:26:05 -07:00
Android (Google) Code Review
7253194d34 Merge change 22986 into eclair
* changes:
  Squashed commit of the following:
2009-08-27 15:24:35 -07:00
Android (Google) Code Review
0ea2635b09 Merge change 22975 into eclair
* changes:
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:10:27 -07:00
Andreas Huber
78b2e0f8e5 am 5352e237: Merge change 22968 into eclair
Merge commit '5352e237cad365f39c87aaeda3822c891c7ca474' into eclair-plus-aosp

* commit '5352e237cad365f39c87aaeda3822c891c7ca474':
  Fix a typo.
2009-08-27 14:55:15 -07:00
Android (Google) Code Review
484690abcf Merge change 22968 into eclair
* changes:
  Fix a typo.
2009-08-27 14:54:13 -07:00
Dianne Hackborn
95f9b74e16 am fa526029: am f734e027: Merge change 22939 into donut
Merge commit 'fa5260290f3c19988c292f21845a948374c3c31d' into eclair-plus-aosp

* commit 'fa5260290f3c19988c292f21845a948374c3c31d':
  Final Donut API list.
2009-08-27 14:42:30 -07:00
Dianne Hackborn
8611d45711 am f734e027: Merge change 22939 into donut
Merge commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8' into eclair

* commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8':
  Final Donut API list.
2009-08-27 14:40:51 -07:00
Mike Lockwood
56c58784db am 6391830d: Merge change 22958 into eclair
Merge commit '6391830d103ccb19465c69660065c22c2711dcfd' into eclair-plus-aosp

* commit '6391830d103ccb19465c69660065c22c2711dcfd':
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:32:55 -07:00
Android (Google) Code Review
78fdbb2974 Merge change 22958 into eclair
* changes:
  Don't activate keyguard if screen is turned off while proximity sensor is active.
2009-08-27 14:31:06 -07:00
Mike Lockwood
183c2d2557 am 18ad9f65: Only allow system code to call LocationManager.sendNiResponse()
Merge commit '18ad9f657bda79069233c0b8e1476888ffd894d4' into eclair-plus-aosp

* commit '18ad9f657bda79069233c0b8e1476888ffd894d4':
  Only allow system code to call LocationManager.sendNiResponse()
2009-08-27 14:24:43 -07:00
Danke Xie
8dacd25d55 am 22d1f9fb: gps: Network initiated SUPL
Merge commit '22d1f9fb23015471de6af1a70e40fb5c82ecb665' into eclair-plus-aosp

* commit '22d1f9fb23015471de6af1a70e40fb5c82ecb665':
  gps: Network initiated SUPL
2009-08-27 14:20:55 -07:00
Jesse Wilson
94b1ce3c35 am 0409cde3: Updating synchronized to match x-net changes
Merge commit '0409cde3601131caf14c88d132c65d74774bbd79' into eclair-plus-aosp

* commit '0409cde3601131caf14c88d132c65d74774bbd79':
  Updating synchronized to match x-net changes
2009-08-27 13:34:37 -07:00
Dianne Hackborn
67747379e6 am 1e0f7627: Merge change 22673 into eclair
Merge commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56' into eclair-plus-aosp

* commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56':
  Make SINGLE_TOP work with CLEAR_TOP.
2009-08-27 13:12:31 -07:00
Andreas Huber
9e15a523b7 am e18d4d01: Merge change 22938 into eclair
Merge commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851' into eclair-plus-aosp

* commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851':
  Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
2009-08-27 13:12:28 -07:00
Android (Google) Code Review
8cdbad8edd Merge change 22673 into eclair
* changes:
  Make SINGLE_TOP work with CLEAR_TOP.
2009-08-27 13:10:54 -07:00
Android (Google) Code Review
8d4bf22dfd Merge change 22938 into eclair
* changes:
  Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
2009-08-27 13:04:56 -07:00
Jim Miller
a31b51f534 am 69d5e476: Merge change 22722 into eclair
Merge commit '69d5e476db72cdc85938da7ccc2215c46901b4d0' into eclair-plus-aosp

* commit '69d5e476db72cdc85938da7ccc2215c46901b4d0':
  Integrate CDMA provisioning into SetupWizard
2009-08-27 13:03:39 -07:00
Android (Google) Code Review
da49d54203 Merge change 22722 into eclair
* changes:
  Integrate CDMA provisioning into SetupWizard
2009-08-27 13:01:54 -07:00
Dianne Hackborn
b6cb596891 am b3b1ccfe: Merge change 22950 into eclair
Merge commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352' into eclair-plus-aosp

* commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352':
  Change these string constants back to match donut.
2009-08-27 12:59:03 -07:00
Android (Google) Code Review
6286808e4d Merge change 22939 into donut
* changes:
  Final Donut API list.
2009-08-27 12:57:09 -07:00
Android (Google) Code Review
edb04560d6 Merge change 22950 into eclair
* changes:
  Change these string constants back to match donut.
2009-08-27 12:56:40 -07:00
Suchi Amalapurapu
ca1a75ef10 am 580a2921: Merge change 22945 into eclair
Merge commit '580a2921083f95e9ffd905bc31f838d683f667b4' into eclair-plus-aosp

* commit '580a2921083f95e9ffd905bc31f838d683f667b4':
  Add a null check in PackageParser
2009-08-27 12:40:11 -07:00
Android (Google) Code Review
13ec63c545 Merge change 22945 into eclair
* changes:
  Add a null check in PackageParser
2009-08-27 12:37:47 -07:00
Dianne Hackborn
c6fc290537 am aa0a3b09: Merge change 22944 into eclair
Merge commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339' into eclair-plus-aosp

* commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339':
  Various tweaks to try to improve low memory behavior.
2009-08-27 12:29:45 -07:00
Android (Google) Code Review
3f9f95b544 Merge change 22944 into eclair
* changes:
  resolved conflicts for merge of 301b97ac to eclair
2009-08-27 12:27:51 -07:00
Dianne Hackborn
a5522f4804 resolved conflicts for merge of 301b97ac to eclair
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48
2009-08-27 12:26:44 -07:00
Eric Laurent
f53c65c53a am bc86bda4: Merge change 22897 into eclair
Merge commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd' into eclair-plus-aosp

* commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd':
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:38:29 -07:00
Dmitri Plotnikov
c9552374f9 am 763ea918: Merge change 22919 into eclair
Merge commit '763ea918fc7954eab422dc3baf578a2368737637' into eclair-plus-aosp

* commit '763ea918fc7954eab422dc3baf578a2368737637':
  Removing "summary"-style URIs.
2009-08-27 11:38:26 -07:00
Android (Google) Code Review
9bebdff816 Merge change 22897 into eclair
* changes:
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:37:35 -07:00
Android (Google) Code Review
9fe8b25461 Merge change 22919 into eclair
* changes:
  Removing "summary"-style URIs.
2009-08-27 11:36:36 -07:00
Mike Lockwood
bd2a700dab am 25b9cec8: Merge change 22692 into eclair
Merge commit '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp

* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
  PowerManagerService: Disallow all user activity when in proximity wake lock.
2009-08-27 11:28:53 -07:00
Android (Google) Code Review
5feecadf47 Merge change 22692 into eclair
* changes:
  PowerManagerService: Disallow all user activity when in proximity wake lock.
2009-08-27 11:26:44 -07:00
Andreas Huber
3bb972f4fb am e0daf804: Merge change 22921 into eclair
Merge commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519' into eclair-plus-aosp

* commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519':
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read
2009-08-27 11:21:02 -07:00
Android (Google) Code Review
7fd05d35c7 Merge change 22921 into eclair
* changes:
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read
2009-08-27 11:18:36 -07:00
Jaikumar Ganesh
25bc89576b am 6ff90cf2: Merge change 22870 into eclair
Merge commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7' into eclair-plus-aosp

* commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7':
  Set Routing to A2DP only when state is Connected.
2009-08-27 11:10:16 -07:00
Android (Google) Code Review
0fb7b61024 Merge change 22870 into eclair
* changes:
  Set Routing to A2DP only when state is Connected.
2009-08-27 11:08:55 -07:00
Ye Wen
8e5c7e7653 am 4d5b4225: Merge change 22795 into eclair
Merge commit '4d5b4225e492f3de543efa195204f38d03a6721a' into eclair-plus-aosp

* commit '4d5b4225e492f3de543efa195204f38d03a6721a':
  The Gservices settings for pruning messages/chats.
2009-08-27 11:00:09 -07:00
Android (Google) Code Review
5276762c21 Merge change 22795 into eclair
* changes:
  The Gservices settings for pruning messages/chats.
2009-08-27 10:58:25 -07:00
Romain Guy
c89d821b20 am ed48c808: Merge change 22920 into eclair
Merge commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4' into eclair-plus-aosp

* commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4':
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:45:38 -07:00
Android (Google) Code Review
de51d11763 Merge change 22920 into eclair
* changes:
  Change fade to use a gradient from opaque color to transparent color.
2009-08-27 10:43:18 -07:00
Andreas Huber
8d8d202b62 am 650b872c: Merge change 22830 into eclair
Merge commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0' into eclair-plus-aosp

* commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0':
  Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
2009-08-27 10:12:10 -07:00
Android (Google) Code Review
2085f96b56 Merge change 22830 into eclair
* changes:
  Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
2009-08-27 10:10:07 -07:00
Mike Lockwood
276318c3fc am 49c22570: am 7566c1de: LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '49c22570bb8717bb678dbd8bae6692bb585370fc' into eclair-plus-aosp

* commit '49c22570bb8717bb678dbd8bae6692bb585370fc':
  LocationManager: Fix problem replacing GPS and network providers with a mock provider.
2009-08-27 09:28:11 -07:00
Mike Lockwood
947b55680f am 7566c1de: LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '7566c1debebe072af76411e11d96810fd1409482' into eclair

* commit '7566c1debebe072af76411e11d96810fd1409482':
  LocationManager: Fix problem replacing GPS and network providers with a mock provider.
2009-08-27 09:25:36 -07:00
Steve Block
bc61d3e0e3 am 09b0ca1c: Sets default value of \'enableGeolocation\' to true. This allows WebKit\'s DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser\'s default anyway.
Merge commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f' into eclair-plus-aosp

* commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f':
  Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
2009-08-27 08:50:19 -07:00
Steve Block
5337d3c5ca am 7537e3dc: Merge change 22453 into eclair
Merge commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e' into eclair-plus-aosp

* commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e':
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:45:46 -07:00
Android (Google) Code Review
5502899878 Merge change 22453 into eclair
* changes:
  Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
2009-08-27 07:43:36 -07:00