Commit Graph

10014 Commits

Author SHA1 Message Date
Chouting Zhang
5ee0635923 Remove 'SIM Card Lock' from Security & Location settings for CDMA phones. 2009-08-04 10:20:32 -07:00
Hung-ying Tyan
6fa32246b2 am 09cda9cf: Add VPN connection lost dialog.
Merge commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e'

* commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e':
  Add VPN connection lost dialog.
2009-08-03 01:37:54 -07:00
Hung-ying Tyan
09cda9cfaf Add VPN connection lost dialog. 2009-08-03 16:26:47 +08:00
Jim Miller
b6f1080058 Change resource string to "Accounts & Synchronization" 2009-07-31 18:00:06 -07:00
Amith Yamasani
498d90474b Add an icon to the left of the settings at the top level.
Add a new attribute for the icon.
Add place holder icons.
2009-07-31 07:24:08 -07:00
Android (Google) Code Review
9cfa368480 am 9c432349: Merge change 9142 into donut
Merge commit '9c432349a79cd0f19ebdee18deb2b0b8550d661f'

* commit '9c432349a79cd0f19ebdee18deb2b0b8550d661f':
  Add encryption option to PPTP UI.
2009-07-30 16:05:21 -07:00
Hung-ying Tyan
7be218e7f7 Add encryption option to PPTP UI.
Also add new error dialogs for L2TP challenge error and remote server
hanging up error.
2009-07-30 19:54:13 +08:00
Hung-ying Tyan
a7aaffa8ac am c157aadf: Add error dialog when secrets are missing.
Merge commit 'c157aadf5682e417ace8e4cf3fba498e6953cad3'

* commit 'c157aadf5682e417ace8e4cf3fba498e6953cad3':
  Add error dialog when secrets are missing.
2009-07-29 16:45:25 -07:00
Hung-ying Tyan
c157aadf56 Add error dialog when secrets are missing. 2009-07-29 15:08:50 +08:00
Hung-ying Tyan
c6b56e653e am 38a9daff: Fix secret EditText display and other fixes.
Merge commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c'

* commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c':
  Fix secret EditText display and other fixes.
2009-07-26 21:46:17 -07:00
Hung-ying Tyan
38a9daffa5 Fix secret EditText display and other fixes.
+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)"
  instead of two dots.

Patch Set 2:
+ Show cancellation confirmation dialog only when there's change in
  profile.

Patch Set 3:
+ Re-enable profile preferences when the reconnect dialog is cancelled.
2009-07-25 05:37:42 +08:00
Amith Yamasani
4baeebd285 am c25f8955: Link to bluetooth settings.
Merge commit 'c25f8955bee14a26520457fca2ab79c013f6196e'

* commit 'c25f8955bee14a26520457fca2ab79c013f6196e':
  Link to bluetooth settings.
2009-07-23 13:29:13 -07:00
Amith Yamasani
c25f8955be Link to bluetooth settings.
WiFi -> Wi-Fi
2009-07-22 16:26:20 -07:00
Android (Google) Code Review
7402052ab8 am 86637edf: Merge change 8183 into donut
Merge commit '86637edfa2df69016afcabbfc581c00a16041745'

* commit '86637edfa2df69016afcabbfc581c00a16041745':
  Improve UX of adding credential...
2009-07-22 16:09:09 -07:00
Hung-ying Tyan
d8858c3ee1 Improve UX of adding credential...
with more toast messages and fix dialog handling when needs another
dialog to initialize or enable the credential storage.
2009-07-23 06:41:15 +08:00
Android (Google) Code Review
c4bd101e21 am 8d4faa9e: Merge change 7977 into donut
Merge commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8'

* commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8':
  Add a way to override the display names for locales in the locale picker.
2009-07-21 14:38:09 -07:00
Android (Google) Code Review
8d4faa9ec3 Merge change 7977 into donut
* changes:
  Add a way to override the display names for locales in the locale picker.
2009-07-21 10:42:35 -07:00
Hung-ying Tyan
41b5321e8b am 241610e9: Add password error hint when adding new cert.
Merge commit '241610e986a8d2823f519762737903779089c253'

* commit '241610e986a8d2823f519762737903779089c253':
  Add password error hint when adding new cert.
2009-07-21 07:12:23 -07:00
Amith Yamasani
a459dbe5bb am 8fb0ec36: UI improvements for "Battery use" app.
Merge commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c'

* commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c':
  UI improvements for "Battery use" app.
2009-07-20 23:33:46 -07:00
Mitsuru Oshima
7f44ca3170 Merge commit '5c20034b' into fix
Conflicts:

	res/values/strings.xml
2009-07-20 23:30:04 -07:00
Hung-ying Tyan
241610e986 Add password error hint when adding new cert. 2009-07-21 09:45:08 +08:00
Eric Fischer
7ca226b15b Add a way to override the display names for locales in the locale picker.
In particular, show (the Chinese for) "Chinese (Simplified)" and "Chinese
(Traditional)" instead of "Chinese (China)" and "Chinese (Taiwan)".
2009-07-20 18:16:26 -07:00
Amith Yamasani
8fb0ec36ec UI improvements for "Battery use" app.
Change the controls UI to display a suggestion.
Bluetooth AT command tracking (not enabled yet).
2009-07-20 17:43:13 -07:00
Mitsuru Oshima
5c20034b7f moving compatibility mode option to spare parts 2009-07-20 15:52:29 -07:00
Jaikumar Ganesh
3a76bcaa83 Initial 2.1 bluetooth support.
Need to work with Strings and UI person to fix and later test everything.
2009-07-20 10:38:02 -07:00
Android (Google) Code Review
2fab4ab09c am 6b1b36a8: Merge change 7687 into donut
Merge commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6'

* commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6':
  Add UI to handle PKCS12 cert.
2009-07-17 15:43:07 -07:00
Hung-ying Tyan
38a44f2445 Add UI to handle PKCS12 cert. 2009-07-17 20:58:06 +08:00
Vivek Dlima
3d47738803 change all instances of displayed text 'apps' to 'applications' 2009-07-14 14:36:49 -07:00
Vivek Dlima
58f9c2b52d Updated Compatibility mode text. 2009-07-14 14:24:19 -07:00
Hung-ying Tyan
15384ee22a am 1ddccd07: Fix dialog handling.
Merge commit '1ddccd07f744344b5248dd5418ee526f26d520dc'

* commit '1ddccd07f744344b5248dd5418ee526f26d520dc':
  Fix dialog handling.
2009-07-12 23:44:38 -07:00
Hung-ying Tyan
1ddccd07f7 Fix dialog handling.
* Changes
  + VpnSettings:
    + Add reconnect dialog to showDialog() framework for handling screen
      rotation.
    + Dismiss other alert dialogs in onDestroy()
    + Remove onPrepareDialog() from VpnSettings.
    + Remove updateConnectDialog() from VpnProfileActor.
    + Add authentication error dialog.
    + Add unknown server dialog.
  + SecuritySettings:
    + Make cstor dialogs cancelable.
    + Add cancelable listener.
  Patch Set 6:
  + VpnSettings:
    + Disable preferences when connecting/disconnecting.
    + Fix state broadcast when binding a VpnService goes wrong.
2009-07-13 12:14:32 +08:00
Android (Google) Code Review
d7f707646a am 7063f371: Merge change 6467 into donut
Merge commit '7063f37102a334798349d4672981e52cba9cc0bd'

* commit '7063f37102a334798349d4672981e52cba9cc0bd':
  Tighten factory data reset text. Bug 1966926.
2009-07-08 12:06:25 -07:00
Roy West
1a728bdaed Tighten factory data reset text. Bug 1966926. 2009-07-08 08:03:35 -07:00
Ken Shirriff
e936f5b386 Add toast to settings widget.
When the settings widget updates bluetooth or wifi, display a
toast since they are slow to update.
Also fix some long lines.

bug=1918321
2009-07-07 12:28:17 -07:00
Android (Google) Code Review
a3b04ef890 am 423ab2eb: Merge change 6328 into donut
Merge commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f'

* commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f':
  String fixes for the credential storage and vpn settings.
2009-07-06 20:45:50 -07:00
Android (Google) Code Review
423ab2eb9d Merge change 6328 into donut
* changes:
  String fixes for the credential storage and vpn settings.
2009-07-06 20:44:44 -07:00
Hung-ying Tyan
33ababd1bd 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.
2009-07-07 11:37:54 +08:00
Android (Google) Code Review
6b0cdd4e1f am 879f7bcf: Merge change 6272 into donut
Merge commit '879f7bcf41782940fff3ffcb3586d606361360c6'

* commit '879f7bcf41782940fff3ffcb3586d606361360c6':
  Fix bug 1946195 by making use of the current Locale to set a default value
2009-07-06 17:05:23 -07:00
Android (Google) Code Review
879f7bcf41 Merge change 6272 into donut
* 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.
2009-07-06 17:03:03 -07:00
Jean-Michel Trivi
44fbbea071 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.
2009-07-06 14:16:17 -07:00
Hung-ying Tyan
7888cc450a am 0a59b500: Integrate VPN with new keystore and misc fixes.
Merge commit '0a59b500147cc038541f6f2897de7e28c15a12c1'

* commit '0a59b500147cc038541f6f2897de7e28c15a12c1':
  Integrate VPN with new keystore and misc fixes.
2009-07-06 11:22:33 -07:00
Hung-ying Tyan
acedb4b501 am 4e45d392: Add certificate to keystore for the ADD intent
Merge commit '4e45d392ada4e84fbeed06874caebfd3c7759073'

* commit '4e45d392ada4e84fbeed06874caebfd3c7759073':
  Add certificate to keystore for the ADD intent
2009-07-06 11:22:15 -07:00
Hung-ying Tyan
bb0c941b30 am 6a0544be: Fix strings.
Merge commit '6a0544be5cf7ed8b19628f292e4045e1f3f7cb2f'

* commit '6a0544be5cf7ed8b19628f292e4045e1f3f7cb2f':
  Fix strings.
2009-07-06 11:22:04 -07:00
Hung-ying Tyan
902a297d92 am 7031ab0d: Add credential storage settings.
Merge commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1'

* commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1':
  Add credential storage settings.
2009-07-06 11:21:57 -07:00
Hung-ying Tyan
0a59b50014 Integrate VPN with new keystore and misc fixes.
* 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
2009-07-06 18:47:47 +08:00
Hung-ying Tyan
4e45d392ad Add certificate to keystore for the ADD intent 2009-07-05 10:37:55 +08:00
Hung-ying Tyan
6a0544be5c Fix strings.
* Changes
  + "Disconnect from network"
  + "Remember username"
  + "Unable to connect to the network"
2009-07-04 00:39:58 +08:00
Hung-ying Tyan
7031ab0d75 Add credential storage settings.
* 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.
2009-07-03 23:00:53 +08:00
Hung-ying Tyan
dcd9886b4e am e5b9e4bd: Add L2tpIpsecPskEditor.
Merge commit 'e5b9e4bddf1aed4f647da3966d831a165a064f80'

* commit 'e5b9e4bddf1aed4f647da3966d831a165a064f80':
  Add L2tpIpsecPskEditor.
2009-07-02 14:25:19 -07:00
Hung-ying Tyan
e5b9e4bddf Add L2tpIpsecPskEditor.
* Changes
  + Add L2tpIpsecPskEditor.java.
  + Save profile name in VpnEditor to be used in saveSecrets().
2009-07-01 11:06:45 +08:00