Merge commit '74e565d85d13782b2a75647b3fd952a2324ca581'
* commit '74e565d85d13782b2a75647b3fd952a2324ca581':
Update the Text-To-Speech settings screen to allow listening to a TTS
example after checking that the data required by the TTS engine is
properly installed.
Removed use of local constants for the the default TTS values, use
the values defined in TextToSpeech.Engine instead.
Merge commit 'f11d7458ea2f52b3c4afad495274167b862e7a4c'
* commit 'f11d7458ea2f52b3c4afad495274167b862e7a4c':
Make the Quick Launch settings show localized application names.
Merge commit '19e134e494a561324394fcc030ee8e30bb41c614'
* commit '19e134e494a561324394fcc030ee8e30bb41c614':
Use new Keystore APIs in vpn profile editor.
Merge commit 'f06d8698a4a2de1973a25df0c6563bdfcba4eb03'
* commit 'f06d8698a4a2de1973a25df0c6563bdfcba4eb03':
Add setting for allowing Google to use location for better search results.
Merge commit '14fa2b998630b7032b4e42b0bceb71f0df21fbdf'
* commit '14fa2b998630b7032b4e42b0bceb71f0df21fbdf':
Another edit, now in two places, now that I understand the workflow of resetting the flow a bit better.
It looks like when you look up the name of an application bookmark,
you get the name in whatever locale the device was in when it first
booted. Check the PackageManager to get a name in the current locale,
if possible, to display instead.
Merge commit 'a78edb54182da5881f2f1e6bc76ae027a9a6f3e3'
* commit 'a78edb54182da5881f2f1e6bc76ae027a9a6f3e3':
Make the SD Card settings use the system file size formatter.
Merge commit 'a55ae92a132325e9307f291c455b1148d0bff3cf'
* commit 'a55ae92a132325e9307f291c455b1148d0bff3cf':
Remove isCustomized() check as the API is not used for now.
Remove LAUNCHER category from VPN settings activity's intent filter.
Improve power control widget GUI.
Minor UI improvements and showing of unplugged duration.
Make the Settings side of the date format settings more locale-aware.
Remove the two formats that have a spelled-out month, since applications
using this setting are trying to format numeric dates.
Do not forcibly set the setting the first time you go into Date & Time --
let the setting remain null if it was null before.
Add a choice corresponding to null to the list of format options. It will
look like "Normal (12-31-2009)" in the list, and will cause the system
to use whatever numeric format the locale calls for.
For the other choices, feed them to the locale-aware formatter so they
will appear with the punctuation that the locale calls for.
Merge commit 'a1ff25c973fc5a65e32eab8b352d619c95fb24d0'
* commit 'a1ff25c973fc5a65e32eab8b352d619c95fb24d0':
Removing the summary texts for the Accessibility checkbox
Merge commit '150d5d84e8913e93402950a84ff991b7549b71b4'
* commit '150d5d84e8913e93402950a84ff991b7549b71b4':
Use the keystore service instead of the direct file access.
PATCH SET 2:
+ Add import com.android.settings.R
PATCH SET 3:
+ Remove @Override interface methods to be compilable by Java 1.5.
PATCH SET 4:
+ Add import android.net.vpn.VpnManager
PATCH SET 5:
+ Add license headers.
PATCH SET 6:
+ Remove Constant.java and move the constants to VpnSettings.
+ Make AuthenticationActor implement DialogInterface's handlers.
+ Remove trailing spaces.
PATCH SET 7:
+ Remove default username.
Merge commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0'
* commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0':
Revert "Use the keystore service instead of the direct file acess."
Merge commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884'
* commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884':
Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Merge commit '289705f3311932a45adef1710358f5e302115013'
* commit '289705f3311932a45adef1710358f5e302115013':
Use the keystore service instead of the direct file acess.
