OSDN Git Service
Jaikumar Ganesh [Wed, 16 Sep 2009 18:56:11 +0000 (11:56 -0700)]
resolved conflicts for merge of
1b7ffcf4 to master
Nick Pelly [Tue, 15 Sep 2009 20:15:45 +0000 (13:15 -0700)]
am
f9dce06d: am
d6375e97: Merge change 24726 into eclair
Merge commit '
f9dce06d5ee028335ff445335303464ebb403901'
* commit '
f9dce06d5ee028335ff445335303464ebb403901':
Update AndroidManifest.xml for new Intent locations.
Xianzhu Wang [Tue, 15 Sep 2009 20:13:42 +0000 (13:13 -0700)]
am
e8b40cb8: am
88651a0b: Regenerate timezones.xml after adding Asia/Shanghai timezone for mainland China, using cldr 1.7.1 and merging translations for "Beijing".
Merge commit '
e8b40cb857bfaab26f64d688d98b592cca70b089'
* commit '
e8b40cb857bfaab26f64d688d98b592cca70b089':
Regenerate timezones.xml after adding Asia/Shanghai timezone for
Nick Pelly [Fri, 11 Sep 2009 19:01:07 +0000 (12:01 -0700)]
am
d6375e97: Merge change 24726 into eclair
Merge commit '
d6375e975e74924082cbf3f9b4c6f2a67b1ee08d' into eclair-plus-aosp
* commit '
d6375e975e74924082cbf3f9b4c6f2a67b1ee08d':
Update AndroidManifest.xml for new Intent locations.
Android (Google) Code Review [Fri, 11 Sep 2009 18:55:44 +0000 (14:55 -0400)]
Merge change 24726 into eclair
* changes:
Update AndroidManifest.xml for new Intent locations.
Nick Pelly [Fri, 11 Sep 2009 18:41:59 +0000 (11:41 -0700)]
Update AndroidManifest.xml for new Intent locations.
This will fix a regression since the recent BT API changes. The settings app
would have missed some Bluetooth events, especially pairing.
Change-Id: Ia5e6371279feb389578e798fe11f1c239a4aa17b
Xianzhu Wang [Fri, 11 Sep 2009 17:34:42 +0000 (10:34 -0700)]
am
88651a0b: Regenerate timezones.xml after adding Asia/Shanghai timezone for mainland China, using cldr 1.7.1 and merging translations for "Beijing".
Merge commit '
88651a0b2a7a7038c8befb321100a64aec9933b8' into eclair-plus-aosp
* commit '
88651a0b2a7a7038c8befb321100a64aec9933b8':
Regenerate timezones.xml after adding Asia/Shanghai timezone for
Xianzhu Wang [Fri, 11 Sep 2009 06:41:05 +0000 (14:41 +0800)]
Regenerate timezones.xml after adding Asia/Shanghai timezone for
mainland China, using cldr 1.7.1 and merging translations for "Beijing".
Remove unused localized timezone "xml-no/timezones.xml".
"nb" is now used instead of the deprecated "no".
Nick Pelly [Fri, 11 Sep 2009 02:06:37 +0000 (19:06 -0700)]
am
3ca2df1c: am
16cc8631: Update application for Bluetooth API changes.
Merge commit '
3ca2df1ce5683fe9713290f7819b54cea3a2cdfa'
* commit '
3ca2df1ce5683fe9713290f7819b54cea3a2cdfa':
Update application for Bluetooth API changes.
Nick Pelly [Fri, 11 Sep 2009 02:01:20 +0000 (19:01 -0700)]
am
16cc8631: Update application for Bluetooth API changes.
Merge commit '
16cc86315d7a8e1f6a0f3083d0a810a7cb097832' into eclair-plus-aosp
* commit '
16cc86315d7a8e1f6a0f3083d0a810a7cb097832':
Update application for Bluetooth API changes.
Nick Pelly [Thu, 10 Sep 2009 00:46:25 +0000 (17:46 -0700)]
Update application for Bluetooth API changes.
Change-Id: I8351611f0f0c5eda3e423dbe7e7b53e52d75ac36
Dianne Hackborn [Thu, 10 Sep 2009 20:11:21 +0000 (13:11 -0700)]
am
21ee9c24: am
cded8478: Merge change 24553 into eclair
Merge commit '
21ee9c240352b66f4f13a3fff80c7322e9745d7a'
* commit '
21ee9c240352b66f4f13a3fff80c7322e9745d7a':
Make running services show dependent processes.
Dianne Hackborn [Thu, 10 Sep 2009 20:05:53 +0000 (13:05 -0700)]
am
cded8478: Merge change 24553 into eclair
Merge commit '
cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp
* commit '
cded847838c726342bfe56e69d417d160c73f212':
Make running services show dependent processes.
Android (Google) Code Review [Thu, 10 Sep 2009 19:57:57 +0000 (15:57 -0400)]
Merge change 24553 into eclair
* changes:
Make running services show dependent processes.
Marco Nelissen [Thu, 10 Sep 2009 19:42:06 +0000 (12:42 -0700)]
am
0da7d948: am
e07eb497: Merge change 24555 into eclair
Merge commit '
0da7d948df0ef30dffe4ae27388ef5c648425ea6'
* commit '
0da7d948df0ef30dffe4ae27388ef5c648425ea6':
Allow setting a silent ringtone (bug
1600056).
Marco Nelissen [Thu, 10 Sep 2009 19:38:23 +0000 (12:38 -0700)]
am
e07eb497: Merge change 24555 into eclair
Merge commit '
e07eb49793ef2d4fd494717159ebdd3aaef41e08' into eclair-plus-aosp
* commit '
e07eb49793ef2d4fd494717159ebdd3aaef41e08':
Allow setting a silent ringtone (bug
1600056).
Android (Google) Code Review [Thu, 10 Sep 2009 19:33:55 +0000 (15:33 -0400)]
Merge change 24555 into eclair
* changes:
Allow setting a silent ringtone (bug
1600056).
Marco Nelissen [Thu, 10 Sep 2009 19:11:33 +0000 (12:11 -0700)]
Allow setting a silent ringtone (bug
1600056).
Dianne Hackborn [Thu, 10 Sep 2009 18:55:42 +0000 (11:55 -0700)]
Make running services show dependent processes.
And other various improvement and cleanup.
Change-Id: I0a33ab2876c8f409cd3cfecbbac574563ef1a162
Hung-ying Tyan [Thu, 10 Sep 2009 16:23:24 +0000 (09:23 -0700)]
am
6cdd5e8b: am
f71c8b40: Add install-cert-from-sdcard in Security settings
Merge commit '
6cdd5e8bc41b92fc8b56f38332f2b8bd9ff2bb66'
* commit '
6cdd5e8bc41b92fc8b56f38332f2b8bd9ff2bb66':
Add install-cert-from-sdcard in Security settings
Hung-ying Tyan [Thu, 10 Sep 2009 09:06:34 +0000 (02:06 -0700)]
am
f71c8b40: Add install-cert-from-sdcard in Security settings
Merge commit '
f71c8b40b5a92e21d09dd75880e16aa857c1b6cb' into eclair-plus-aosp
* commit '
f71c8b40b5a92e21d09dd75880e16aa857c1b6cb':
Add install-cert-from-sdcard in Security settings
Hung-ying Tyan [Thu, 10 Sep 2009 04:43:40 +0000 (12:43 +0800)]
Add install-cert-from-sdcard in Security settings
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
Jean-Michel Trivi [Wed, 9 Sep 2009 23:31:28 +0000 (16:31 -0700)]
am
23c24f87: am
18cd4093: Merge change 24440 into eclair
Merge commit '
23c24f87914da3cc798e2fb3b2b08898d89acb49'
* commit '
23c24f87914da3cc798e2fb3b2b08898d89acb49':
Fix bug
2078454 where clicking on Settings in the Home menu would
Jaikumar Ganesh [Wed, 9 Sep 2009 23:31:11 +0000 (16:31 -0700)]
am
c9311040: am
6ee7dd09: Merge change 24435 into eclair
Merge commit '
c93110409c05bef4be5428ef36099a586828cbb2'
* commit '
c93110409c05bef4be5428ef36099a586828cbb2':
Fix display strings and enter passkey handling.
Nick Pelly [Wed, 9 Sep 2009 23:28:37 +0000 (16:28 -0700)]
am
8a6730df: am
843b4ee1: Merge change 24276 into eclair
Merge commit '
8a6730df320b2fa10ac11ea1aad06d85bbed31e4'
* commit '
8a6730df320b2fa10ac11ea1aad06d85bbed31e4':
Update application for Bluetooth API change: deprecation of BluetoothError.
Nick Pelly [Wed, 9 Sep 2009 23:28:20 +0000 (16:28 -0700)]
am
3b83477f: am
1e451997: Merge change 24230 into eclair
Merge commit '
3b83477fe391ea6b9eb6ff783283a3f3002e8e7a'
* commit '
3b83477fe391ea6b9eb6ff783283a3f3002e8e7a':
Update application for Bluetooth API change.
Marco Nelissen [Wed, 9 Sep 2009 23:27:55 +0000 (16:27 -0700)]
Jean-Michel Trivi [Wed, 9 Sep 2009 22:42:27 +0000 (15:42 -0700)]
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
Android (Google) Code Review [Wed, 9 Sep 2009 22:38:11 +0000 (18:38 -0400)]
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().
Jean-Michel Trivi [Wed, 9 Sep 2009 22:13:38 +0000 (15:13 -0700)]
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().
Jaikumar Ganesh [Wed, 9 Sep 2009 22:14:00 +0000 (15:14 -0700)]
am
6ee7dd09: Merge change 24435 into eclair
Merge commit '
6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp
* commit '
6ee7dd09138363737805ae1e6e93649959c6ab83':
Fix display strings and enter passkey handling.
Android (Google) Code Review [Wed, 9 Sep 2009 22:06:30 +0000 (18:06 -0400)]
Merge change 24435 into eclair
* changes:
Fix display strings and enter passkey handling.
Jaikumar Ganesh [Wed, 9 Sep 2009 21:57:19 +0000 (14:57 -0700)]
Fix display strings and enter passkey handling.
Nick Pelly [Wed, 9 Sep 2009 18:39:11 +0000 (11:39 -0700)]
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.
Android (Google) Code Review [Wed, 9 Sep 2009 18:34:52 +0000 (14:34 -0400)]
Merge change 24276 into eclair
* changes:
Update application for Bluetooth API change: deprecation of BluetoothError.
Nick Pelly [Wed, 9 Sep 2009 18:34:26 +0000 (11:34 -0700)]
am
1e451997: Merge change 24230 into eclair
Merge commit '
1e4519979b32957698a6825eb6eb61bd85dd7370' into eclair-plus-aosp
* commit '
1e4519979b32957698a6825eb6eb61bd85dd7370':
Update application for Bluetooth API change.
Android (Google) Code Review [Wed, 9 Sep 2009 18:30:26 +0000 (14:30 -0400)]
Merge change 24230 into eclair
* changes:
Update application for Bluetooth API change.
Marco Nelissen [Wed, 9 Sep 2009 17:59:53 +0000 (10:59 -0700)]
Eric Fischer [Wed, 9 Sep 2009 17:58:07 +0000 (10:58 -0700)]
am
76872f5a: (-s ours) am
140fb90a: Import revised translations. DO NOT MERGE
Merge commit '
76872f5a12e3f697a90c08bc717918fa7469d265'
* commit '
76872f5a12e3f697a90c08bc717918fa7469d265':
Import revised translations. DO NOT MERGE
Marco Nelissen [Wed, 9 Sep 2009 16:06:40 +0000 (09:06 -0700)]
Remove logging.
Nick Pelly [Wed, 9 Sep 2009 00:49:57 +0000 (17:49 -0700)]
Update application for Bluetooth API change: deprecation of BluetoothError.
Eric Fischer [Wed, 9 Sep 2009 00:09:19 +0000 (17:09 -0700)]
am
140fb90a: Import revised translations. DO NOT MERGE
Merge commit '
140fb90a5cfc6e146e006350edfb41a9978ad105' into eclair-plus-aosp
* commit '
140fb90a5cfc6e146e006350edfb41a9978ad105':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:30:51 +0000 (16:30 -0700)]
Import revised translations. DO NOT MERGE
Nick Pelly [Tue, 8 Sep 2009 23:24:03 +0000 (16:24 -0700)]
Update application for Bluetooth API change.
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:28 +0000 (11:06 -0700)]
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:26 +0000 (07:51 -0700)]
merge from open-source master
Dianne Hackborn [Thu, 3 Sep 2009 21:44:18 +0000 (14:44 -0700)]
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.
Dianne Hackborn [Thu, 3 Sep 2009 21:42:34 +0000 (14:42 -0700)]
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.
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:16 +0000 (14:13 -0700)]
merge from donut
Dianne Hackborn [Thu, 3 Sep 2009 20:33:55 +0000 (13:33 -0700)]
Improve running services to services managed by the system.
Also a little tweak to the animations preference.
Change-Id: I3183ef21e687a3b120d02c79e7388300084b9202
Jean-Michel Trivi [Thu, 3 Sep 2009 16:53:13 +0000 (09:53 -0700)]
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
Jean-Michel Trivi [Thu, 3 Sep 2009 16:22:38 +0000 (09:22 -0700)]
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
Android (Google) Code Review [Thu, 3 Sep 2009 16:20:15 +0000 (09:20 -0700)]
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).
Jean-Michel Trivi [Wed, 2 Sep 2009 22:15:33 +0000 (15:15 -0700)]
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).
Michael Chan [Wed, 2 Sep 2009 22:39:00 +0000 (15:39 -0700)]
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.
Michael Chan [Wed, 2 Sep 2009 22:36:14 +0000 (15:36 -0700)]
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.
Android (Google) Code Review [Wed, 2 Sep 2009 22:34:31 +0000 (15:34 -0700)]
Merge change 23699 into eclair
* changes:
b/
2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
Michael Chan [Wed, 2 Sep 2009 22:20:07 +0000 (15:20 -0700)]
b/
2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
Michael Chan [Wed, 2 Sep 2009 21:13:38 +0000 (14:13 -0700)]
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.
Michael Chan [Wed, 2 Sep 2009 21:11:57 +0000 (14:11 -0700)]
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.
Michael Chan [Wed, 2 Sep 2009 19:30:05 +0000 (12:30 -0700)]
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)
Michael Chan [Wed, 2 Sep 2009 02:11:51 +0000 (19:11 -0700)]
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"
Michael Chan [Wed, 2 Sep 2009 02:09:28 +0000 (19:09 -0700)]
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"
Michael Chan [Wed, 2 Sep 2009 01:51:04 +0000 (18:51 -0700)]
b/
2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
Jean-Michel Trivi [Tue, 1 Sep 2009 23:18:54 +0000 (16:18 -0700)]
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.
Jean-Michel Trivi [Tue, 1 Sep 2009 23:17:44 +0000 (16:17 -0700)]
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.
Dianne Hackborn [Tue, 1 Sep 2009 20:59:28 +0000 (13:59 -0700)]
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.
Jean-Michel Trivi [Tue, 1 Sep 2009 20:36:45 +0000 (13:36 -0700)]
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.
Dianne Hackborn [Tue, 1 Sep 2009 19:34:33 +0000 (12:34 -0700)]
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.
Jean-Baptiste Queru [Tue, 1 Sep 2009 19:14:37 +0000 (12:14 -0700)]
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
Dianne Hackborn [Tue, 1 Sep 2009 04:33:17 +0000 (21:33 -0700)]
New UI for viewing and stopping currently running services.
Change-Id: I86012262635c911be23513aa0b027174b490374d
Jean-Baptiste Queru [Tue, 1 Sep 2009 15:28:18 +0000 (08:28 -0700)]
merge from open-source master
Amith Yamasani [Tue, 1 Sep 2009 00:43:29 +0000 (17:43 -0700)]
am
71964dd6: Merge change 23372 into eclair
Merge commit '
71964dd6598cf2b4744535e537ded21dbffe611c'
* commit '
71964dd6598cf2b4744535e537ded21dbffe611c':
Show the Use location prompt only once if user agrees. Bug #
1910370
Android (Google) Code Review [Tue, 1 Sep 2009 00:39:34 +0000 (17:39 -0700)]
Merge change 23372 into eclair
* changes:
Show the Use location prompt only once if user agrees. Bug #
1910370
Amith Yamasani [Tue, 1 Sep 2009 00:27:53 +0000 (17:27 -0700)]
Show the Use location prompt only once if user agrees. Bug #
1910370
Chouting Zhang [Mon, 31 Aug 2009 23:45:22 +0000 (16:45 -0700)]
am
71cc49e4: Airplane Mode in Emergency Callback Mode (ECM)
Merge commit '
71cc49e480e7dfd5d0986d7600d0c73aecdbdf93'
* commit '
71cc49e480e7dfd5d0986d7600d0c73aecdbdf93':
Airplane Mode in Emergency Callback Mode (ECM)
Daniel Sandler [Mon, 31 Aug 2009 23:43:17 +0000 (16:43 -0700)]
am
b89653cb: Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
Merge commit '
b89653cb954e6945d78a3f2ed876a1760c5d5484'
* commit '
b89653cb954e6945d78a3f2ed876a1760c5d5484':
Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
Daniel Sandler [Mon, 31 Aug 2009 20:41:57 +0000 (16:41 -0400)]
resolved conflicts for merge of
2b9fd2d7 to master
Chouting Zhang [Fri, 28 Aug 2009 19:36:35 +0000 (14:36 -0500)]
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.
Daniel Sandler [Mon, 31 Aug 2009 14:00:50 +0000 (10:00 -0400)]
Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
Daniel Sandler [Mon, 31 Aug 2009 13:29:16 +0000 (09:29 -0400)]
Add missing hdpi frames of the unlock pattern animation.
Amith Yamasani [Sat, 29 Aug 2009 00:32:12 +0000 (17:32 -0700)]
am
11cd8c5a: Fix for
1785342: The old PIN is required after entering New PIN
Merge commit '
11cd8c5ac95334c9363a82fd81d05d85623f9d17'
* commit '
11cd8c5ac95334c9363a82fd81d05d85623f9d17':
Fix for
1785342: The old PIN is required after entering New PIN
Amith Yamasani [Fri, 28 Aug 2009 22:36:52 +0000 (15:36 -0700)]
Fix for
1785342: The old PIN is required after entering New PIN
State of dialogs was not properly maintained across pause/resume.
Daniel Sandler [Fri, 28 Aug 2009 20:21:00 +0000 (13:21 -0700)]
am
98fa0e29: Merge change 23149 into eclair
Merge commit '
98fa0e2941a86284d3eaae8c60fbde4a2410b786'
* commit '
98fa0e2941a86284d3eaae8c60fbde4a2410b786':
High-resolution (hdpi) artwork from TAT for Settings.
Android (Google) Code Review [Fri, 28 Aug 2009 20:16:27 +0000 (13:16 -0700)]
Merge change 23149 into eclair
* changes:
High-resolution (hdpi) artwork from TAT for Settings.
Eric Fischer [Fri, 28 Aug 2009 20:08:29 +0000 (13:08 -0700)]
am
fe4ddf85: Armor string format tokens with translation placeholders.
Merge commit '
fe4ddf853e2f6a9797037171e218bf30a25a254f'
* commit '
fe4ddf853e2f6a9797037171e218bf30a25a254f':
Armor string format tokens with translation placeholders.
Eric Fischer [Fri, 28 Aug 2009 20:02:24 +0000 (13:02 -0700)]
Armor string format tokens with translation placeholders.
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
Daniel Sandler [Fri, 28 Aug 2009 18:51:57 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Settings.
Hung-ying Tyan [Fri, 28 Aug 2009 03:31:17 +0000 (20:31 -0700)]
Hung-ying Tyan [Thu, 27 Aug 2009 10:49:31 +0000 (18:49 +0800)]
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.
Eric Fischer [Thu, 27 Aug 2009 21:38:34 +0000 (14:38 -0700)]
am
d1de20d8: Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit '
d1de20d883725ce98931fbebeef9bed8c340352d'
* commit '
d1de20d883725ce98931fbebeef9bed8c340352d':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Eric Fischer [Thu, 27 Aug 2009 20:52:31 +0000 (13:52 -0700)]
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: I11619ef7bdd0d418e701930ae46b2b9c93ca07ac
Hung-ying Tyan [Thu, 27 Aug 2009 03:33:43 +0000 (20:33 -0700)]
am
11dd7d5f: Fix the state machine for CONNECTING/DISCONNECTING states.
Merge commit '
11dd7d5fb36a408f1d3962cbec0b58ba5212ade9'
* commit '
11dd7d5fb36a408f1d3962cbec0b58ba5212ade9':
Fix the state machine for CONNECTING/DISCONNECTING states.
Hung-ying Tyan [Thu, 27 Aug 2009 03:03:46 +0000 (11:03 +0800)]
Fix the state machine for CONNECTING/DISCONNECTING states.
Mike Lockwood [Tue, 25 Aug 2009 18:58:53 +0000 (11:58 -0700)]
am
cfb4089b: Merge change 22611 into eclair
Merge commit '
cfb4089b372ee6be1c803a7deae56b464dc5d004'
* commit '
cfb4089b372ee6be1c803a7deae56b464dc5d004':
Hide the "Enable Assisted GPS" checkbox in security & location settings.
Android (Google) Code Review [Tue, 25 Aug 2009 18:55:20 +0000 (11:55 -0700)]
Merge change 22611 into eclair
* changes:
Hide the "Enable Assisted GPS" checkbox in security & location settings.
Mike Lockwood [Tue, 25 Aug 2009 18:34:56 +0000 (11:34 -0700)]
Hide the "Enable Assisted GPS" checkbox in security & location settings.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Amith Yamasani [Tue, 25 Aug 2009 17:26:21 +0000 (10:26 -0700)]
am
e13209ab: Remember dialog state for notification volume.
Merge commit '
e13209ab423932a739b66eac7d8bd4abd6e52287'
* commit '
e13209ab423932a739b66eac7d8bd4abd6e52287':
Remember dialog state for notification volume.
Amith Yamasani [Tue, 25 Aug 2009 00:55:56 +0000 (17:55 -0700)]
Remember dialog state for notification volume.
Restore the original volume if user hasn't okayed the new volume.
Amith Yamasani [Mon, 24 Aug 2009 22:32:28 +0000 (15:32 -0700)]
am
a0dc346f: Remove summaries from top-level of settings.
Merge commit '
a0dc346f4c5511a92ba19333df0a8c576946992e'
* commit '
a0dc346f4c5511a92ba19333df0a8c576946992e':
Remove summaries from top-level of settings.