Commit Graph

3009 Commits

Author SHA1 Message Date
Eric Fischer
c9e5fc45b0 Import revised translations. DO NOT MERGE 2009-08-10 17:57:14 -07:00
Eric Fischer
a016cb0048 Import revised translations. DO NOT MERGE 2009-08-10 10:48:54 -07:00
Dianne Hackborn
e25e4e4c57 Add new activity for picking live wallpapers. 2009-08-08 21:01:32 -07:00
Android (Google) Code Review
ede25bc845 Merge change 20355
* changes:
  Re-ordered some Settings and renamed some.
2009-08-07 06:34:08 -07:00
Jeff Sharkey
7e4a019e19 am 6c3287a4: Adopt new AppWidget assets, per http://b/2038594.
Merge commit '6c3287a4d3a8e02322b501034db3133a3ccb1051'

* commit '6c3287a4d3a8e02322b501034db3133a3ccb1051':
  Adopt new AppWidget assets, per http://b/2038594.
2009-08-06 22:57:48 -07:00
Jeff Sharkey
6c3287a4d3 Adopt new AppWidget assets, per http://b/2038594. 2009-08-06 22:37:08 -07:00
Amith Yamasani
7f28787edf Re-ordered some Settings and renamed some.
Reduced padding around the icons in the top level screen.
Re-ordered top-level settings.
Moved Airplane mode to the top of wireless & networks.
2009-08-06 16:43:23 -07:00
Michael Chan
e41a4ca695 Modified the Bluetooth 2.1 Passkey confirmation dialog
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
2009-08-04 18:20:17 -07:00
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
Amith Yamasani
5f1d3351cc am 03f46bf4: Remove link to Contributors. Fix for #2022496
Merge commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb'

* commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb':
  Remove link to Contributors. Fix for #2022496
2009-07-30 16:05:18 -07:00
Android (Google) Code Review
3deea37da3 Merge change 9116
* changes:
  Allow enabling Wifi when in airplane mode.
2009-07-30 08:35:41 -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
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
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
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
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
Xianzhu Wang
58d601794e 1. Added the missing timezone for mainland China "Asia/Shanghai".
In each localized version of timezones.xml, the name of this timezone is
defined like "China Standard Time (Beijing)" if some other timezones are
also in this format, or just "Beijing" if all of other timezones are of
city names.

2. Changed time zone name of "Asia/Taipei" from "China Standard Time (Taipei)"
to "Taipei" in some localized versions of timezones.xml.
"China Standard Time" is for China mainland, and the timezone of Taipei
is normally called "Taipei Standard Time" (or "Chungyuan Standard Time").
Though for now the offset of "Taipei Standard Time" and "China Standard Time"
is the same, they were different during 1986-1991 because of daylight saving
of China mainland.
2009-07-17 11:19:50 +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
Android (Google) Code Review
1555e944ab am bc48d181: Merge change 7051 into donut
Merge commit 'bc48d181fa9b1c1b516e3e9ece81e82069594022'

* commit 'bc48d181fa9b1c1b516e3e9ece81e82069594022':
  Use appropriate input types for edit fields in Apn settings.
2009-07-14 10:21:27 -07:00
Android (Google) Code Review
bc48d181fa Merge change 7051 into donut
* changes:
  Use appropriate input types for edit fields in Apn settings.
2009-07-13 18:53:06 -07:00
Amith Yamasani
058c602bec Use appropriate input types for edit fields in Apn settings.
Turn off prediction and use proper input types.
2009-07-13 18:48:13 -07:00
Android (Google) Code Review
6d1f227f72 am 178dc98a: Merge change 6985 into donut
Merge commit '178dc98a7e0bba4ce0089d7ef6cb64c51c0411ca'

* commit '178dc98a7e0bba4ce0089d7ef6cb64c51c0411ca':
  Import new translations
2009-07-13 16:59:37 -07:00