Commit Graph

2491 Commits

Author SHA1 Message Date
Dave Sparks
9f1234e460 resolved conflicts for merge of 04c7d0f8 to master 2009-07-08 17:26:05 -07:00
Android (Google) Code Review
47a97daf3b Merge change 6525 into donut
* changes:
  Add timestamps to video frames to improve A/V sync. Bug 1927069.
2009-07-08 16:40:12 -07:00
Dave Sparks
f72d640b7c Add timestamps to video frames to improve A/V sync.
Bug 1927069.
2009-07-08 15:59:25 -07:00
Mitsuru Oshima
9e76a23f59 am 1ecf5d28: Re-implementation of large screen support using window manager. * added background filler surface to fill the outer rim. Using the same layer as dim surface because they never co-exists (in the same window) * clean up the obsolete code in Compatibilt
Merge commit '1ecf5d28817f0a051e77488380dcd5bc622ea169'

* commit '1ecf5d28817f0a051e77488380dcd5bc622ea169':
  Re-implementation of large screen support using window manager.
2009-07-08 15:59:16 -07:00
Android (Google) Code Review
022c64a9ef Merge change 6092
* changes:
  Remove duplicate code in Sim/Ruim card, handle IccCardStatus.
2009-07-08 15:22:56 -07:00
Android (Google) Code Review
877b1750ec am 7761920b: Merge change 6507 into donut
Merge commit '7761920b2a2efc76d08c63d5be1b3ce829746e4b'

* commit '7761920b2a2efc76d08c63d5be1b3ce829746e4b':
  Remove unused definitions for default language in TextToSpeech as
2009-07-08 14:45:16 -07:00
Romain Guy
da3f6c71bc am 6de4aed1: Fixes #1933428. Call onPrepareDialog() on managed dialogs after their onCreate() is finished.
Merge commit '6de4aed1c67263269f83f579ec5b06263d173ef3'

* commit '6de4aed1c67263269f83f579ec5b06263d173ef3':
  Fixes #1933428. Call onPrepareDialog() on managed dialogs after their onCreate() is finished.
2009-07-08 14:45:11 -07:00
Android (Google) Code Review
820fe3c750 Merge change 6507 into donut
* changes:
  Remove unused definitions for default language in TextToSpeech as the default language is determined by the current Locale, not a hardcoded value. Add a value for the default TTS engine to use.
2009-07-08 14:43:40 -07:00
Android (Google) Code Review
2fa117395e am 1bd3e0fb: Merge change 6504 into donut
Merge commit '1bd3e0fb7e87f1daa983d06bc396393a788181b0'

* commit '1bd3e0fb7e87f1daa983d06bc396393a788181b0':
  Don't invoke the transport if doBackup supplied no data
2009-07-08 13:55:58 -07:00
Android (Google) Code Review
5712950dd9 Merge change 6504 into donut
* changes:
  Don't invoke the transport if doBackup supplied no data
2009-07-08 13:54:07 -07:00
Android (Google) Code Review
b53f06a85b am 91b0a701: Merge change 6284 into donut
Merge commit '91b0a7013e4b6d170087cb4c9a3c35b787f92a6b'

* commit '91b0a7013e4b6d170087cb4c9a3c35b787f92a6b':
  Run search UI on its own thread.
2009-07-08 13:52:26 -07:00
Android (Google) Code Review
6047853d83 am f9c228a5: Merge change 6487 into donut
Merge commit 'f9c228a51fba54e80826fb6aa5d53f43a2e86042'

* commit 'f9c228a51fba54e80826fb6aa5d53f43a2e86042':
  Removed reference to awt jar from platform.xml.
2009-07-08 13:52:15 -07:00
Android (Google) Code Review
51dc38792c Merge change 6284 into donut
* changes:
  Run search UI on its own thread.
2009-07-08 13:28:29 -07:00
Android (Google) Code Review
e7dfd65152 Merge change 6487 into donut
* changes:
  Removed reference to awt jar from platform.xml.
2009-07-08 12:24:48 -07:00
Android (Google) Code Review
812bd046fe Merge change 5334
* changes:
  Added groups constants and visibility flags.
2009-07-08 12:23:45 -07:00
Android (Google) Code Review
fdab0fb008 am bfc29f67: Merge change 6485 into donut
Merge commit 'bfc29f67db73ac1d21188d1ec942757dc95ecc92'

* commit 'bfc29f67db73ac1d21188d1ec942757dc95ecc92':
  Cleanup Toast.java.
2009-07-08 12:04:05 -07:00
Android (Google) Code Review
bb6231530e Merge change 6485 into donut
* changes:
  Cleanup Toast.java.
2009-07-08 11:59:49 -07:00
Android (Google) Code Review
8e02565bc8 am 6b532800: Merge change 6478 into donut
Merge commit '6b5328006ff9e844713eb26b40621d72bee0bdd1'

* commit '6b5328006ff9e844713eb26b40621d72bee0bdd1':
  Fix ShapeDrawable.inflateTag() to accept proper dimension specs for padding
2009-07-08 10:45:52 -07:00
Android (Google) Code Review
7b3f4e4552 Merge change 6478 into donut
* changes:
  Fix ShapeDrawable.inflateTag() to accept proper dimension specs for padding
2009-07-08 10:43:44 -07:00
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