Commit Graph

20665 Commits

Author SHA1 Message Date
Jean-Michel Trivi
4867faafa1 am 387dc0ca: Fix bug 2017664. Use the new constant names in TextToSpeech.
Merge commit '387dc0ca9c990511a71bd71c77d34ee33bc3f1aa'

* commit '387dc0ca9c990511a71bd71c77d34ee33bc3f1aa':
  Fix bug 2017664.
2009-07-30 06:56:28 -07:00
Android (Google) Code Review
9c432349a7 Merge change 9142 into donut
* changes:
  Add encryption option to PPTP UI.
2009-07-30 05:23:06 -07:00
Chung-yih Wang
c538b651a2 Fix some UI flow issues when the keystore is locked in WiFi setting.
To make it more user friendly, we need to continue on what
users intend to do after unlocking the credential storage.
2009-07-30 20:03:16 +08: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
Mike Lockwood
83bcc98af1 Allow enabling Wifi when in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

We also allow access to the VPN settings under the same circumstances.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-29 23:53:44 -07:00
Amith Yamasani
03f46bf48e Remove link to Contributors. Fix for #2022496 2009-07-29 21:03:54 -07: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
Android (Google) Code Review
79748b42e3 Merge change 9000 into donut
* changes:
  Fix duplicate entries being added when application is in active use
2009-07-29 15:48:15 -07:00
Jean-Baptiste Queru
5f16c148da merge from donut 2009-07-29 14:57:07 -07:00
Suchi Amalapurapu
489eaccb98 Fix duplicate entries being added when application is in active use 2009-07-29 11:38:17 -07:00
Jean-Michel Trivi
387dc0ca9c Fix bug 2017664.
Use the new constant names in TextToSpeech.
2009-07-29 11:24:25 -07:00
Hung-ying Tyan
c157aadf56 Add error dialog when secrets are missing. 2009-07-29 15:08:50 +08:00
Android (Google) Code Review
f0484951fb Merge change 8847
* changes:
  Wifi: Fix crash when changing screen orientation in Regulatory Domain list.
2009-07-28 13:17:39 -07:00
Mike Lockwood
dab705adba Wifi: Fix crash when changing screen orientation in Regulatory Domain list.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-28 13:15:50 -07:00
Suchi Amalapurapu
eaf6cb159e am c0932631: Remove debug statement
Merge commit 'c09326318334904f65d63c485c6fa1a7cb146bd8'

* commit 'c09326318334904f65d63c485c6fa1a7cb146bd8':
  Remove debug statement
2009-07-28 11:29:09 -07:00
Suchi Amalapurapu
c093263183 Remove debug statement 2009-07-28 10:28:23 -07:00
Hung-ying Tyan
ceeb4e0d25 am 6120ddd7: Capitalize the first letter of a VPN name.
Merge commit '6120ddd7863d1240a535bc111b62e068c8736058'

* commit '6120ddd7863d1240a535bc111b62e068c8736058':
  Capitalize the first letter of a VPN name.
2009-07-26 21:47:35 -07: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
Jean-Baptiste Queru
6c19bd3b58 reconcile korg/master into goog/master 2009-07-26 11:43:56 -07:00
Jean-Baptiste Queru
aedd747436 Merge korg/donut into korg/master 2009-07-25 17:48:03 -07:00
Hung-ying Tyan
6120ddd786 Capitalize the first letter of a VPN name. 2009-07-26 00:05:21 +08: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
Fred Quintana
0e3b960a5e update the permissions for the AccountManagerService 2009-07-23 16:03:24 -07: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
Android (Google) Code Review
86637edfa2 Merge change 8183 into donut
* changes:
  Improve UX of adding credential...
2009-07-22 15:44:42 -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
Chung-yih Wang
c7343d12f3 am c78e0b01: Fix the broken build
Merge commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1'

* commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1':
  Fix the broken build
2009-07-22 11:51:12 -07:00
Chung-yih Wang
7073178985 am b2295174: Add the missing phase2 field in EAP configuration.
Merge commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86'

* commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86':
  Add the missing phase2 field in EAP configuration.
2009-07-22 11:51:10 -07:00
Chung-yih Wang
c78e0b01e6 Fix the broken build 2009-07-23 01:56:57 +08:00
Chung-yih Wang
b2295174dc Add the missing phase2 field in EAP configuration.
+ Enable the password field for configuring the EAP-APs scanned.
2009-07-22 11:48:33 +08:00
Suchi Amalapurapu
8a45c87d41 resolved conflicts for merge of e0b5f33c to master 2009-07-21 17:17:33 -07:00
Android (Google) Code Review
e0b5f33c68 Merge change 7913 into donut
* changes:
  Reorganize message posting when updating sizes and resources. Rather than posting a message for each package, post a message for  a set of packages(8) so that we don't end up posting too many messages and making the UI non-responsive by keeping the Handler too busy. We just pass the loaded info as a map in the message object. Changes to back ground threads that compute sizes and load resources.
2009-07-21 16:54:12 -07:00
Android (Google) Code Review
5195f7825a am 53a1e445: Merge change 8077 into donut
Merge commit '53a1e445443865ef98f16652c7b403eee17499e8'

* commit '53a1e445443865ef98f16652c7b403eee17499e8':
  Implement the Back button handler to save a VPN.
2009-07-21 15:05:08 -07:00
Android (Google) Code Review
c877113d4a am ef2c5ac2: Merge change 8071 into donut
Merge commit 'ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8'

* commit 'ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8':
  Disable suggestion for certain types of text boxes.
2009-07-21 15:05:06 -07:00
Android (Google) Code Review
53a1e44544 Merge change 8077 into donut
* changes:
  Implement the Back button handler to save a VPN.
2009-07-21 15:03:43 -07:00
Android (Google) Code Review
ef2c5ac2e4 Merge change 8071 into donut
* changes:
  Disable suggestion for certain types of text boxes.
2009-07-21 15:03:31 -07:00
Hung-ying Tyan
19dc9e690f Implement the Back button handler to save a VPN. 2009-07-22 05:47:33 +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
Hung-ying Tyan
bfaa90725d Disable suggestion for certain types of text boxes.
+ Disable suggestion for password, server name and domain suffices.
+ Use a shorter string to indicate that a secret is set.
2009-07-22 05:13:51 +08: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
Android (Google) Code Review
1dea2d2a26 am a7fe59d0: Merge change 7974 into donut
Merge commit 'a7fe59d05d3393484e8c610962be70d29dee2cc4'

* commit 'a7fe59d05d3393484e8c610962be70d29dee2cc4':
  Removing translated text for compatibility option, which has been moved to SpareParts
2009-07-20 23:33:58 -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
Android (Google) Code Review
a7fe59d05d Merge change 7974 into donut
* changes:
  Removing translated text for compatibility option, which has been moved to SpareParts
2009-07-20 17:59:56 -07:00
Mitsuru Oshima
1f1c67aae5 Removing translated text for compatibility option, which has been moved to SpareParts 2009-07-20 17:50:04 -07:00