Commit Graph

993 Commits

Author SHA1 Message Date
Hung-ying Tyan
f71c8b40b5 Add install-cert-from-sdcard in Security settings
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
2009-09-10 12:50:10 +08:00
Jean-Michel Trivi
23c24f8791 am 18cd4093: Merge change 24440 into eclair
Merge commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f' into eclair-plus-aosp

* commit '18cd40930179a7c6ab30e4e5ce62919fde16ce6f':
  Fix bug 2078454 where clicking on Settings in the Home menu would
2009-09-09 15:42:27 -07:00
Android (Google) Code Review
18cd409301 Merge change 24440 into eclair
* changes:
  Fix bug 2078454 where clicking on Settings in the Home menu would take the user to Market after clicking on "Install Voice Data" in the TTS Settings page. Launching the Activity for the installation of the TTS data should be a distinct task, dissociated from the one associated with the Settings app. Also the intent ACTION_INSTALL_TTS_DATA doesn't return a result, so the activity should be started with startActivity() rather than startActivityForResult().
2009-09-09 18:38:11 -04:00
Jean-Michel Trivi
58ea43acf9 Fix bug 2078454 where clicking on Settings in the Home menu would
take the user to Market after clicking on "Install Voice Data" in
the TTS Settings page.
Launching the Activity for the installation of the TTS data should
be a distinct task, dissociated from the one associated with the
Settings app. Also the intent ACTION_INSTALL_TTS_DATA doesn't return
a result, so the activity should be started with startActivity()
rather than startActivityForResult().
2009-09-09 15:20:56 -07:00
Jaikumar Ganesh
c93110409c am 6ee7dd09: Merge change 24435 into eclair
Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp

* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
  Fix display strings and enter passkey handling.
2009-09-09 15:14:00 -07:00
Android (Google) Code Review
6ee7dd0913 Merge change 24435 into eclair
* changes:
  Fix display strings and enter passkey handling.
2009-09-09 18:06:30 -04:00
Jaikumar Ganesh
67efa271bb Fix display strings and enter passkey handling. 2009-09-09 15:03:24 -07:00
Nick Pelly
8a6730df32 am 843b4ee1: Merge change 24276 into eclair
Merge commit '843b4ee178f6cfd7b965c8e2dea5296d1520894d' into eclair-plus-aosp

* commit '843b4ee178f6cfd7b965c8e2dea5296d1520894d':
  Update application for Bluetooth API change: deprecation of BluetoothError.
2009-09-09 11:39:11 -07:00
Android (Google) Code Review
843b4ee178 Merge change 24276 into eclair
* changes:
  Update application for Bluetooth API change: deprecation of BluetoothError.
2009-09-09 14:34:52 -04:00
Nick Pelly
3b83477fe3 am 1e451997: Merge change 24230 into eclair
Merge commit '1e4519979b32957698a6825eb6eb61bd85dd7370' into eclair-plus-aosp

* commit '1e4519979b32957698a6825eb6eb61bd85dd7370':
  Update application for Bluetooth API change.
2009-09-09 11:34:26 -07:00
Android (Google) Code Review
1e4519979b Merge change 24230 into eclair
* changes:
  Update application for Bluetooth API change.
2009-09-09 14:30:26 -04:00
Marco Nelissen
8080d6a2ce am 620e5f9c: Remove logging.
Merge commit '620e5f9c05a3ef5d29d8bf6a220882c3ff32fb4e' into eclair-plus-aosp

* commit '620e5f9c05a3ef5d29d8bf6a220882c3ff32fb4e':
  Remove logging.
2009-09-09 10:59:53 -07:00
Marco Nelissen
620e5f9c05 Remove logging. 2009-09-09 09:06:40 -07:00
Nick Pelly
f4779354b3 Update application for Bluetooth API change: deprecation of BluetoothError. 2009-09-08 17:49:57 -07:00
Eric Fischer
76872f5a12 am 140fb90a: Import revised translations. DO NOT MERGE
Merge commit '140fb90a5cfc6e146e006350edfb41a9978ad105' into eclair-plus-aosp

* commit '140fb90a5cfc6e146e006350edfb41a9978ad105':
  Import revised translations.  DO NOT MERGE
2009-09-08 17:09:19 -07:00
Eric Fischer
140fb90a5c Import revised translations. DO NOT MERGE 2009-09-08 16:55:50 -07:00
Nick Pelly
ca564d6bda Update application for Bluetooth API change. 2009-09-08 16:24:03 -07:00
Jean-Baptiste Queru
54fa2be765 merge from open-source master 2009-09-04 07:51:26 -07:00
Dianne Hackborn
b7558f3700 am 76315391: Improve running services to services managed by the system.
Merge commit '76315391f07d022e31c176633ae3aeaee5bb14ec' into eclair-plus-aosp

* commit '76315391f07d022e31c176633ae3aeaee5bb14ec':
  Improve running services to services managed by the system.
2009-09-03 14:42:34 -07:00
Jean-Baptiste Queru
2044959bcf merge from donut 2009-09-03 14:13:16 -07:00
Dianne Hackborn
76315391f0 Improve running services to services managed by the system.
Also a little tweak to the animations preference.

Change-Id: I3183ef21e687a3b120d02c79e7388300084b9202
2009-09-03 13:33:55 -07:00
Jean-Michel Trivi
089e08d8c9 am 5b41931e: Merge change 23701 into eclair
Merge commit '5b41931e1f94b2051b7c015081465f19a33096f9' into eclair-plus-aosp

* commit '5b41931e1f94b2051b7c015081465f19a33096f9':
  Fix bug 2088099 where the TTS example doesn't play in the Settings app
2009-09-03 09:22:38 -07:00
Android (Google) Code Review
5b41931e1f Merge change 23701 into eclair
* changes:
  Fix bug 2088099 where the TTS example doesn't play in the Settings app when the UI is in Japanese. Rewrite of the initialization of the default language in the TTS Settings. The previous implementation had the following issues: - the "Listen to an example" didn't use the default settings - the string used for the example didn't match the selected language  (this was in order to not imply that TTS is doing translation, but   that proved confusing to users). The language initialization is now implemented in initDefaultLang() and ensures that the default locale is one supported in the array of available locales. The speech rate is also initialized from the settings or the default rate (if no value was stored in the settings).
2009-09-03 09:20:15 -07:00
Jean-Michel Trivi
e8e23db707 Fix bug 2088099 where the TTS example doesn't play in the Settings app
when the UI is in Japanese.
Rewrite of the initialization of the default language in the TTS Settings.
The previous implementation had the following issues:
- the "Listen to an example" didn't use the default settings
- the string used for the example didn't match the selected language
 (this was in order to not imply that TTS is doing translation, but
  that proved confusing to users).
The language initialization is now implemented in initDefaultLang()
and ensures that the default locale is one supported in the array
of available locales.
The speech rate is also initialized from the settings or the
default rate (if no value was stored in the settings).
2009-09-02 15:48:32 -07:00
Michael Chan
476331d9ec am 39ec5813: Merge change 23699 into eclair
Merge commit '39ec58134dcdfac4c8cbd102187da211f17aa8de' into eclair-plus-aosp

* commit '39ec58134dcdfac4c8cbd102187da211f17aa8de':
  b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
2009-09-02 15:36:14 -07:00
Android (Google) Code Review
39ec58134d Merge change 23699 into eclair
* changes:
  b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
2009-09-02 15:34:31 -07:00
Michael Chan
d3da3379a4 b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off. 2009-09-02 15:20:07 -07:00
Michael Chan
054509a8d4 am 77395cc3: b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed. Removed extra new lines in the passkey and pin dialogs because the string didn\'t fit in landscape mode. (scrollbars to appeared)
Merge commit '77395cc39c88af0bb20ea18af532c87e934fb187' into eclair-plus-aosp

* commit '77395cc39c88af0bb20ea18af532c87e934fb187':
  b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
2009-09-02 14:11:57 -07:00
Michael Chan
77395cc39c b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Removed extra new lines in the passkey and pin dialogs because the string didn't fit in landscape mode. (scrollbars to appeared)
2009-09-02 12:30:05 -07:00
Michael Chan
ae65104812 am 684736a9: b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
Merge commit '684736a9d4cc044c6970411485f4c22d5d7e3b74' into eclair-plus-aosp

* commit '684736a9d4cc044c6970411485f4c22d5d7e3b74':
  b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
2009-09-01 19:09:28 -07:00
Michael Chan
684736a9d4 b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps" 2009-09-01 19:06:36 -07:00
Jean-Michel Trivi
7865507c97 am ab6552c3: Make sure the TTS example in the TTS Settings loads a supported language. This fixes the issue where the example wouldn\'t play when the UI is in Japanese in bug 2088099.
Merge commit 'ab6552c3f01f893ca927fc8ef0fec95a6c8f178f' into eclair-plus-aosp

* commit 'ab6552c3f01f893ca927fc8ef0fec95a6c8f178f':
  Make sure the TTS example in the TTS Settings loads a supported language.
2009-09-01 16:17:44 -07:00
Jean-Michel Trivi
ab6552c3f0 Make sure the TTS example in the TTS Settings loads a supported language.
This fixes the issue where the example wouldn't play when the UI is in
Japanese in bug 2088099.
2009-09-01 13:46:44 -07:00
Dianne Hackborn
feab7249a9 am c58c549c: New UI for viewing and stopping currently running services.
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp

* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
  New UI for viewing and stopping currently running services.
2009-09-01 12:34:33 -07:00
Dianne Hackborn
c58c549cc9 New UI for viewing and stopping currently running services.
Change-Id: I86012262635c911be23513aa0b027174b490374d
2009-09-01 12:11:24 -07:00
Jean-Baptiste Queru
f602bc8bee merge from open-source master 2009-09-01 08:28:18 -07:00
Android (Google) Code Review
71964dd659 Merge change 23372 into eclair
* changes:
  Show the Use location prompt only once if user agrees. Bug #1910370
2009-08-31 17:39:34 -07:00
Amith Yamasani
f411c9625c Show the Use location prompt only once if user agrees. Bug #1910370 2009-08-31 17:27:53 -07:00
Chouting Zhang
71cc49e480 Airplane Mode in Emergency Callback Mode (ECM)
When user tries to change Airplane Mode between ON & OFF
in ECM mode, a notice should be shown to indicate it's in ECM mode,
and ask if user wants to exit ECM, if yes, then the Airplane Mode
is changed after ECM mode exit. If not, Airplane Mode should not be
changed.
2009-08-31 09:45:21 -07:00
Daniel Sandler
b89653cb95 Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896. 2009-08-31 10:00:50 -04:00
Daniel Sandler
2b9fd2d739 Add missing hdpi frames of the unlock pattern animation. 2009-08-31 09:29:16 -04:00
Amith Yamasani
11cd8c5ac9 Fix for 1785342: The old PIN is required after entering New PIN
State of dialogs was not properly maintained across pause/resume.
2009-08-28 17:10:46 -07:00
Android (Google) Code Review
98fa0e2941 Merge change 23149 into eclair
* changes:
  High-resolution (hdpi) artwork from TAT for Settings.
2009-08-28 13:16:27 -07:00
Eric Fischer
fe4ddf853e Armor string format tokens with translation placeholders.
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
2009-08-28 13:02:24 -07:00
Daniel Sandler
0a9359310d High-resolution (hdpi) artwork from TAT for Settings. 2009-08-28 15:02:50 -04:00
Hung-ying Tyan
7ca3655dcb Handle two new err codes:
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
2009-08-28 11:25:44 +08:00
Eric Fischer
d1de20d883 Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: I11619ef7bdd0d418e701930ae46b2b9c93ca07ac
2009-08-27 13:52:31 -07:00
Hung-ying Tyan
11dd7d5fb3 Fix the state machine for CONNECTING/DISCONNECTING states. 2009-08-27 11:03:46 +08:00
Android (Google) Code Review
cfb4089b37 Merge change 22611 into eclair
* changes:
  Hide the "Enable Assisted GPS" checkbox in security & location settings.
2009-08-25 11:55:20 -07:00
Mike Lockwood
7f894124f4 Hide the "Enable Assisted GPS" checkbox in security & location settings.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-25 11:34:56 -07:00