Commit Graph

141854 Commits

Author SHA1 Message Date
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
Romain Guy
849453e269 am f90682f4: Give an icon to Settings shortcuts.
Merge commit 'f90682f4fb645ff45cbabcc0e7c3c26dc3cce599'

* commit 'f90682f4fb645ff45cbabcc0e7c3c26dc3cce599':
  Give an icon to Settings shortcuts.
2009-07-16 17:54:41 -07:00
Romain Guy
f90682f4fb Give an icon to Settings shortcuts. 2009-07-16 15:06:44 -07:00
Hung-ying Tyan
aae9398a31 am c3eaaad1: Fix "use secure credential" checkbox in Settings.
Merge commit 'c3eaaad17ebe9a2cbe34b096511c8f06369dadd1'

* commit 'c3eaaad17ebe9a2cbe34b096511c8f06369dadd1':
  Fix "use secure credential" checkbox in Settings.
2009-07-16 09:55:11 -07:00
Hung-ying Tyan
c3eaaad17e Fix "use secure credential" checkbox in Settings.
Uncheck the checkbox if the user cancels the password-entering dialog.
2009-07-16 23:19:38 +08:00
Mike Lockwood
afdca68b95 am 599221c7: wifi: Update the AccessPointState network ID after saving configuration.
Merge commit '599221c7bbd6cd613fd4f86805ccaf0696a3e78c'

* commit '599221c7bbd6cd613fd4f86805ccaf0696a3e78c':
  wifi: Update the AccessPointState network ID after saving configuration.
2009-07-15 18:13:56 -07:00
Android (Google) Code Review
6a176dc638 Merge change 7449
* changes:
  b/1818390 Show Computer and Phone icons on such devices even if they support A2DP or HSP
2009-07-15 16:19:42 -07:00
Michael Chan
3e1c1d1920 b/1818390 Show Computer and Phone icons on such devices even if they support A2DP or HSP 2009-07-15 15:14:12 -07:00
Mike Lockwood
599221c7bb wifi: Update the AccessPointState network ID after saving configuration.
If there are more than 10 open access points, the network ID may have changed
after the configuration is saved.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-15 11:57:25 -04:00
Jean-Baptiste Queru
da182bb458 Merge commit 'goog/readonly-korg-master' into merge_korg_master 2009-07-14 17:13:07 -07: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
Amith Yamasani
5541e98406 am 5c30845c: Fix #1930767 : "Share with Google" not working on orientation change.
Merge commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513'

* commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513':
  Fix #1930767 : "Share with Google" not working on orientation change.
2009-07-13 16:59:36 -07:00
Android (Google) Code Review
178dc98a7e Merge change 6985 into donut
* changes:
  Import new translations
2009-07-13 16:37:45 -07:00
Eric Fischer
9046c92ab0 Import new translations 2009-07-13 15:49:57 -07:00
Amith Yamasani
5c30845cf3 Fix #1930767 : "Share with Google" not working on orientation change.
Discard the dialog after onSaveInstanceState. And check the different
onCreate scenarios before popping up the dialog.
2009-07-13 15:09:46 -07:00
Hung-ying Tyan
50cde8b1f3 am fe0b0178: Fix VpnSettings.StatusChecker.start()
Merge commit 'fe0b0178cb2d24b8e6e1477055617bbf86a0808b'

* commit 'fe0b0178cb2d24b8e6e1477055617bbf86a0808b':
  Fix VpnSettings.StatusChecker.start()
2009-07-13 02:44:49 -07:00
Hung-ying Tyan
fe0b0178cb Fix VpnSettings.StatusChecker.start()
to avoid multiple threads checking status at the same time.
2009-07-13 17:23:32 +08: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
97beba7ba2 am a5cead2c: Merge change 6705 into donut
Merge commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b'

* commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b':
  Add translated time zone picker lists for several more languages.
2009-07-10 10:05:49 -07:00
Android (Google) Code Review
a5cead2cf7 Merge change 6705 into donut
* changes:
  Add translated time zone picker lists for several more languages.
2009-07-10 10:03:32 -07:00
Eric Fischer
8ab37157dd Add translated time zone picker lists for several more languages. 2009-07-09 17:07:20 -07:00
Mike Lockwood
81183a8466 am 6dd27613: wifi: use new WifiManager.startScanActive() method to trigger scans.
Merge commit '6dd27613b5ee59b1f0a90ad50fa080c0d98c47e2'

* commit '6dd27613b5ee59b1f0a90ad50fa080c0d98c47e2':
  wifi: use new WifiManager.startScanActive() method to trigger scans.
2009-07-09 14:27:35 -07:00
Mike Lockwood
6dd27613b5 wifi: use new WifiManager.startScanActive() method to trigger scans.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-09 16:50:59 -04:00
Android (Google) Code Review
2ed1d1b732 am 52844864: Merge change 6630 into donut
Merge commit '52844864a7a42030246ae664d42c78c96611ba4e'

* commit '52844864a7a42030246ae664d42c78c96611ba4e':
  Remove "no" locale strings.xml file that duplicates "nb" locale file.
2009-07-09 12:50:46 -07:00
Hung-ying Tyan
9d2c359ad4 am e02f206e: Focus the password box when username is saved.
Merge commit 'e02f206e1161fc2d332db60395e74cca397ffa27'

* commit 'e02f206e1161fc2d332db60395e74cca397ffa27':
  Focus the password box when username is saved.
2009-07-09 12:49:33 -07:00
Hung-ying Tyan
971b79e306 am 66959341: Fix behavior of cancelling the name cred. dialog.
Merge commit '66959341a6b0891893d4c851be708c3073f61154'

* commit '66959341a6b0891893d4c851be708c3073f61154':
  Fix behavior of cancelling the name cred. dialog.
2009-07-09 12:49:23 -07:00
Android (Google) Code Review
52844864a7 Merge change 6630 into donut
* changes:
  Remove "no" locale strings.xml file that duplicates "nb" locale file.
2009-07-09 11:55:11 -07:00
Eric Fischer
e6f21e6691 Remove "no" locale strings.xml file that duplicates "nb" locale file. 2009-07-09 11:03:02 -07:00
Hung-ying Tyan
e02f206e11 Focus the password box when username is saved. 2009-07-09 18:39:04 +08:00
Hung-ying Tyan
66959341a6 Fix behavior of cancelling the name cred. dialog.
The code used to trying to store the credential even when the user
cancels the dialog. Fixed in this CL.
2009-07-09 11:51:06 +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
Android (Google) Code Review
7063f37102 Merge change 6467 into donut
* changes:
  Tighten factory data reset text. Bug 1966926.
2009-07-08 12:05:24 -07:00
Hung-ying Tyan
405678d560 am 386668b7: Fix saving secrets to keystore from vpn settings.
Merge commit '386668b79255917e2ddc17fd276f642be4d8089a'

* commit '386668b79255917e2ddc17fd276f642be4d8089a':
  Fix saving secrets to keystore from vpn settings.
2009-07-08 09:01:32 -07:00
Roy West
1a728bdaed Tighten factory data reset text. Bug 1966926. 2009-07-08 08:03:35 -07:00
Hung-ying Tyan
386668b792 Fix saving secrets to keystore from vpn settings. 2009-07-08 18:00:03 +08:00
Android (Google) Code Review
931d63672b am 2368d045: Merge change 6440 into donut
Merge commit '2368d0455ccae5e373fe79c66c1f6ce1ce0a3c72'

* commit '2368d0455ccae5e373fe79c66c1f6ce1ce0a3c72':
  Trigger backup of locale change.
2009-07-07 23:56:10 -07:00
Android (Google) Code Review
2368d0455c Merge change 6440 into donut
* changes:
  Trigger backup of locale change.
2009-07-07 19:00:13 -07:00
Android (Google) Code Review
10a609feae am f96fb705: Merge change 6432 into donut
Merge commit 'f96fb705f5b63177a79379b68dde307105b46f21'

* commit 'f96fb705f5b63177a79379b68dde307105b46f21':
  In the TTS settings: rely on the default locale rather than default
2009-07-07 17:45:59 -07:00
Android (Google) Code Review
f96fb705f5 Merge change 6432 into donut
* changes:
  In the TTS settings: rely on the default locale rather than default values stored in TextToSpeech.Engine to initialize the default TTS country and variant.
2009-07-07 17:44:32 -07:00
Amith Yamasani
5b280d1958 am eb72bcd6: Fix vibrate and silent mode toggle dependency.
Merge commit 'eb72bcd6d07708bfc65eec474092f136e822c9fb'

* commit 'eb72bcd6d07708bfc65eec474092f136e822c9fb':
  Fix vibrate and silent mode toggle dependency.
2009-07-07 17:24:43 -07:00
Jean-Michel Trivi
00d4fbfc42 In the TTS settings: rely on the default locale rather than default
values stored in TextToSpeech.Engine to initialize the default TTS
country and variant.
2009-07-07 17:08:32 -07:00
Amith Yamasani
eb72bcd6d0 Fix vibrate and silent mode toggle dependency. 2009-07-07 14:42:50 -07:00
Amith Yamasani
c155acc11c Trigger backup of locale change. 2009-07-07 14:38:41 -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