Commit Graph

2472 Commits

Author SHA1 Message Date
Android (Google) Code Review
d00047cc80 am 831ea07d: Merge change 6107 into donut
Merge commit '831ea07dabf6331b7a410971eb85b2ae72239b50'

* commit '831ea07dabf6331b7a410971eb85b2ae72239b50':
  Removed system/framework/android.awt.jar.
2009-07-08 10:12:33 -07:00
Android (Google) Code Review
32bcefa9d0 Merge change 6107 into donut
* changes:
  Removed system/framework/android.awt.jar.
2009-07-08 10:11:00 -07:00
Android (Google) Code Review
48189dcbc9 am e9ac96f7: Merge change 6454 into donut
Merge commit 'e9ac96f76d513d2cee50dfea7d70b14669643ba9'

* commit 'e9ac96f76d513d2cee50dfea7d70b14669643ba9':
  Fix issue 1967295: Add a method to request reloading of audio settings by AudioService.
2009-07-08 09:25:12 -07:00
Android (Google) Code Review
ed8bcd0482 Merge change 6454 into donut
* changes:
  Fix issue 1967295: Add a method to request reloading of audio settings by AudioService.
2009-07-08 09:23:26 -07:00
Satish Sampath
678f63e98d am d21572cd: NEW_API: Expose autoUrlDetect searchable attribute.
Merge commit 'd21572cd446e56efe94689324107927ac2bffd2a'

* commit 'd21572cd446e56efe94689324107927ac2bffd2a':
  NEW_API: Expose autoUrlDetect searchable attribute.
2009-07-08 09:17:21 -07:00
Android (Google) Code Review
2a7711fdd4 Merge change 6186
* changes:
  Squashed commit of the following: Merged with batch, change to FORMAT_BATCH commit 4a6f359119771b7ac785aafcba757d049c82e490 Merge: e41dea4... 10063c1... Author: fmantek <fmantek@google.com> Date:   Fri Jul 3 14:58:11 2009 +0200
2009-07-08 04:42:34 -07:00
-b master
27247ef4a0 resolved conflicts for merge of d6fe243c to master 2009-07-07 22:55:28 -07:00
Android (Google) Code Review
381396d276 Merge change 6437 into donut
* changes:
  Backup / Restore locale preference.
2009-07-07 18:59:28 -07:00
Android (Google) Code Review
ab3707f2fb am a83bef59: Merge change 6396 into donut
Merge commit 'a83bef597430e9336566ca38330cc0f4e793abe1'

* commit 'a83bef597430e9336566ca38330cc0f4e793abe1':
  Add unit test for NeighboringCellInfo.
2009-07-07 18:10:38 -07:00
Android (Google) Code Review
67ade09002 Merge change 6396 into donut
* changes:
  Add unit test for NeighboringCellInfo.
2009-07-07 18:09:21 -07:00
Android (Google) Code Review
04afd45ee8 am 108fd1c0: Merge change 6435 into donut
Merge commit '108fd1c08a1a679886c987e1f62a9ba6be962235'

* commit '108fd1c08a1a679886c987e1f62a9ba6be962235':
  Add new textColorPrimaryInverseDisableOnly color to resources.
2009-07-07 17:51:16 -07:00
Android (Google) Code Review
551f1fa34f Merge change 6435 into donut
* changes:
  Add new textColorPrimaryInverseDisableOnly color to resources.
2009-07-07 17:49:13 -07:00
Android (Google) Code Review
a6ff39614a Merge change 6421
* changes:
  Make opengl loader use an absolute path.
2009-07-07 17:12:02 -07:00
Android (Google) Code Review
5cee02162a am 72fe2425: Merge change 6414 into donut
Merge commit '72fe24259537d644102c717867a8c291d122fd06'

* commit '72fe24259537d644102c717867a8c291d122fd06':
  Optimize storing of cached TTS parameters. Initialize the cached
2009-07-07 16:51:10 -07:00
Android (Google) Code Review
269451ede7 Merge change 6414 into donut
* changes:
  Optimize storing of cached TTS parameters. Initialize the cached language settings with the current Locale.
2009-07-07 16:49:41 -07:00
Android (Google) Code Review
bec8ea7bd1 am e9289dc6: Merge change 6422 into donut
Merge commit 'e9289dc63e1f57e26355537709df1538ecfd08b1'

* commit 'e9289dc63e1f57e26355537709df1538ecfd08b1':
  Removing the ttsSynthDoneCallback logging.
2009-07-07 16:45:36 -07:00
Android (Google) Code Review
ef51792ebb Merge change 6422 into donut
* changes:
  Removing the ttsSynthDoneCallback logging.
2009-07-07 16:44:18 -07:00
Android (Google) Code Review
90f99a6c2f am 7b68a408: Merge change 6426 into donut
Merge commit '7b68a408e9261a170c5ab9ae7ef999cc1d92ae0e'

* commit '7b68a408e9261a170c5ab9ae7ef999cc1d92ae0e':
  Remove a lot of debug-log verbosity
2009-07-07 16:38:59 -07:00
Android (Google) Code Review
8e52ce83cb Merge change 6426 into donut
* changes:
  Remove a lot of debug-log verbosity
2009-07-07 16:37:29 -07:00
Android (Google) Code Review
4b47e209c1 Merge change 5873
* changes:
  Added URI for querying event instances by day in addition to by time-millis
2009-07-07 16:24:51 -07:00
Marco Nelissen
fc865658b4 Make opengl loader use an absolute path. 2009-07-07 16:18:18 -07:00
Android (Google) Code Review
7d96e3dd06 am 86ea435a: Merge change 6407 into donut
Merge commit '86ea435a40c5ffa9a03dc0ac9536378a33c9e5b4'

* commit '86ea435a40c5ffa9a03dc0ac9536378a33c9e5b4':
  Cleaning up logs.
2009-07-07 15:39:03 -07:00
Android (Google) Code Review
afc8ac1363 am 62edc960: Merge change 6383 into donut
Merge commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44'

* commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44':
  Cleanup connection when airplane mode is entered.
2009-07-07 15:38:59 -07:00
Android (Google) Code Review
5b4687e99a Merge change 6407 into donut
* changes:
  Cleaning up logs. Initializing SpeechItem.mText to "" instead of null to prevent a null from accidentally being used when it is a non-text utterance.
2009-07-07 15:37:37 -07:00
Android (Google) Code Review
72f466c4d3 Merge change 6383 into donut
* changes:
  Cleanup connection when airplane mode is entered.
2009-07-07 15:22:15 -07:00
Android (Google) Code Review
ab97a1c398 am 7bf9f930: Merge change 6415 into donut
Merge commit '7bf9f930d986335cd24dc15e2ee588b851f194d4'

* commit '7bf9f930d986335cd24dc15e2ee588b851f194d4':
  Fixes #1748951. Calling setListSelection() explicitely should cancel the selection hidden flag.
2009-07-07 15:21:16 -07:00
Android (Google) Code Review
5c3d39c866 Merge change 6415 into donut
* changes:
  Fixes #1748951. Calling setListSelection() explicitely should cancel the selection hidden flag.
2009-07-07 15:19:14 -07:00
Christopher Tate
d2ba65b2cd am a7de3845: Only write to the pending-backup journal when necessary
Merge commit 'a7de3845507b7bf57a2c7b26fb08f05b193697d6'

* commit 'a7de3845507b7bf57a2c7b26fb08f05b193697d6':
  Only write to the pending-backup journal when necessary
2009-07-07 14:53:56 -07:00
Android (Google) Code Review
847ebb4f76 Merge change 6392
* changes:
  Add the condition check of ERI for CDMA roaming.
2009-07-07 14:50:04 -07:00
Android (Google) Code Review
124ca05515 am c4cf22e8: Merge change 6403 into donut
Merge commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1'

* commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1':
  Fix the metadata-available test during restore
2009-07-07 14:31:19 -07:00
Android (Google) Code Review
4fc0ba430e Merge change 6403 into donut
* changes:
  Fix the metadata-available test during restore
2009-07-07 14:29:47 -07:00
Android (Google) Code Review
1c9354e6aa Merge change 6399
* changes:
  Obex library cleanup, third pass
2009-07-07 14:08:43 -07:00
Android (Google) Code Review
ec0cb1740c am 7fdd661f: Merge change 6377 into donut
Merge commit '7fdd661f12f73148517e5e011efc206cc7259fbc'

* commit '7fdd661f12f73148517e5e011efc206cc7259fbc':
  Propagating error codes to TextToSpeech.java
2009-07-07 13:48:29 -07:00
Android (Google) Code Review
5fcde6c496 Merge change 6377 into donut
* changes:
  Propagating error codes to TextToSpeech.java
2009-07-07 13:46:17 -07:00
Jean-Baptiste Queru
aa32de6bce Merge a bunch of cherry-picked changes from the open-source tree. 2009-07-07 13:33:47 -07:00
Android (Google) Code Review
d7fac60c4f Merge change 6382
* changes:
  add a virtual destructor to region_rasterizer, to be on the safe side
2009-07-07 12:43:06 -07:00
Android (Google) Code Review
bd175dfe00 Merge change 6320
* changes:
  Add method to read events from a file.  Remove unused method.  Fixed after review.
2009-07-07 12:37:27 -07:00
Mathias Agopian
e7c4c28d0f add a virtual destructor to region_rasterizer, to be on the safe side 2009-07-07 12:29:17 -07:00
Android (Google) Code Review
4f9039002a am a5188a09: Merge change 6367 into donut
Merge commit 'a5188a09bd20c376b4f0645b0df4c52f8e114e21'

* commit 'a5188a09bd20c376b4f0645b0df4c52f8e114e21':
  Add virtual destructor.
2009-07-07 12:14:01 -07:00
Android (Google) Code Review
ed65428df2 Merge change 6367 into donut
* changes:
  Add virtual destructor.
2009-07-07 12:12:12 -07:00
Android (Google) Code Review
f770f4757b am fdc3d110: Merge change 6379 into donut
Merge commit 'fdc3d110516a6d2f62e68d2f76c4aeace580de40'

* commit 'fdc3d110516a6d2f62e68d2f76c4aeace580de40':
  Update RatingBar's assets in indicator mode.
2009-07-07 11:57:40 -07:00
Android (Google) Code Review
4666832006 Merge change 6379 into donut
* changes:
  Update RatingBar's assets in indicator mode.
2009-07-07 11:56:43 -07:00
Android (Google) Code Review
37ecefbd5f am 2c5a3aeb: Merge change 6326 into donut
Merge commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1'

* commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1':
  BackupManager wrapper class improvements
2009-07-07 11:53:23 -07:00
Android (Google) Code Review
8b2b7b14a5 Merge change 6326 into donut
* changes:
  BackupManager wrapper class improvements
2009-07-07 11:52:01 -07:00
Cynthia Wong
c888a0b020 am 04f0b05e: Add a Gservices setting for how many times we should retry before discarding an uphill operation
Merge commit '04f0b05ea04a4a13d6a15b36eaa27b2ec364f313'

* commit '04f0b05ea04a4a13d6a15b36eaa27b2ec364f313':
  Add a Gservices setting for how many times we should retry before discarding an uphill operation
2009-07-07 11:46:05 -07:00
Android (Google) Code Review
b25c5a23c8 am 790a604b: Merge change 6372 into donut
Merge commit '790a604b9c32647711599710e21f0f00eb3d839c'

* commit '790a604b9c32647711599710e21f0f00eb3d839c':
  Fixes #1963217. Increases the invalidate region in compatibility mode.
2009-07-07 11:25:30 -07:00
Android (Google) Code Review
d0e3530737 am c1c44a56: Merge change 6363 into donut
Merge commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c'

* commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c':
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks
2009-07-07 11:25:26 -07:00
Android (Google) Code Review
9490823092 Merge change 6372 into donut
* changes:
  Fixes #1963217. Increases the invalidate region in compatibility mode.
2009-07-07 11:23:44 -07:00
Marco Nelissen
1c0f5382ed Add virtual destructor. 2009-07-07 11:03:13 -07:00
Android (Google) Code Review
750a261edb Merge change 6363 into donut
* changes:
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks
2009-07-07 11:02:04 -07:00