Merge commit '35733757bd1644f1fd67dc3a055391d1f167c4f2'
* commit '35733757bd1644f1fd67dc3a055391d1f167c4f2':
Hook the 12- or 24-hour time format checkbox back up.
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.
* changes:
Make the file backup helper not crash if a file you requested can't be stated. This means you don't need to know if the files you are backing up exist or not -- we'll figure it out for you.
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
* changes:
TextToSpeech class cleanups - harmonized private member variable names - added success / failure codes (used for now in initialization) - synchronized access to speech completed listener.
Merge commit '286ea605c991874fb43a6a205676a0ca404f94cc'
* commit '286ea605c991874fb43a6a205676a0ca404f94cc':
Renaming the Tts class to TextToSpeech for clarity.
* changes:
Renaming the Tts class to TextToSpeech for clarity. Switching to HashMap for parameter lists to pass key-value parameter pairs. Using TODO instead of FIXME in comments. Removing methods that don't belong anymore to the TTS interface now the feature becomes part of the platform.
Merge commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2'
* commit 'db8a6ae6bbd8cbb17fb79085ffb9d3fc539fe5c2':
Provide the Keystore feature in the framework.
Merge commit 'aba34d96fda75cbaaae19ce6296266feb24ce365'
* commit 'aba34d96fda75cbaaae19ce6296266feb24ce365':
Fix display of the selection background for search results.
* changes:
Add SUGGEST_SPINNER_WHILE_REFRESHING column constant to the SearchManager for use in implementing Google suggestion refreshing in global search.
Merge commit '9bbc21a773cbdfbef2876a75c32bda5839647751'
* commit '9bbc21a773cbdfbef2876a75c32bda5839647751':
Flesh out restore interface on manager; work up most of LocalTransport
Merge commit 'b6391d6377883586995127c9926c1b5b8035fd60'
* commit 'b6391d6377883586995127c9926c1b5b8035fd60':
Allow arrays of values for power profile data.
Merge commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2'
* commit 'b3c5a8785bc643843117752d37769a1edfe9a9e2':
Made the platform TTS service aware of the path for the default TTS library to load.
Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf'
* commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf':
Turned on the windows media related test cases as the binary already integrated.
