89 Commits

Author SHA1 Message Date
Android (Google) Code Review
2bdd7d816a am e88d8031: Merge change 4739 into donut
Merge commit 'e88d803183b4999965fd3cda856420ad69ee0a4a'

* commit 'e88d803183b4999965fd3cda856420ad69ee0a4a':
  Add PPTP, L2TP/IPSec preshared key and other fixes.
2009-06-25 12:27:21 -07:00
Android (Google) Code Review
e88d803183 Merge change 4739 into donut
* changes:
  Add PPTP, L2TP/IPSec preshared key and other fixes.
2009-06-25 12:26:02 -07:00
Hung-ying Tyan
d3aba7f7b6 Add PPTP, L2TP/IPSec preshared key and other fixes.
* Changes
  + Add PptpProfile.java, PptpService.java.
  + Add L2tpIpsecPskProfile.java
  + Add PPTP and L2TP_IPSEC_PSK entries in VpnType.java.
  + Add the secret option to L2tpProfile.java and have L2tpIpsecProfile
    extend it.
  + Add MtpdHelper to send common PPP options.
  + Add getGatewayIp() to VpnService().
  + Revise VpnService.reallyGetHostIp().

  Patch Set 6, 7, 8:
  + Add L2TP secret flag in L2tpProfile.

  Patch Set 9:
  + Add description to VpnType.

  Patch Set 11:
  + Pass ipparam to mtpd.

  Patch Set 12:
  + Add L2TP secret support
  + Fix string constants
2009-06-26 03:02:22 +08:00
Android (Google) Code Review
23f584438c am d4eac5f3: Merge change 5300 into donut
Merge commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7'

* commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7':
  Using a sendBroadcast to notify interested parties of when
2009-06-25 10:21:34 -07:00
Android (Google) Code Review
d4eac5f384 Merge change 5300 into donut
* changes:
  Using a sendBroadcast to notify interested parties of when the TTS queue has finished processing.
2009-06-25 10:20:31 -07:00
Android (Google) Code Review
b322287594 am 60a0ad65: Merge change 5329 into donut
Merge commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6'

* commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6':
  frameworks/base - CDMA settings additions
2009-06-24 23:41:00 -07:00
Android (Google) Code Review
60a0ad65f4 Merge change 5329 into donut
* changes:
  frameworks/base - CDMA settings additions
2009-06-24 23:39:07 -07:00
David Krause
d0f6715dcb frameworks/base - CDMA settings additions
These changes are the frameworks/base portion of CDMA UI changes.

Five settings are added:
   - In-call DTMF type (burst or long)
   - Emergency tone type
   - CDMA auto-retry
   - Hearing Aid Compatibility (on/off)
   - TTY mode
2009-06-24 20:07:28 -07:00
Charles Chen
28dbae7df4 Using a sendBroadcast to notify interested parties of when
the TTS queue has finished processing.
2009-06-24 17:49:07 -07:00
Android (Google) Code Review
9f7b52adf7 am e181409c: Merge change 5240 into donut
Merge commit 'e181409ced966f2bea6128bf32b0334e34fcf58c'

* commit 'e181409ced966f2bea6128bf32b0334e34fcf58c':
  Fixing the synth function so that queue processing continues.
2009-06-24 15:45:23 -07:00
Android (Google) Code Review
0ef67e63b4 am b28bf241: Merge change 5226 into donut
Merge commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5'

* commit 'b28bf241c56264b915ec3ca0e81256bb1d009aa5':
  Fix bug in TTS service where the language setting was using the default language
2009-06-24 15:45:06 -07:00
Charles Chen
7af9e196a3 Fixing the synth function so that queue processing continues. 2009-06-24 13:31:18 -07:00
Jean-Michel Trivi
6a0e293c84 Fix bug in TTS service where the language setting was using the default language
when the setting wasn't enforced, and vice-versa.
Cleaning the log of the native TTS layer to use LOGV for verbose messages,
rather than LOGI.
2009-06-24 11:32:06 -07:00
Android (Google) Code Review
8931802561 Merge change 5102
* changes:
  - clean up the sync settings names to:    (get|set)SyncAutomatically    (get|set)MasterSyncAutomatically - change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that   this overrides the .*SyncAutomatically settings - make ContentResolver methods that call the sync controls methods   in IContentService so that SDK users can use them - rename startSync to requestSync to reinforce the fact that a sync   is not immediately or always started when this method is called - add an Account parameter to all the sync settings and control methods - change the sync control methods to take a String authority rather than a Uri uri
2009-06-23 15:54:43 -07:00
Fred Quintana
ac9385ef31 - clean up the sync settings names to:
(get|set)SyncAutomatically
   (get|set)MasterSyncAutomatically
- change SYNC_EXTRAS_FORCE to SYNC_EXTRAS_MANUAL to mace clear that
  this overrides the .*SyncAutomatically settings
- make ContentResolver methods that call the sync controls methods
  in IContentService so that SDK users can use them
- rename startSync to requestSync to reinforce the fact that a sync
  is not immediately or always started when this method is called
- add an Account parameter to all the sync settings and control methods
- change the sync control methods to take a String authority rather than a Uri uri
2009-06-23 15:53:16 -07:00
Android (Google) Code Review
99d2370337 am 2a3cd364: Merge change 5119 into donut
Merge commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652'

* commit '2a3cd3643fcfa40fc447485a2db4b4333e10c652':
  Adding support for pitch changes of the synthesized text in Text-To-Speech.
2009-06-23 15:52:29 -07:00
Jean-Michel Trivi
2ea5349583 Adding support for pitch changes of the synthesized text in Text-To-Speech. 2009-06-23 15:26:57 -07:00
Android (Google) Code Review
6976dca6c8 am 6afe8133: Merge change 4720 into donut
Merge commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c'

* commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c':
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:38:47 -07:00
Android (Google) Code Review
6afe81339e Merge change 4720 into donut
* changes:
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:29:59 -07:00
Brett Chabot
31a88fac91 Fix string formatters in SettingsProvider SecurityException message. 2009-06-19 09:45:48 -07:00
Android (Google) Code Review
6be4025b12 am 2810f681: Merge change 4694 into donut
Merge commit '2810f681991d1beb5ceb3515159f9fad3cc341d5'

* commit '2810f681991d1beb5ceb3515159f9fad3cc341d5':
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:26:48 -07:00
Android (Google) Code Review
2810f68199 Merge change 4694 into donut
* changes:
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:24:47 -07:00
Brett Chabot
16dd82cfdc Make SettingsProviders SecurityException messages more verbose. 2009-06-18 17:05:03 -07:00
Android (Google) Code Review
6b6e1c4b79 am 7153739a: Merge change 4661 into donut
Merge commit '7153739a92dda971fd865defae0747bec921d8af'

* commit '7153739a92dda971fd865defae0747bec921d8af':
  Grouping under TextToSpeech.Engine the constants to be used by
2009-06-18 15:08:47 -07:00
Jean-Michel Trivi
d146874d73 Grouping under TextToSpeech.Engine the constants to be used by
a TTS engine implementation or a settings application for default
values, and data integrity check return codes.
2009-06-18 14:46:25 -07:00
Android (Google) Code Review
cd94979e57 am e748161c: Merge change 4529 into donut
Merge commit 'e748161ca89867e8c57d4e71c780486d4de8039c'

* commit 'e748161ca89867e8c57d4e71c780486d4de8039c':
  In the TTS service, read the default TTS settings from Settings.Secure.
2009-06-18 08:56:19 -07:00
Android (Google) Code Review
e748161ca8 Merge change 4529 into donut
* changes:
  In the TTS service, read the default TTS settings from Settings.Secure.
2009-06-18 08:53:58 -07:00
Android (Google) Code Review
130a8f8cbf am 3f4263fa: Merge change 4411 into donut
Merge commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c'

* commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c':
  Squashed commit of the following:
2009-06-17 18:46:21 -07:00
Jean-Michel Trivi
605a66bd56 In the TTS service, read the default TTS settings from Settings.Secure. 2009-06-17 17:59:50 -07:00
Android (Google) Code Review
321d593efe am a0a854d4: Merge change 4398 into donut
Merge commit 'a0a854d47f9dc38ce41505f973aea01842694fb5'

* commit 'a0a854d47f9dc38ce41505f973aea01842694fb5':
  Using Locale to specify language and country for a TTS language to load,
2009-06-17 15:39:03 -07:00
Android (Google) Code Review
5bba52f617 am 2cf3971e: Merge change 4460 into donut
Merge commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09'

* commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09':
  Use the new keystore API in vpn service.
2009-06-17 15:38:47 -07:00
Eric Fischer
f204ab3ebc Squashed commit of the following:
commit 8e1a200225b7e4756b83d17d679a71a06a38b696
Author: Eric Fischer <enf@google.com>
Date:   Tue Jun 16 16:32:56 2009 -0700

    Make names of Settings, VPN, Subscribed Feeds providers localizable.
2009-06-17 15:17:29 -07:00
Android (Google) Code Review
a0a854d47f Merge change 4398 into donut
* changes:
  Using Locale to specify language and country for a TTS language to load, rather than a String. Cleanup in doc for TextToSpeech, and addition of queue mode constants.
2009-06-17 10:36:43 -07:00
Jean-Michel Trivi
679d728f09 Using Locale to specify language and country for a TTS language to load,
rather than a String.
Cleanup in doc for TextToSpeech, and addition of queue mode constants.
2009-06-17 10:16:17 -07:00
Chung-yih Wang
68fdd3d4cd Use the new keystore API in vpn service. 2009-06-17 18:25:02 +08:00
Android (Google) Code Review
c1760fa84c am f1170fb5: Merge change 4251 into donut
Merge commit 'f1170fb5386ea86d704480d321ee9d1ee4858244'

* commit 'f1170fb5386ea86d704480d321ee9d1ee4858244':
  Updating TTS engine interface for setting the language based on language, country and variant codes
2009-06-16 16:43:11 -07:00
Android (Google) Code Review
f1170fb538 Merge change 4251 into donut
* changes:
  Updating TTS engine interface for setting the language based on language, country and variant codes coming from a java.util.Locale instance.
2009-06-16 14:05:39 -07:00
Jean-Michel Trivi
35a8e80bf8 Updating TTS engine interface for setting the language based on language, country and variant codes
coming from a java.util.Locale instance.
2009-06-16 13:25:15 -07:00
Android (Google) Code Review
3c3d3081aa am 727f36c6: Merge change 4265 into donut
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'

* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
  process: Fix bug where if a thread exited while we were changing its control
  Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
2009-06-16 08:36:48 -07:00
Android (Google) Code Review
29930a1cb8 am 3dcea047: Merge change 4237 into donut
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'

* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
  Remove obsolete FOTA_UPDATE permission (which should never have been
2009-06-16 08:36:35 -07:00
Dan Egnor
cb05cc4acb Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
reintroduced in an errant and clumsy git merge operation.

Also remove permission label and description strings for now-deleted
permissions FOTA_UPDATE and (within the SettingsProvider package)
WRITE_GSERVICES.
2009-06-15 16:50:51 -07:00
Dan Egnor
2d4b6ad9d4 Remove obsolete FOTA_UPDATE permission (which should never have been
made public, and wouldn't be used by any third party applications,
and no longer does anything regardless).

Also remove the WRITE_GSERVICES permission from the SettingsProvider
package's manifest (the declaration there was redundant with the one
in the core manifest, where all the other settings-related permissions
live -- no other core package includes its own permission definitions).
2009-06-15 16:29:20 -07:00
Android (Google) Code Review
4522c7dc40 am 6d78dd8e: Merge change 4147 into donut
Merge commit '6d78dd8ef833e22d73fc65df205346e657cf9850'

* commit '6d78dd8ef833e22d73fc65df205346e657cf9850':
  On the way of refactoring out SingleServerProfile.java.
2009-06-15 00:17:34 -07:00
Hung-ying Tyan
4c424d61c7 On the way of refactoring out SingleServerProfile.java.
+ Move mServerName from SingleServerProfile and VpnProfile.
+ Add mSavedUsername to VpnProfile.
+ Keep empty SingleServerProfile to not break the classes that use it.
+ Remove use of SingleServerProfile from VpnService.java.
2009-06-15 13:06:03 +08:00
Android (Google) Code Review
aa73f17201 am 6599426f: Merge change 4017 into donut
Merge commit '6599426f74371c823fcfe570f61577262eb0df44'

* commit '6599426f74371c823fcfe570f61577262eb0df44':
  Make the date format preference work again.
2009-06-14 21:12:17 -07:00
Android (Google) Code Review
6599426f74 Merge change 4017 into donut
* changes:
  Make the date format preference work again.
2009-06-12 11:10:56 -07:00
Eric Fischer
3287695823 Make the date format preference work again.
It is only used for numeric dates -- spelled-out dates have such a complex
variety of formats that they can only be meaningfully formatted from
locale strings.

In addition, the preference is left null when initializing, on the assumption
that the locale will still specify a more useful numeric format than we can
guess as part of a build-wide configuration.

But if the user has specified a format, the date will be formatted in the
order they asked for, with locale-appropriate punctuation substituted in.
2009-06-12 10:06:24 -07:00
Android (Google) Code Review
69b0db0654 am 83bb56c3: Merge change 3424 into donut
Merge commit '83bb56c389d003162093eef0aaee251cefc1deed'

* commit '83bb56c389d003162093eef0aaee251cefc1deed':
  Add the VPN services package, VPN service base classes and L2tpIpsecService.
2009-06-12 08:26:32 -07:00
Hung-ying Tyan
f94b6444a3 Add the VPN services package, VPN service base classes and L2tpIpsecService.
Also add android.security.Keystore. This is a quick solution. Will be
evolved to a more mature implementation.

PATCH SET 2:
+ Add VpnServiceBinder to hide VpnService and its subclasses.
+ Add sendCommand2() to AndroidServiceProxy to work with the latest mtpd.

PATCH SET 3:
+ Rebase to catch up with new commits; no changes made.

PATCH SET 4:
+ Remove/comment out @Override on interface methods to be compilable for Java 1.5.

PATCH SET 5:
+ Add L2tpService.java.
+ Make VpnService to work on SingleServerProfile; add serverIp to
  connect(); set system property "net.vpn.server_ip"; and move
  getPppOptionFilePath() from L2tpIpsecService to VpnService
+ Revise VpnManager to start VpnService without worrying about which
  type (as the type info is in VpnProfile)
+ Remove installation stuff from VpnManager

PATCH SET 6:
+ Fix PATCH SET 5 (the patch was messed up). Please ignore PATCH SET 5.

PATCH SET 7:
+ Fix styles.

PATCH SET 8:
+ Add CANCELLED to VpnState.

PATCH SET 9:
+ Make VpnProfile serializable (in order to save them to persistent storage)

PATCH SET 10:
+ Remove Keystore.java as it's added in another CL.
2009-06-12 15:45:56 +08:00
Jean-Michel Trivi
8b93740b29 am b3c5a878: Made the platform TTS service aware of the path for the default TTS library to load.
Merge commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2'

* commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2':
  Made the platform TTS service aware of the path for the default TTS library to load.
2009-06-11 00:45:21 -07:00