Commit Graph

116786 Commits

Author SHA1 Message Date
Marco Nelissen
cc233b22b5 am 8080d6a2: am 620e5f9c: Remove logging.
Merge commit '8080d6a2ceb10b1050fd5663ef0950be55ee8802'

* commit '8080d6a2ceb10b1050fd5663ef0950be55ee8802':
  Remove logging.
2009-09-09 16:27:55 -07: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
Eric Fischer
721a646013 am 76872f5a: (-s ours) am 140fb90a: Import revised translations. DO NOT MERGE
Merge commit '76872f5a12e3f697a90c08bc717918fa7469d265'

* commit '76872f5a12e3f697a90c08bc717918fa7469d265':
  Import revised translations.  DO NOT MERGE
2009-09-09 10:58:07 -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
9966e02941 am 54fa2be7: merge from open-source master
Merge commit '54fa2be765f6ae4cdc26ea7542d69924f58c59c4'

* commit '54fa2be765f6ae4cdc26ea7542d69924f58c59c4':
2009-09-04 11:06:28 -07:00
Jean-Baptiste Queru
54fa2be765 merge from open-source master 2009-09-04 07:51:26 -07:00
Dianne Hackborn
b0c72700e0 am b7558f37: am 76315391: Improve running services to services managed by the system.
Merge commit 'b7558f3700c6588e323975af2c24cd7f18ba007a'

* commit 'b7558f3700c6588e323975af2c24cd7f18ba007a':
  Improve running services to services managed by the system.
2009-09-03 14:44:18 -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
c67b4db9ed am 089e08d8: am 5b41931e: Merge change 23701 into eclair
Merge commit '089e08d8c9b323064a75434a68dd76bbbcddbe9f'

* commit '089e08d8c9b323064a75434a68dd76bbbcddbe9f':
  Fix bug 2088099 where the TTS example doesn't play in the Settings app
2009-09-03 09:53:13 -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
3f81e6579d am 476331d9: am 39ec5813: Merge change 23699 into eclair
Merge commit '476331d9ec0b0f700e79d04873c75d788a946cb8'

* commit '476331d9ec0b0f700e79d04873c75d788a946cb8':
  b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
2009-09-02 15:39:00 -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
6a31073a39 am 054509a8: 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 '054509a8d420feac2b12c1aa46354dd6840505e1'

* commit '054509a8d420feac2b12c1aa46354dd6840505e1':
  b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
2009-09-02 14:13:38 -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
721022cf5d am ae651048: am 684736a9: b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
Merge commit 'ae651048122fa3bccabf2978851cf79ed0a77750'

* commit 'ae651048122fa3bccabf2978851cf79ed0a77750':
  b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
2009-09-01 19:11:51 -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
f553f49b88 am 7865507c: 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 '7865507c978fe104deecc702f392d3ff085ff132'

* commit '7865507c978fe104deecc702f392d3ff085ff132':
  Make sure the TTS example in the TTS Settings loads a supported language.
2009-09-01 16:18:54 -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
Dianne Hackborn
9e4391d413 am feab7249: am c58c549c: New UI for viewing and stopping currently running services.
Merge commit 'feab7249a970b0670513a35495cbc53bbf909f8e'

* commit 'feab7249a970b0670513a35495cbc53bbf909f8e':
  New UI for viewing and stopping currently running services.
2009-09-01 13:59:28 -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
Jean-Baptiste Queru
e8fa3ddc7a am f602bc8b: merge from open-source master
Merge commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf'

* commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf':
  Fix grammar in unknown sources dialog. issue 1938
  screenOrientation written as content instead of attribute by mistake
2009-09-01 12:14:37 -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
Amith Yamasani
c8168ba06e am 71964dd6: Merge change 23372 into eclair
Merge commit '71964dd6598cf2b4744535e537ded21dbffe611c'

* commit '71964dd6598cf2b4744535e537ded21dbffe611c':
  Show the Use location prompt only once if user agrees. Bug #1910370
2009-08-31 17:43:29 -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
ff4b7d40e9 am 71cc49e4: Airplane Mode in Emergency Callback Mode (ECM)
Merge commit '71cc49e480e7dfd5d0986d7600d0c73aecdbdf93'

* commit '71cc49e480e7dfd5d0986d7600d0c73aecdbdf93':
  Airplane Mode in Emergency Callback Mode (ECM)
2009-08-31 16:45:22 -07:00