Merge commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b'
* commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b':
Add translated time zone picker lists for several more languages.
Merge commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f'
* commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f':
String fixes for the credential storage and vpn settings.
* Changes
+ Shorten the messages for both set-password and enter-password dialogs
when other activities access the credential storage.
Patch Set 2:
+ Fix the capital issue in the vpn error messages.
+ Add separate strings for terms used in the error messages.
+ Modify related src files that use those terms.
Merge commit '879f7bcf41782940fff3ffcb3586d606361360c6'
* commit '879f7bcf41782940fff3ffcb3586d606361360c6':
Fix bug 1946195 by making use of the current Locale to set a default value
* changes:
Fix bug 1946195 by making use of the current Locale to set a default value in the language pref list (bug was no selection in the default language list). Fix half of bug 1956707 where speech rate value as read from the settings was translated to a ratio, which applied an improper speech rate on the TTS engine (bug was setting a default rate makes the TTS demo unintelligible). Moved logic to set the default value in the language pref list in a separate private method to improve readability. Changed default rate values so that normal is 1x and the fastest is 2x.
in the language pref list (bug was no selection in the default language list).
Fix half of bug 1956707 where speech rate value as read from the settings
was translated to a ratio, which applied an improper speech rate on the
TTS engine (bug was setting a default rate makes the TTS demo unintelligible).
Moved logic to set the default value in the language pref list in a separate
private method to improve readability.
Changed default rate values so that normal is 1x and the fastest is 2x.
Merge commit '0a59b500147cc038541f6f2897de7e28c15a12c1'
* commit '0a59b500147cc038541f6f2897de7e28c15a12c1':
Integrate VPN with new keystore and misc fixes.
Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe'
* commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe':
Apply the new keystore and certtool library in Wifi setting.
Merge commit '4e45d392ada4e84fbeed06874caebfd3c7759073'
* commit '4e45d392ada4e84fbeed06874caebfd3c7759073':
Add certificate to keystore for the ADD intent
* Changes
+ Pass intent to keystore when needed and hooks to resume from it.
+ Generate random, unique ID for profile instead of base64 from its
name.
+ Add VPN to "Wirless controls" description.
+ Add credential storage to "Security & location" description.
+ More hints to set password and unlock dialogs in credential storage
settings for actions that come from other processes.
+ Sort VPN profiles according to the names.
+ Replace Keystore with CertTool in L2tpIpsecEditor
1. Certificate related APIs were moved to CertTool. Therefore,
we have to migrate to CertTool instead.
2. Unlock the keystore if it is not unlocked yet(send the intent
out to credential storage) for EAP access points.
3. Add Password field for WPA_EAP and IEEE8021X(this is for
phase 2 auth.)
* Changes
+ Initial implementation of credential storage settings.
+ Use alert icon on delete and reconnect dialogs in VpnSettings.
(piggy-backed)
Patch Set 12:
+ Add password length and no-space verification.
+ Simplify dialog view xml files.
Merge commit '311356dd71eb33a383fb9a5b470517103ea1f424'
* commit '311356dd71eb33a383fb9a5b470517103ea1f424':
Redo power widget layout with the proper widget style.
The power widget now uses the fuzzy-edged widget background.
It has a resonable layout in portrait and landscape.
appwidget_inner is the background for a button on the inside, with a border on the left.
appwidget_outer is the background for a button on the outside (i.e. leftmost); it
does not have a border.
* Changes
+ Add L2tpActor, L2tpEditor, L2tpIpsecPskActor.
+ Make L2tpIpsecEditor extend L2tpEditor.
+ Revise the code for saving username. Make
VpnSettings.saveProfileToStorage() static.
+ Fix support for screen orientation change in both VpnSettings and
VpnEditor.
Patch Set 2:
+ Remove Util.isNullOrEmpty(). Use TextUtils.isEmpty() instead.
+ Remove unused imports. Wrap lines longer than 80 chars.
Patch Set 3:
+ Fix all the strings according to UI feedback.
+ Remove all the added actor subclasses and move password to editor.
+ Remove VPN entry in Security & location.
Patch Set 4:
+ Misc string fixes.
Patch Set 5:
+ Add strings for credential storage settings.
+ Changed the error dialog icon.
+ Fix "Remember me" indentation in connect dialog.
Patch Set 6:
+ resolve res/values/strings.xml
This patch implement CDMA Settings features
1. Add code to get MEID, MIN, and PRL value if the phone is a CDMA Phone
2. Display MEID, MIN, and PRL on Settings screen if it is a CDMA phone
3. Do not display IMSI, IMEI, and IMEI SV for a CDMA phone
Merge commit 'd2e3b0139009b98be5ed825e58c38a325240594e'
* commit 'd2e3b0139009b98be5ed825e58c38a325240594e':
Edit second line of Search settings. First part of fix to bug1928620.
* changes:
Remove pitch selection from TTS settings. Use the settings name for the locale property rather than the UI key. Add prefs entry to install the voice data.
- Move the battery usage item from applications to phone info.
- Give the battery usage item a summary.
- Fiddle with the manifest to make it so we can launch parts of the settings
app without messing up launching of the main app. (That is, remove
affinities so they each are treated as different tasks.)
- Add the ability to make shortcuts to some key settings panels.
* changes
+ Add checkbox to layout file and handling code in related classes.
+ Add new methods to VpnProfileActor.
+ Move dialog handling to VpnSettings from AuthenticatorActor in order
to support screen orientation change.
+ Hide "Connect" in the context menu if the profile is connecting.
+ Enable connecting profile in case it was disabled in last call.
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.
