drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,817 Commits 1 Branch 0 Tags
Commit Graph

435 Commits

Author SHA1 Message Date
Charles Chen
78c9d0d2c5 Adding Utterance ID to the TtsService. 2009-07-13 17:46:19 -07:00
Android (Google) Code Review
1dcdce6db7 am c353268c: Merge change 6968 into donut 
Merge commit 'c353268c20a8ea425ac9f1e328684855cfc805e0'

* commit 'c353268c20a8ea425ac9f1e328684855cfc805e0':
  Import new translations
 2009-07-13 16:32:17 -07:00
Android (Google) Code Review
c353268c20 Merge change 6968 into donut 
* changes:
  Import new translations
 2009-07-13 16:30:16 -07:00
Eric Fischer
0560209bcd Import new translations 2009-07-13 15:42:14 -07:00
Android (Google) Code Review
3cdff8133b am 334b861e: Merge change 6925 into donut 
Merge commit '334b861e3339bc7189372f790d0c0e2043d160a3'

* commit '334b861e3339bc7189372f790d0c0e2043d160a3':
  Propagate optional audio stream type to the creation of the audio resources
 2009-07-13 13:37:56 -07:00
Jean-Michel Trivi
9440bce855 Propagate optional audio stream type to the creation of the audio resources 
to enable the playback of TTS content on various stream types.
 2009-07-13 11:34:30 -07:00
Android (Google) Code Review
c8050f8dd7 am 6cdc4f9c: Merge change 6880 into donut 
Merge commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3'

* commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3':
  Fixing TTS breakage.
 2009-07-13 09:27:44 -07:00
Android (Google) Code Review
6cdc4f9c00 Merge change 6880 into donut 
* changes:
  Fixing TTS breakage.
 2009-07-13 09:25:20 -07:00
Hung-ying Tyan
99b490969b am c22ce6a7: Remove host IP from related VPN classes. 
Merge commit 'c22ce6a738bbd757c71f8778defb015ea81ab33c'

* commit 'c22ce6a738bbd757c71f8778defb015ea81ab33c':
  Remove host IP from related VPN classes.
 2009-07-13 04:35:29 -07:00
Hung-ying Tyan
c22ce6a738 Remove host IP from related VPN classes. 
...since the daemon (racoon) gets the information by itself.
 2009-07-13 19:31:08 +08:00
Android (Google) Code Review
4005648ec7 am 575eb928: Merge change 6883 into donut 
Merge commit '575eb92885c150ccbfa257c9a6fdcb19a04baf0c'

* commit '575eb92885c150ccbfa257c9a6fdcb19a04baf0c':
  Add error code in vpn connectivity broadcast.
 2009-07-12 23:43:21 -07:00
Hung-ying Tyan
df1aa3359c Add error code in vpn connectivity broadcast. 
* Changes
  + Add VpnConnectingError.java.
  + Broadcast the error returned by daemons.
  + Add error codes to VpnManager.java.
  + Add error code to VpnManager.broadcastConnectivity().
  Patch Set 4:
  + Replace VPN_UP with VPN_STATUS in response to ip-up-vpn changes.
  + Make VpnServiceBinder a foreground service so that it won't be
    interrupted by the system.
  Patch Set 5:
  + Remove the support of returning 0 from daemon and restart socket in
    AndroidServiceProxy.
 2009-07-13 13:11:36 +08:00
Charles Chen
630a8de44f Fixing TTS breakage. 2009-07-10 20:58:15 -07:00
Jean-Michel Trivi
89fe27366b am d48ca22b: Use the TTS queue constants in the TTS service as defined in the TextToSpeech class. 
Merge commit 'd48ca22b9fcea38b112aedb4126f3d030594af47'

* commit 'd48ca22b9fcea38b112aedb4126f3d030594af47':
  Use the TTS queue constants in the TTS service as defined in the
 2009-07-10 11:20:27 -07:00
Jean-Michel Trivi
d48ca22b9f Use the TTS queue constants in the TTS service as defined in the 
TextToSpeech class.
 2009-07-10 10:04:37 -07:00
Android (Google) Code Review
bdafc9b65f am d2cad295: Merge change 6734 into donut 
Merge commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71'

* commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71':
  Adding tagging to utterances to track which app said what.
 2009-07-10 09:57:38 -07:00
Charles Chen
a9c5e4bf26 Adding tagging to utterances to track which app said what. 2009-07-10 09:43:03 -07:00
Android (Google) Code Review
c6f81c6716 am d1e5e3ff: Merge change 6639 into donut 
Merge commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368'

* commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368':
  Restore audio settings and wifi.
 2009-07-09 12:53:41 -07:00
Android (Google) Code Review
b63e4ea685 am 4117fd09: Merge change 6641 into donut 
Merge commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d'

* commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d':
  Unbreaking the build.
 2009-07-09 12:53:38 -07:00
Android (Google) Code Review
8b7bc669ce am b45451f6: Merge change 6583 into donut 
Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0'

* commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0':
  Adding a lock to stop so that stop will stop utterances
 2009-07-09 12:50:30 -07:00
Android (Google) Code Review
ad921cb4a4 am c52d55c5: Merge change 6608 into donut 
Merge commit 'c52d55c5404a09a3845a322f50577fc4c125a86d'

* commit 'c52d55c5404a09a3845a322f50577fc4c125a86d':
  Move the watchdog timer to a separate thread...
 2009-07-09 12:49:29 -07:00
Android (Google) Code Review
d1e5e3ffc2 Merge change 6639 into donut 
* changes:
  Restore audio settings and wifi.
 2009-07-09 12:07:45 -07:00
Amith Yamasani
d158214511 Restore audio settings and wifi. 
Optimize backups by writing an entity only if the checksum of the data has changed.
Call into the hidden AudioService API to apply changed audio settings.
After restoring wifi data, make sure that the permissions and ownership are set
properly for the supplicant process to access it.
Locale isn't restoring properly - TODO added.
 2009-07-09 12:01:25 -07:00
Charles Chen
be84e4134d Unbreaking the build. 2009-07-09 11:54:50 -07:00
Android (Google) Code Review
b45451f6da Merge change 6583 into donut 
* changes:
  Adding a lock to stop so that stop will stop utterances that are just starting up.
 2009-07-09 11:05:18 -07:00
Charles Chen
0a3d8744fe Adding a lock to stop so that stop will stop utterances 
that are just starting up.
 2009-07-09 09:51:33 -07:00
Hung-ying Tyan
296a182dea Move the watchdog timer to a separate thread... 
so that it won't block the UI thread.
 2009-07-09 14:43:55 +08:00
-b master
2eac99ccbc resolved conflicts for merge of d6fe243c to master 2009-07-07 22:55:28 -07:00
Android (Google) Code Review
d6fe243c1c Merge change 6437 into donut 
* changes:
  Backup / Restore locale preference.
 2009-07-07 18:59:28 -07:00
Amith Yamasani
8823c0a8c6 Backup / Restore locale preference. 
Also backup development settings MOCK_LOCATION and USB_DEBUGGING.
Backup and restore more of the Audio settings. Won't work yet without a reboot.
Disable Wifi supplicant restore temporarily. It seems to be disabling Wifi due to
permissions problems.
Don't restore Ringtones.
 2009-07-07 18:42:46 -07:00
Android (Google) Code Review
b4f7ce46e8 am e9289dc6: Merge change 6422 into donut 
Merge commit 'e9289dc63e1f57e26355537709df1538ecfd08b1'

* commit 'e9289dc63e1f57e26355537709df1538ecfd08b1':
  Removing the ttsSynthDoneCallback logging.
 2009-07-07 16:45:36 -07:00
Charles Chen
2a8a2d76f1 Removing the ttsSynthDoneCallback logging. 2009-07-07 16:24:02 -07:00
Android (Google) Code Review
e68d572630 am 86ea435a: Merge change 6407 into donut 
Merge commit '86ea435a40c5ffa9a03dc0ac9536378a33c9e5b4'

* commit '86ea435a40c5ffa9a03dc0ac9536378a33c9e5b4':
  Cleaning up logs.
 2009-07-07 15:39:03 -07:00
Charles Chen
b02ced7e45 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 14:57:16 -07:00
Android (Google) Code Review
0f653aeeca am b61479ae: Merge change 6314 into donut 
Merge commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193'

* commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193':
  Use the current Locale as the default language when TTS settings are not
 2009-07-07 10:37:17 -07:00
Android (Google) Code Review
b61479ae86 Merge change 6314 into donut 
* changes:
  Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine.
 2009-07-07 10:35:40 -07:00
Jean-Michel Trivi
d478cf09df Use the current Locale as the default language when TTS settings are not 
found, rather than a hardcoded value stored in TextToSpeech.Engine.
 2009-07-06 18:02:08 -07:00
-b master
f6a34dd6ab resolved conflicts for merge of b7195159 to master 2009-07-06 17:44:41 -07:00
Android (Google) Code Review
b71951591d Merge change 6287 into donut 
* changes:
  Restore GPS state and ringer/vibrate toggles.
 2009-07-06 17:32:09 -07:00
Amith Yamasani
70c874ba20 Restore GPS state and ringer/vibrate toggles. 
Inform backup manager when sync flags change. Set ringer/vibrate mode.
 2009-07-06 17:18:46 -07:00
Android (Google) Code Review
4fad469b65 am 453dd50e: Merge change 6307 into donut 
Merge commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'

* commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
  Fixes a compatibility issue with users that have the old TTS
 2009-07-06 16:29:05 -07:00
Charles Chen
52ae06521a Fixes a compatibility issue with users that have the old TTS 
installed already.
 2009-07-06 16:10:32 -07:00
Android (Google) Code Review
d719890cab Merge change 6285 
* changes:
  Make backup agent run in the system process as well.
 2009-07-06 14:48:43 -07:00
Amith Yamasani
344bf682c9 Make backup agent run in the system process as well. 2009-07-06 14:47:30 -07:00
Android (Google) Code Review
2960975f39 am da93c26a: Merge change 6271 into donut 
Merge commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50'

* commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50':
  Propagating the error codes through the TtsService
 2009-07-06 14:45:20 -07:00
Amith Yamasani
47873e5526 Backup Wifi supplicant data. 
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
 2009-07-06 14:28:06 -07:00
Charles Chen
a3f89295ad Propagating the error codes through the TtsService 2009-07-06 14:14:52 -07:00
-b master
501eec92f9 Revert "hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again" 
This reverts commit f8e3ba5bfad14f3037d72eb6243258c13169cbd8.
 2009-07-06 14:05:11 -07:00
Android (Google) Code Review
01737b9c94 am 87e393f1: Merge change 6227 into donut 
Merge commit '87e393f1c81f190fa62d23059fc1109398a6e58b'

* commit '87e393f1c81f190fa62d23059fc1109398a6e58b':
  Adding tts result codes.
 2009-07-06 12:00:17 -07:00
Hung-ying Tyan
395c092473 am 46841db4: Add PPTP and L2TP/IPSec PSK service dispatching 
Merge commit '46841db4f2c7360d3b861a816e51f76acca0d677'

* commit '46841db4f2c7360d3b861a816e51f76acca0d677':
  Add PPTP and L2TP/IPSec PSK service dispatching
 2009-07-06 11:22:45 -07:00